Skip to content

Commit cfeec11

Browse files
author
syshex
committed
about to release 1.1.10.1
1 parent a0a5cba commit cfeec11

File tree

8 files changed

+37
-22
lines changed

8 files changed

+37
-22
lines changed

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
vue-bootstrap-table is a sortable and searchable table, with Bootstrap styling, for Vue.js.
44

5-
### VUE 2 : 1.1.10
5+
### VUE 2 : 1.1.10.1
66

77
### Vue 1 : [jbaysolutions/vue-bootstrap-table](https://github.com/jbaysolutions/vue-bootstrap-table)
88

@@ -531,6 +531,10 @@ If you have a feature request, please add it as an issue or make a pull request.
531531

532532
## Changelog
533533

534+
### 1.1.10.1
535+
536+
* Bug fix - axios problem with passing axios config object
537+
534538
### 1.1.10
535539

536540
* Bug fix - Delegate true and false behaviours leading to not loading data

dist/vue-bootstrap-table.js

Lines changed: 12 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vue-bootstrap-table.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vue-bootstrap-table.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ <h1>Vue Bootstrap Table</h1>
3636
:show-column-picker="showPicker"
3737
:paginated="paginated"
3838
:multi-column-sortable="multiColumnSortable"
39-
:default-order-column="columnToSortBy"
40-
:default-order-direction=false
4139
:ajax="ajax"
4240
:row-click-handler=handleRowFunction
4341
:filter-case-sensitive=false

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue2-bootstrap-table2",
3-
"version": "1.1.10",
3+
"version": "1.1.10.1",
44
"description": "A sortable and searchable vue table, as a Vue component, using bootstrap styling.",
55
"keywords": [
66
"table",

src/VueBootstrapTable.vue

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,11 @@
569569
}
570570
if ( this.ajax.method=== "GET" ) {
571571
//COPY
572-
ajaxParameters = JSON.parse(JSON.stringify(this.ajax.axiosConfig));
572+
if (this.ajax !== null && this.ajax.axiosConfig!==null && this.ajax.axiosConfig!== undefined) {
573+
ajaxParameters = JSON.parse(
574+
JSON.stringify(this.ajax.axiosConfig)
575+
);
576+
}
573577
ajaxParameters.params = {};
574578
ajaxParameters.params.sortcol = this.sortKey;
575579
ajaxParameters.params.sortdir = tColsDir;
@@ -601,7 +605,9 @@
601605
if( this.ajax.enabled && !this.ajax.delegate ) {
602606
if ( this.ajax.method=== "GET" ) {
603607
//COPY
604-
ajaxParameters = JSON.parse(JSON.stringify(this.ajax.axiosConfig));
608+
if (this.ajax !== null && this.ajax.axiosConfig!==null && this.ajax.axiosConfig!== undefined) {
609+
ajaxParameters = JSON.parse(JSON.stringify(this.ajax.axiosConfig));
610+
}
605611
ajaxParameters.params = {};
606612
}
607613
if ( this.ajax.method=== "POST" ) {
@@ -624,7 +630,11 @@
624630
});
625631
}
626632
if (this.ajax.enabled && this.ajax.method === "POST") {
627-
axios.post(self.ajax.url, qs.stringify(ajaxParameters) , this.ajax.axiosConfig )
633+
var tempAxiosConf = {};
634+
if (this.ajax !== null && this.ajax.axiosConfig!==null && this.ajax.axiosConfig!== undefined) {
635+
tempAxiosConf = this.ajax.axiosConfig
636+
}
637+
axios.post(self.ajax.url, qs.stringify(ajaxParameters) , tempAxiosConf )
628638
.then(response => {
629639
if (this.ajax.delegate) {
630640
if (response.data.echo !== self.echo) {

src/app.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,7 @@ new Vue({
2828
enabled: true,
2929
url: "http://172.16.213.1:9430/data/test",
3030
method: "POST",
31-
delegate: true,
32-
axiosConfig:{
33-
headers: {
34-
'Authorization': 'Bearer TESTTESTTESTTESTTEST'
35-
}
36-
}
31+
delegate: false
3732
},
3833
columns: [
3934
{

0 commit comments

Comments
 (0)