wenzhixin · wenzhixin · Dec 22, 2024 · Oct 6, 2024 · Oct 6, 2024 · Oct 29, 2024
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/bootstrap-table@1.23.5/dist/',
+  cdnUrl: 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.24.0/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/bootstrap@4.6.2/dist/css/bootstrap.min.css">
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.2/css/all.min.css">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.5/dist/bootstrap-table.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-table@1.24.0/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/popper.js@1.16.1/dist/umd/popper.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.5/dist/bootstrap-table.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.24.0/dist/bootstrap-table.min.js"></script>
 </head>
 <body>
   <div class="container">

diff --git a/extensions/cookie.html b/extensions/cookie.html
@@ -43,6 +43,7 @@
       <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="test" data-visible="false">Item Price</th>
     </tr>
   </thead>
 </table>

diff --git a/issues/563.html b/issues/563.html
@@ -8,7 +8,7 @@
 </script>
 
 <style>
-.active {
+.active td {
   color: red;
   font-weight: bold;
 }

diff --git a/methods/toggle-view.html b/methods/toggle-view.html
@@ -19,6 +19,7 @@
   data-url="json/data1.json">
   <thead>
     <tr>
+      <th data-field="state" data-checkbox="true">ID</th>
       <th data-field="id">ID</th>
       <th data-field="name">Item Name</th>
       <th data-field="price">Item Price</th>

diff --git a/options/row-style.html b/options/row-style.html
@@ -10,6 +10,13 @@
   })
 </script>
 
+<style>
+.table>:not(caption)>*>* {
+  color: inherit;
+  background-color: inherit;
+}
+</style>
+
 <table
   data-toggle="table"
   data-url="json/data1.json"
@@ -42,7 +49,11 @@
 
     if (index % 2 === 0 && index / 2 < classes.length) {
       return {
-        classes: classes[index / 2]
+        classes: classes[index / 2],
+        css: {
+          color: 'white',
+          'font-weight': 'bold'
+        }
       }
     }
     return {

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/bootstrap-table@1.23.5/dist/bootstrap-table-locale-all.min.js'
+      'https://cdn.jsdelivr.net/npm/bootstrap-table@1.24.0/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.23.5",
+  "version": "1.24.0",
   "description": "bootstrap-table-examples",
   "repository": {
     "type": "git",

diff --git a/vue-starter/package.json b/vue-starter/package.json
@@ -11,7 +11,7 @@
     "@popperjs/core": "^2.11.8",
     "bootstrap": "^5.3.3",
     "bootstrap-icons": "^1.11.3",
-    "bootstrap-table": "^1.23.5",
+    "bootstrap-table": "^1.24.0",
     "jquery": "^3.7.1",
     "tableexport.jquery.plugin": "^1.30.0",
     "vue": "^3.4.27"

diff --git a/webpack-starter/package.json b/webpack-starter/package.json
@@ -4,20 +4,21 @@
   "main": "index.js",
   "license": "MIT",
   "devDependencies": {
-    "css-loader": "^3.6.0",
-    "style-loader": "^1.2.1",
-    "webpack": "^4.43.0",
-    "webpack-cli": "^3.3.12",
-    "webpack-dev-server": "^3.11.0"
+    "css-loader": "^7.1.2",
+    "style-loader": "^4.0.0",
+    "webpack": "^5.95.0",
+    "webpack-cli": "^5.1.4",
+    "webpack-dev-server": "^5.1.0"
   },
   "dependencies": {
-    "bootstrap": "^4.5.0",
-    "bootstrap-table": "^1.23.5",
-    "jquery": "^3.5.1",
-    "popper.js": "^1.16.1"
+    "@popperjs/core": "^2.11.8",
+    "bootstrap": "^5.3.3",
+    "bootstrap-table": "^1.24.0",
+    "jquery": "^3.7.1"
   },
   "scripts": {
     "build": "webpack",
-    "dev": "webpack-dev-server --inline --progress"
+    "watch": "webpack --watch",
+    "serve": "webpack serve --open"
   }
 }
diff --git a/webpack-starter/src/index.js b/webpack-starter/src/index.js
@@ -1,7 +1,7 @@
 import 'bootstrap/dist/css/bootstrap.min.css'
 import 'bootstrap-table/dist/bootstrap-table.min.css'
 
-import $ from 'jquery'
+import './jquery'
 import 'bootstrap'
 import 'bootstrap-table' // dist/bootstrap-table.min.js by default
 

diff --git a/webpack-starter/src/jquery.js b/webpack-starter/src/jquery.js
@@ -0,0 +1,3 @@
+import jQuery from 'jquery'
+window.jQuery = jQuery
+window.$ = jQuery
diff --git a/webpack-starter/webpack.config.js b/webpack-starter/webpack.config.js
@@ -1,6 +1,7 @@
 const path = require('path')
 
 module.exports = {
+  mode: 'development',
   entry: './src/index.js',
   output: {
     filename: 'main.js',
@@ -15,6 +16,6 @@ module.exports = {
     ]
   },
   devServer: {
-    contentBase: path.join(__dirname, 'dist')
+    static: './dist',
   }
 }
diff --git 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.23.5/dist/bootstrap-table-locale-all.min.js',
+      'https://cdn.jsdelivr.net/npm/bootstrap-table@1.24.0/dist/bootstrap-table-locale-all.min.js',
       'extensions/export/bootstrap-table-export.min.js'
     ]
   })

diff --git a/welcomes/from-data.html b/welcomes/from-data.html
@@ -22,35 +22,35 @@
 
   function mounted() {
     var data = [
-      {
-        'id': 0,
-        'name': 'Item 0',
-        'price': '$0'
+    {
+        id: 0,
+        name: 'Item 0',
+        _name_rowspan: 2,
+        price: '$0'
       },
       {
-        'id': 1,
-        'name': 'Item 1',
-        'price': '$1'
+        id: 1,
+        price: '$1'
       },
       {
-        'id': 2,
-        'name': 'Item 2',
-        'price': '$2'
+        id: 2,
+        name: 'Item 2',
+        price: '$2'
       },
       {
-        'id': 3,
-        'name': 'Item 3',
-        'price': '$3'
+        id: 3,
+        name: 'Item 3',
+        price: '$3'
       },
       {
-        'id': 4,
-        'name': 'Item 4',
-        'price': '$4'
+        id: 4,
+        name: 'Item 4',
+        price: '$4'
       },
       {
-        'id': 5,
-        'name': 'Item 5',
-        'price': '$5'
+        id: 5,
+        name: 'Item 5',
+        price: '$5'
       }
     ]
     $table.bootstrapTable({data: data})

diff --git a/welcomes/vue-component.html b/welcomes/vue-component.html
@@ -8,7 +8,7 @@
     scripts: [
       'https://unpkg.com/vue@3/dist/vue.global.js',
       'bootstrap-table.min.js',
-      'https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.5/dist/bootstrap-table-vue.umd.js'
+      'https://cdn.jsdelivr.net/npm/bootstrap-table@1.24.0/dist/bootstrap-table-vue.umd.js'
     ]
   })
 </script>
@@ -90,6 +90,10 @@
           showColumns: true
         })
 
+        setTimeout(() => {
+          options.value.showColumns = false
+        }, 10000)
+
         return {
           columns,
           data,