Skip to content

Commit a96ece5

Browse files
author
syshex
committed
#5 - Bug fix - Issue 5 - Axios config not being loaded with GET method and Delegate false.
1 parent ae1e026 commit a96ece5

File tree

7 files changed

+35
-7
lines changed

7 files changed

+35
-7
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
### 1.1.8 (August 11, 2017)
4+
5+
* Bug fix - Issue 5 - Axios config not being loaded with GET method and Delegate false.
6+
37
### 1.1.7 (August 10, 2017)
48

59
* Allowing Axios configuration to be passed for the requests

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 1 : 1.1.7
5+
### VUE 1 : 1.1.8
66

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

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

479479
## Changelog
480480

481+
### 1.1.8
482+
483+
* Bug fix - Issue 5 - Axios config not being loaded with GET method and Delegate false.
484+
481485
### 1.1.7
482486

483487
* Allowing Axios configuration to be passed for the requests

dist/vue-bootstrap-table.js

Lines changed: 11 additions & 1 deletion
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: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

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

src/VueBootstrapTable.vue

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,16 @@
536536
}
537537
//console.log(JSON.stringify(ajaxParameters));
538538
}
539+
if( this.ajax.enabled && !this.ajax.delegate ) {
540+
if ( this.ajax.method=== "GET" ) {
541+
//COPY
542+
ajaxParameters = JSON.parse(JSON.stringify(this.ajax.axiosConfig));
543+
ajaxParameters.params = {};
544+
}
545+
if ( this.ajax.method=== "POST" ) {
546+
// Do nothing at this point !
547+
}
548+
}
539549
if (this.ajax.enabled && this.ajax.method === "GET") {
540550
axios.get(self.ajax.url, ajaxParameters )
541551
.then(response => {

0 commit comments

Comments
 (0)