Merge branch 'develop'

wenzhixin · May 15, 2024 · 0dfedc6 · 0dfedc6
2 parents 4063f11 + d5cf8cc
commit 0dfedc6
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 13 deletions.
diff --git 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/[email protected].5/dist/',
+  cdnUrl: 'https://cdn.jsdelivr.net/npm/[email protected].6/dist/',
   localUrl: '../bootstrap-table/src/',
   testUrl: '/src/'
 }

diff --git a/crud/index.html b/crud/index.html
@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/all.min.css">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].5/dist/bootstrap-table.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].6/dist/bootstrap-table.min.css">
   <style>
     .mr10 { margin-right: 10px; }
     .alert {
@@ -17,7 +17,7 @@
   <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/[email protected].5/dist/bootstrap-table.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/[email protected].6/dist/bootstrap-table.min.js"></script>
 </head>
 <body>
   <div class="container">

diff --git a/extensions/cookie.html b/extensions/cookie.html
@@ -7,18 +7,35 @@
     ],
     scripts: [
       'bootstrap-table.min.js',
-      'extensions/cookie/bootstrap-table-cookie.min.js'
+      'extensions/cookie/bootstrap-table-cookie.min.js',
+      'https://cdn.jsdelivr.net/npm/[email protected]/dist/bootstrap-table-locale-all.min.js'
     ]
   })
 </script>
 
+<style>
+select.form-control {
+  width: 200px;
+}
+</style>
+
+<div class="toolbar">
+  <select class="form-control" id="locale">
+    <option value="en-US">en-US</option>
+    <option value="zh-CN" selected>zh-CN</option>
+  </select>
+</div>
+
 <table
   id="table"
+  data-toolbar=".toolbar"
   data-show-columns="true"
   data-cookie="true"
   data-cookie-id-table="saveId"
+  data-page-list="10,25,50,100,all"
   data-pagination="true"
   data-search="true"
+  data-height="460"
   data-url="https://examples.wenzhixin.net.cn/examples/bootstrap_table/data"
   data-side-pagination="server">
   <thead>
@@ -32,6 +49,16 @@
 
 <script>
   function mounted() {
-    $('#table').bootstrapTable()
+    var $table = $('#table')
+
+    $table.bootstrapTable({
+      cookieStorage: 'localStorage'
+    })
+
+    $('#locale').change(function () {
+      $table.bootstrapTable('refreshOptions', {
+        locale: $(this).val()
+      })
+    })
   }
 </script>
diff --git 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">
   <thead>
     <tr>
       <th data-field="id" data-sortable="true">ID</th>
       <th data-field="name" data-sortable="true">Item Name</th>
-      <th data-field="price" data-sortable="true">Item Price</th>
+      <th data-field="price" data-sortable="true">
+        <i class="fa fa-star"></i> Item Price
+      </th>
     </tr>
   </thead>
 </table>

diff --git 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/[email protected].5/dist/bootstrap-table-locale-all.min.js'
+      'https://cdn.jsdelivr.net/npm/[email protected].6/dist/bootstrap-table-locale-all.min.js'
     ]
   })
 </script>

diff --git 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
@@ -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
@@ -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
@@ -8,7 +8,7 @@
     scripts: [
       'https://cdn.jsdelivr.net/npm/[email protected]/tableExport.min.js',
       'bootstrap-table.min.js',
-      'https://cdn.jsdelivr.net/npm/[email protected].5/dist/bootstrap-table-locale-all.min.js',
+      'https://cdn.jsdelivr.net/npm/[email protected].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
@@ -8,7 +8,7 @@
     scripts: [
       'https://cdn.jsdelivr.net/npm/[email protected]/dist/vue.min.js',
       'bootstrap-table.min.js',
-      'https://cdn.jsdelivr.net/npm/[email protected].5/dist/bootstrap-table-vue.min.js'
+      'https://cdn.jsdelivr.net/npm/[email protected].6/dist/bootstrap-table-vue.min.js'
     ]
   })
 </script>