Merge branch 'develop'

wenzhixin · Sep 20, 2024 · 0561512 · 0561512
2 parents 30f9537 + dc0e982
commit 0561512
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 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/bootstrap-table@1.23.3/dist/',
+  cdnUrl: 'https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.4/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.3/dist/bootstrap-table.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.4/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.3/dist/bootstrap-table.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.4/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.23.3/dist/bootstrap-table-locale-all.min.js'
+      'https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.4/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.3",
+  "version": "1.23.4",
   "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.3",
+    "bootstrap-table": "^1.23.4",
     "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
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "bootstrap": "^4.5.0",
-    "bootstrap-table": "^1.23.3",
+    "bootstrap-table": "^1.23.4",
     "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/tableexport.jquery.plugin@1.29.0/tableExport.min.js',
       'bootstrap-table.min.js',
-      'https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.3/dist/bootstrap-table-locale-all.min.js',
+      'https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.4/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.23.3/dist/bootstrap-table-vue.umd.js'
+      'https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.4/dist/bootstrap-table-vue.umd.js'
     ]
   })
 </script>