Merge branch 'develop'

wenzhixin · Jan 11, 2024 · 1e92d2d · 1e92d2d
2 parents 7ae3e92 + 9424191
commit 1e92d2d
Show file tree

Hide file tree

Showing 32 changed files with 62 additions and 62 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://unpkg.com/[email protected].1/dist/',
+  cdnUrl: 'https://cdn.jsdelivr.net/npm/[email protected].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://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css">
-  <link rel="stylesheet" href="https://unpkg.com/[email protected].1/dist/bootstrap-table.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].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/[email protected]/dist/umd/popper.min.js"></script>
   <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
-  <script src="https://unpkg.com/[email protected].1/dist/bootstrap-table.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/[email protected].2/dist/bootstrap-table.min.js"></script>
 </head>
 <body>
   <div class="container">

diff --git a/extensions/resizable.html b/extensions/resizable.html
@@ -3,11 +3,11 @@
     title: 'Resizable',
     desc: 'Use Plugin: <a href="https://github.com/dobtco/jquery-resizable-columns" target="_blank">jquery-resizable-columns</a> and bootstrap-table-resizable.',
     links: [
-      'https://unpkg.com/[email protected]/dist/jquery.resizableColumns.css',
+      'https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.resizableColumns.min.css',
       'bootstrap-table.min.css'
     ],
     scripts: [
-      'https://unpkg.com/[email protected]/dist/jquery.resizableColumns.min.js',
+      'https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.resizableColumns.min.js',
       'bootstrap-table.min.js',
       'extensions/resizable/bootstrap-table-resizable.min.js'
     ]

diff --git a/for-test-bootstrap3.html b/for-test-bootstrap3.html
@@ -9,7 +9,7 @@
   <meta name="author" content="Zhixin Wen, and Bootstrap table contributors">
   <!-- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> -->
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
-  <link rel="stylesheet" href="https://unpkg.com/@fortawesome/fontawesome-free@5.12.1/css/all.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.1/css/fontawesome.min.css">
 
   <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"></script>

diff --git a/for-test-bootstrap4.html b/for-test-bootstrap4.html
@@ -9,7 +9,7 @@
   <meta name="author" content="Zhixin Wen, and Bootstrap table contributors">
   <!-- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> -->
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
-  <link rel="stylesheet" href="https://unpkg.com/@fortawesome/fontawesome-free@5.12.1/css/all.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.1/css/fontawesome.min.css">
 
   <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"></script>

diff --git a/for-test-bulma.html b/for-test-bulma.html
@@ -9,7 +9,7 @@
   <meta name="author" content="Zhixin Wen, and Bootstrap table contributors">
   <!-- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> -->
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/css/bulma.min.css">
-  <link rel="stylesheet" href="https://unpkg.com/@fortawesome/fontawesome-free@5.12.1/css/all.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.1/css/fontawesome.min.css">
 
   <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
   <script src="assets/js/template.js?v=VERSION"></script>

diff --git a/for-test-foundation.html b/for-test-foundation.html
@@ -10,7 +10,7 @@
   <!-- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> -->
 
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/foundation.min.css">
-  <link rel="stylesheet" href="https://unpkg.com/@fortawesome/fontawesome-free@5.12.1/css/all.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.1/css/fontawesome.min.css">
 
   <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/foundation.min.js"></script>

diff --git a/for-test-semantic.html b/for-test-semantic.html
@@ -9,7 +9,7 @@
   <meta name="author" content="Zhixin Wen, and Bootstrap table contributors">
   <!-- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> -->
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/semantic.min.css">
-  <link rel="stylesheet" href="https://unpkg.com/@fortawesome/fontawesome-free@5.12.1/css/all.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.1/css/fontawesome.min.css">
 
   <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/semantic.min.js"></script>

diff --git a/index.html b/index.html
@@ -7,10 +7,10 @@
   <meta name="author" content="Zhixin Wen, and Bootstrap table contributors">
   <!-- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> -->
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
-  <link rel="stylesheet" href="https://unpkg.com/@fortawesome/fontawesome-free@5.12.1/css/all.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.1/css/fontawesome.min.css">
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/themes/reset-min.css">
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/themes/algolia-min.css">
-  <link rel="stylesheet" href="https://unpkg.com/[email protected]/css/hover.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/css/hover.min.css">
   <link href="assets/css/docs.min.css" rel="stylesheet">
   <link href="assets/css/index.css?v=VERSION" rel="stylesheet">
   <!-- Favicons -->

diff --git a/issues/188.html b/issues/188.html
@@ -6,7 +6,7 @@
       'bootstrap-table.min.css'
     ],
     scripts: [
-      'https://unpkg.com/tableexport.jquery.plugin/tableExport.min.js',
+      'https://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.28.0/tableExport.min.js',
       'bootstrap-table.min.js',
       'extensions/export/bootstrap-table-export.min.js'
     ]

diff --git a/issues/3784.html b/issues/3784.html
@@ -3,11 +3,11 @@
     title: 'Issue #3784',
     desc: 'Overwrite the table scrollbar(<a href="https://github.com/wenzhixin/bootstrap-table/issues/3784" target="_blank">#3784</a>).',
     links: [
-      'https://unpkg.com/perfect-scrollbar@1.4.0/css/perfect-scrollbar.css',
+      'https://cdn.jsdelivr.net/npm/perfect-scrollbar@1.5.5/css/perfect-scrollbar.min.css',
       'bootstrap-table.min.css'
     ],
     scripts: [
-      'https://unpkg.com/perfect-scrollbar@1.4.0/dist/perfect-scrollbar.min.js',
+      'https://cdn.jsdelivr.net/npm/perfect-scrollbar@1.5.5/dist/perfect-scrollbar.min.js',
       'bootstrap-table.min.js'
     ]
   })

diff --git a/issues/3830.html b/issues/3830.html
@@ -4,7 +4,7 @@
     desc: 'Export all records with server side pagination(<a href="https://github.com/wenzhixin/bootstrap-table/issues/3830" target="_blank">#3830</a>).',
     links: ['bootstrap-table.min.css'],
     scripts: [
-      'https://unpkg.com/tableexport.jquery.plugin/tableExport.min.js',
+      'https://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.28.0/tableExport.min.js',
       'bootstrap-table.min.js',
       'extensions/export/bootstrap-table-export.min.js'
     ]

diff --git a/issues/4214.html b/issues/4214.html
@@ -4,7 +4,7 @@
     desc: 'Added index field.(<a href="https://github.com/wenzhixin/bootstrap-table/issues/4214" target="_blank">#4214</a>).',
     links: ['bootstrap-table.min.css'],
     scripts: [
-      'https://unpkg.com/tableexport.jquery.plugin/tableExport.min.js',
+      'https://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.28.0/tableExport.min.js',
       'bootstrap-table.min.js',
       'extensions/export/bootstrap-table-export.min.js'
     ]

diff --git a/issues/4586.html b/issues/4586.html
@@ -4,7 +4,7 @@
     desc: 'Customize data attribute of td.(<a href="https://github.com/wenzhixin/bootstrap-table/issues/4586" target="_blank">#4586</a>).',
     links: ['bootstrap-table.min.css'],
     scripts: [
-      'https://unpkg.com/tableexport.jquery.plugin/tableExport.min.js',
+      'https://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.28.0/tableExport.min.js',
       'bootstrap-table.min.js',
       'extensions/export/bootstrap-table-export.min.js'
     ]

diff --git a/json/footerField.json b/json/footerField.json
@@ -58,8 +58,8 @@
         }
     ],
     "footer": {
-        "id": "footer id",
-        "_id_colspan": 2,
-        "name": "footer name"
+        "id": "Total",
+        "name": "10",
+        "price": "$55"
     }
 }
diff --git a/options/icons-prefix.html b/options/icons-prefix.html
@@ -3,7 +3,7 @@
     title: 'Icons Prefix',
     desc: 'Use `iconsPrefix` option to defines icon set name. In the case we use ionicons as an example.',
     links: [
-      'https://unpkg.com/ionicons@4.5.5/dist/css/ionicons.min.css',
+      'https://cdn.jsdelivr.net/npm/ionicons@7.2.2/dist/collection/components/icon/icon.min.css',
       'bootstrap-table.min.css'
     ],
     scripts: ['bootstrap-table.min.js']

diff --git a/options/loading-template.html b/options/loading-template.html
@@ -3,7 +3,7 @@
     title: 'Loading Template',
     desc: 'Use `loadingTemplate` option to custom the loading type.',
     links: [
-      'https://unpkg.com/placeholder-loading/dist/css/placeholder-loading.min.css',
+      'https://cdn.jsdelivr.net/npm/placeholder-loading@0.6.0/dist/css/placeholder-loading.min.css',
       'bootstrap-table.min.css'
     ],
     scripts: ['bootstrap-table.min.js']

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://unpkg.com/[email protected].1/dist/bootstrap-table-locale-all.min.js'
+      'https://cdn.jsdelivr.net/npm/[email protected].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.22.1",
+  "version": "1.22.2",
   "description": "bootstrap-table-examples",
   "repository": {
     "type": "git",

diff --git a/template-bootstrap-table.html b/template-bootstrap-table.html
@@ -9,8 +9,8 @@
   <meta name="author" content="Zhixin Wen, and Bootstrap table contributors">
   <!-- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> -->
 
-  <link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@10.7.2/styles/default.min.css">
-  <link rel="stylesheet" href="https://unpkg.com/@fortawesome/fontawesome-free@5.12.1/css/all.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@highlightjs/cdn-assets@11.9.0/styles/default.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.1/css/fontawesome.min.css">
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/hint.min.css">
   <link rel="stylesheet" href="assets/css/docs.min.css">
   <link rel="stylesheet" href="assets/css/template.css?v=VERSION">
@@ -28,9 +28,9 @@
 
   <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/sprintf.min.js"></script>
-  <script src="https://unpkg.com/@highlightjs/cdn-assets@10.7.2/highlight.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@highlightjs/cdn-assets@11.9.0/highlight.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/marked.min.js"></script>
-  <script src="https://unpkg.com/[email protected]/flexibility.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/[email protected]/flexibility.min.js"></script>
   <script src="assets/js/template.js?v=VERSION"></script>
 
   <!-- Global site tag (gtag.js) - Google Analytics -->

diff --git a/template-bootstrap3.html b/template-bootstrap3.html
@@ -11,18 +11,18 @@
 
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
 
-  <link rel="stylesheet" href="https://unpkg.com/@fortawesome/fontawesome-free@5.12.1/css/all.min.css">
-  <link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@10.7.2/styles/default.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.1/css/fontawesome.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@highlightjs/cdn-assets@11.9.0/styles/default.min.css">
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/hint.min.css">
   <link rel="stylesheet" href="assets/css/docs.min.css">
   <link rel="stylesheet" href="assets/css/template.css?v=VERSION">
 
   <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.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]/dist/sprintf.min.js"></script>
-  <script src="https://unpkg.com/@highlightjs/cdn-assets@10.7.2/highlight.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@highlightjs/cdn-assets@11.9.0/highlight.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/marked.min.js"></script>
-  <script src="https://unpkg.com/[email protected]/flexibility.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/[email protected]/flexibility.min.js"></script>
   <script src="assets/js/template.js?v=VERSION"></script>
 
   <!-- Global site tag (gtag.js) - Google Analytics -->

diff --git a/template-bootstrap4.html b/template-bootstrap4.html
@@ -9,8 +9,8 @@
   <meta name="author" content="Zhixin Wen, and Bootstrap table contributors">
   <!-- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> -->
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
-  <link rel="stylesheet" href="https://unpkg.com/@fortawesome/fontawesome-free@5.12.1/css/all.min.css">
-  <link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@10.7.2/styles/default.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.1/css/fontawesome.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@highlightjs/cdn-assets@11.9.0/styles/default.min.css">
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/hint.min.css">
   <link rel="stylesheet" href="assets/css/docs.min.css">
   <link rel="stylesheet" href="assets/css/template.css?v=VERSION">
@@ -19,9 +19,9 @@
   <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]/dist/sprintf.min.js"></script>
-  <script src="https://unpkg.com/@highlightjs/cdn-assets@10.7.2/highlight.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@highlightjs/cdn-assets@11.9.0/highlight.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/marked.min.js"></script>
-  <script src="https://unpkg.com/[email protected]/flexibility.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/[email protected]/flexibility.min.js"></script>
   <script src="assets/js/template.js?v=VERSION"></script>
 
   <!-- Global site tag (gtag.js) - Google Analytics -->

diff --git a/template-bulma.html b/template-bulma.html
@@ -10,17 +10,17 @@
   <!-- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> -->
 
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/css/bulma.min.css">
-  <link rel="stylesheet" href="https://unpkg.com/@fortawesome/fontawesome-free@5.12.1/css/all.min.css">
-  <link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@10.7.2/styles/default.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.1/css/fontawesome.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@highlightjs/cdn-assets@11.9.0/styles/default.min.css">
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/hint.min.css">
   <link rel="stylesheet" href="assets/css/docs.min.css">
   <link rel="stylesheet" href="assets/css/template.css?v=VERSION">
 
   <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/sprintf.min.js"></script>
-  <script src="https://unpkg.com/@highlightjs/cdn-assets@10.7.2/highlight.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@highlightjs/cdn-assets@11.9.0/highlight.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/marked.min.js"></script>
-  <script src="https://unpkg.com/[email protected]/flexibility.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/[email protected]/flexibility.min.js"></script>
   <script src="assets/js/template.js?v=VERSION"></script>
 
   <!-- Global site tag (gtag.js) - Google Analytics -->

diff --git a/template-foundation.html b/template-foundation.html
@@ -10,18 +10,18 @@
   <!-- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> -->
 
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/foundation.min.css">
-  <link rel="stylesheet" href="https://unpkg.com/@fortawesome/fontawesome-free@5.12.1/css/all.min.css">
-  <link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@10.7.2/styles/default.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.1/css/fontawesome.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@highlightjs/cdn-assets@11.9.0/styles/default.min.css">
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/hint.min.css">
   <link rel="stylesheet" href="assets/css/docs.min.css">
   <link rel="stylesheet" href="assets/css/template.css?v=VERSION">
 
   <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/foundation.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/sprintf.min.js"></script>
-  <script src="https://unpkg.com/@highlightjs/cdn-assets@10.7.2/highlight.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@highlightjs/cdn-assets@11.9.0/highlight.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/marked.min.js"></script>
-  <script src="https://unpkg.com/[email protected]/flexibility.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/[email protected]/flexibility.min.js"></script>
   <script src="assets/js/template.js?v=VERSION"></script>
 
   <!-- Global site tag (gtag.js) - Google Analytics -->