Merge branch 'develop'

wenzhixin · wenzhixin · commit 4df574363a30 · 2025-07-28T11:20:33.000+08:00
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.24.1/dist/',
+  cdnUrl: 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.24.2/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.24.1/dist/bootstrap-table.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-table@1.24.2/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.24.1/dist/bootstrap-table.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.24.2/dist/bootstrap-table.min.js"></script>
 </head>
 <body>
   <div class="container">
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.24.1/dist/bootstrap-table-locale-all.min.js'
+    'https://cdn.jsdelivr.net/npm/bootstrap-table@1.24.2/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.24.1",
+  "version": "1.24.2",
   "description": "bootstrap-table-examples",
   "type": "module",
   "repository": {
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.24.1",
+    "bootstrap-table": "^1.24.2",
     "jquery": "^3.7.1",
     "tableexport.jquery.plugin": "^1.30.0",
     "vue": "^3.5.13"
diff --git a/webpack-starter/package.json b/webpack-starter/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@popperjs/core": "^2.11.8",
     "bootstrap": "^5.3.3",
-    "bootstrap-table": "^1.24.1",
+    "bootstrap-table": "^1.24.2",
     "jquery": "^3.7.1"
   },
   "scripts": {
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.24.1/dist/bootstrap-table-locale-all.min.js',
+    'https://cdn.jsdelivr.net/npm/bootstrap-table@1.24.2/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://unpkg.com/vue@3/dist/vue.global.js',
     'bootstrap-table.min.js',
-    'https://cdn.jsdelivr.net/npm/bootstrap-table@1.24.1/dist/bootstrap-table-vue.umd.js'
+    'https://cdn.jsdelivr.net/npm/bootstrap-table@1.24.2/dist/bootstrap-table-vue.umd.js'
   ]
 })
 </script>

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`window._config = {`
`2`	`2`	`isDebug: location.hash.slice(1) === 'is-debug' \|\|`
`3`	`3`	`['localhost', '127.0.0.1', 'dev.bootstrap-table.com'].indexOf(location.hostname) > -1,`
`4`		`- cdnUrl: 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.24.1/dist/',`
	`4`	`+ cdnUrl: 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.24.2/dist/',`
`5`	`5`	`localUrl: '../bootstrap-table/src/',`
`6`	`6`	`testUrl: '/src/'`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`links: ['bootstrap-table.min.css'],`
`6`	`6`	`scripts: [`
`7`	`7`	`'bootstrap-table.min.js',`
`8`		`- 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.24.1/dist/bootstrap-table-locale-all.min.js'`
	`8`	`+ 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.24.2/dist/bootstrap-table-locale-all.min.js'`
`9`	`9`	`]`
`10`	`10`	`})`
`11`	`11`	`</script>`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "bootstrap-table-examples",`
`3`		`- "version": "1.24.1",`
	`3`	`+ "version": "1.24.2",`
`4`	`4`	`"description": "bootstrap-table-examples",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`scripts: [`
`9`	`9`	`'https://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.29.0/tableExport.min.js',`
`10`	`10`	`'bootstrap-table.min.js',`
`11`		`- 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.24.1/dist/bootstrap-table-locale-all.min.js',`
	`11`	`+ 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.24.2/dist/bootstrap-table-locale-all.min.js',`
`12`	`12`	`'extensions/export/bootstrap-table-export.min.js'`
`13`	`13`	`]`
`14`	`14`	`})`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`scripts: [`
`9`	`9`	`'https://unpkg.com/vue@3/dist/vue.global.js',`
`10`	`10`	`'bootstrap-table.min.js',`
`11`		`- 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.24.1/dist/bootstrap-table-vue.umd.js'`
	`11`	`+ 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.24.2/dist/bootstrap-table-vue.umd.js'`
`12`	`12`	`]`
`13`	`13`	`})`
`14`	`14`	`</script>`