diff --git a/assets/js/template.js b/assets/js/template.js index 4f672fd9..e654c3b0 100644 --- a/assets/js/template.js +++ b/assets/js/template.js @@ -1,7 +1,7 @@ window._config = { isDebug: location.hash.slice(1) === 'is-debug' || ['localhost', '127.0.0.1', 'dev.bootstrap-table.com'].indexOf(location.hostname) > -1, - cdnUrl: 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.22.5/dist/', + cdnUrl: 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.22.6/dist/', localUrl: '../bootstrap-table/src/', testUrl: '/src/' } diff --git a/crud/index.html b/crud/index.html index 55b130a7..f2df8b1e 100644 --- a/crud/index.html +++ b/crud/index.html @@ -5,7 +5,7 @@ - + + +
+ +
+ @@ -32,6 +49,16 @@ diff --git a/extensions/toolbar.html b/extensions/toolbar.html index 20389a23..4ab1000a 100644 --- a/extensions/toolbar.html +++ b/extensions/toolbar.html @@ -16,14 +16,18 @@ id="table" data-pagination="true" data-search="true" + data-show-columns="true" data-advanced-search="true" data-id-table="advancedTable" - data-url="json/data1.json"> + data-side-pagination="server" + data-url="https://examples.wenzhixin.net.cn/examples/bootstrap_table/data"> - +
ID Item NameItem Price + Item Price +
diff --git a/options/table-locale.html b/options/table-locale.html index 3b7125f6..82968910 100644 --- a/options/table-locale.html +++ b/options/table-locale.html @@ -5,7 +5,7 @@ links: ['bootstrap-table.min.css'], scripts: [ 'bootstrap-table.min.js', - 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.22.5/dist/bootstrap-table-locale-all.min.js' + 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.22.6/dist/bootstrap-table-locale-all.min.js' ] }) diff --git a/package.json b/package.json index dbf1924f..d0a5f95a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-table-examples", - "version": "1.22.5", + "version": "1.22.6", "description": "bootstrap-table-examples", "repository": { "type": "git", diff --git a/vue-starter/package.json b/vue-starter/package.json index 4919fddc..fe8f3cde 100644 --- a/vue-starter/package.json +++ b/vue-starter/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "bootstrap": "^4.5.0", - "bootstrap-table": "^1.22.5", + "bootstrap-table": "^1.22.6", "bootstrap-vue": "^2.15.0", "core-js": "^3.6.5", "jquery": "^3.5.1", diff --git a/webpack-starter/package.json b/webpack-starter/package.json index eec18056..e2c37c96 100644 --- a/webpack-starter/package.json +++ b/webpack-starter/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "bootstrap": "^4.5.0", - "bootstrap-table": "^1.22.5", + "bootstrap-table": "^1.22.6", "jquery": "^3.5.1", "popper.js": "^1.16.1" }, diff --git a/welcome.html b/welcome.html index 43a48b84..e0c7b6cd 100644 --- a/welcome.html +++ b/welcome.html @@ -8,7 +8,7 @@ scripts: [ 'https://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.29.0/tableExport.min.js', 'bootstrap-table.min.js', - 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.22.5/dist/bootstrap-table-locale-all.min.js', + 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.22.6/dist/bootstrap-table-locale-all.min.js', 'extensions/export/bootstrap-table-export.min.js' ] }) diff --git a/welcomes/vue-component.html b/welcomes/vue-component.html index 365122f5..e78cea17 100644 --- a/welcomes/vue-component.html +++ b/welcomes/vue-component.html @@ -8,7 +8,7 @@ scripts: [ 'https://cdn.jsdelivr.net/npm/vue@2.7.16/dist/vue.min.js', 'bootstrap-table.min.js', - 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.22.5/dist/bootstrap-table-vue.min.js' + 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.22.6/dist/bootstrap-table-vue.min.js' ] })