Merge branch 'develop'

wenzhixin · Apr 29, 2024 · 4063f11 · 4063f11
2 parents b215cde + c27ead6
commit 4063f11
Show file tree

Hide file tree

Showing 49 changed files with 106 additions and 93 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/assets/css/template.css b/assets/css/template.css
@@ -27,7 +27,7 @@ body {
 
 .header-wrapper {
   -js-display: flex;
-	display: flex;
+  display: flex;
 }
 
 .title-desc {

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].4/dist/',
+  cdnUrl: 'https://cdn.jsdelivr.net/npm/[email protected].5/dist/',
   localUrl: '../bootstrap-table/src/',
   testUrl: '/src/'
 }
@@ -16,7 +16,7 @@ function _getLink(file) {
         file.replace(/\.min/, '') + '?t=' + (+new Date())
     }
   }
-  return '<link href="' + url + '" rel="stylesheet">'
+  return '<link rel="stylesheet" href="' + url + '">'
 }
 
 function _getScript(file, isScriptTag) {

diff --git a/crud/db.json b/crud/db.json
@@ -36,4 +36,4 @@
       "description": "my blog"
     }
   ]
-}
+}
diff --git a/crud/index.html b/crud/index.html
@@ -3,9 +3,9 @@
 <head>
   <title>CRUD Table</title>
   <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://cdn.jsdelivr.net/npm/[email protected].4/dist/bootstrap-table.min.css">
+  <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">
   <style>
     .mr10 { margin-right: 10px; }
     .alert {
@@ -15,9 +15,9 @@
     }
   </style>
   <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/[email protected].0/dist/umd/popper.min.js"></script>
-  <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/[email protected].4/dist/bootstrap-table.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/[email protected].1/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>
 </head>
 <body>
   <div class="container">

diff --git a/extensions/custom-view.html b/extensions/custom-view.html
@@ -212,7 +212,7 @@ <h3 class="mb-0">%SNIPPETS%</h3>
         .replace('%IMAGE%', row.image)
         .replace('%FOLLOWER%', row.follower)
         .replace('%FOLLOWING%', row.following)
-        .replace('%SNIPPETS%', row.snippets);
+        .replace('%SNIPPETS%', row.snippets)
     })
 
     return `<div class="row mx-0">${view}</div>`

diff --git a/extensions/editable.html b/extensions/editable.html
@@ -3,11 +3,11 @@
     title: 'Editable',
     desc: 'Use Plugin: <a href="https://github.com/vitalets/x-editable" target="_blank">x-editable</a> and bootstrap-table-editable.',
     links: [
-      'https://cdn.jsdelivr.net/npm/[email protected].1/dist/bootstrap3-editable/css/bootstrap-editable.css',
+      'https://cdn.jsdelivr.net/npm/[email protected].11/dist/bootstrap3-editable/css/bootstrap-editable.css',
       'bootstrap-table.min.css'
     ],
     scripts: [
-      'https://cdn.jsdelivr.net/npm/[email protected].1/dist/bootstrap3-editable/js/bootstrap-editable.min.js',
+      'https://cdn.jsdelivr.net/npm/[email protected].11/dist/bootstrap3-editable/js/bootstrap-editable.min.js',
       'bootstrap-table.min.js',
       'extensions/editable/bootstrap-table-editable.min.js'
     ]

diff --git a/extensions/export.html b/extensions/export.html
@@ -6,8 +6,8 @@
       'bootstrap-table.min.css'
     ],
     scripts: [
-      'https://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.28.0/tableExport.min.js',
-      'https://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.28.0/libs/jsPDF/jspdf.umd.min.js',
+      'https://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.29.0/tableExport.min.js',
+      'https://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.29.0/libs/jsPDF/jspdf.umd.min.js',
       'bootstrap-table.min.js',
       'extensions/export/bootstrap-table-export.min.js'
     ]

diff --git a/extensions/print.html b/extensions/print.html
@@ -29,7 +29,7 @@
 
   function mounted() {
     $table.bootstrapTable({
-      printStyles: ['https://cdn.jsdelivr.net/npm/@fortawesome/[email protected].1/css/all.min.css']
+      printStyles: ['https://cdn.jsdelivr.net/npm/@fortawesome/[email protected].2/css/all.min.css']
     })
   }
 </script>
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://cdn.jsdelivr.net/npm/@fortawesome/[email protected].1/css/all.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/[email protected].2/css/all.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://cdn.jsdelivr.net/npm/@fortawesome/[email protected].1/css/all.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/[email protected].2/css/all.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
@@ -8,8 +8,8 @@
   <meta name="keywords" content="table, bootstrap, bootstrap plugin, bootstrap resources, bootstrap table, jQuery plugin">
   <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/bulma@0.9.2/css/bulma.min.css">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/[email protected].1/css/all.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@1.0.0/css/bulma.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/[email protected].2/css/all.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
@@ -9,11 +9,11 @@
   <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/foundation-sites@6.5.3/dist/css/foundation.min.css">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/[email protected].1/css/all.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.8.1/dist/css/foundation.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/[email protected].2/css/all.min.css">
 
   <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/foundation-sites@6.5.3/dist/js/foundation.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/foundation-sites@6.8.1/dist/js/foundation.min.js"></script>
   <script src="assets/js/template.js?v=VERSION"></script>
 </head>
 <body>

diff --git a/for-test-semantic.html b/for-test-semantic.html
@@ -8,11 +8,11 @@
   <meta name="keywords" content="table, bootstrap, bootstrap plugin, bootstrap resources, bootstrap table, jQuery plugin">
   <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/semantic-ui@2.4.2/dist/semantic.min.css">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/[email protected].1/css/all.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/semantic-ui@2.5.0/dist/semantic.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/[email protected].2/css/all.min.css">
 
   <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/semantic-ui@2.4.2/dist/semantic.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/semantic-ui@2.5.0/dist/semantic.min.js"></script>
   <script src="assets/js/template.js?v=VERSION"></script>
 </head>
 <body>

diff --git a/for-test.html b/for-test.html
@@ -8,11 +8,11 @@
   <meta name="keywords" content="table, bootstrap, bootstrap plugin, bootstrap resources, bootstrap table, jQuery plugin">
   <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/bootstrap-icons@1.4.1/font/bootstrap-icons.css">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css">
 
   <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
   <script src="assets/js/template.js?v=VERSION"></script>
 </head>
 <body>

diff --git a/index.html b/index.html
@@ -7,12 +7,12 @@
   <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://cdn.jsdelivr.net/npm/@fortawesome/[email protected].1/css/all.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/[email protected].2/css/all.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://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">
+  <link rel="stylesheet" href="assets/css/docs.min.css">
+  <link rel="stylesheet" href="assets/css/index.css?v=VERSION">
   <!-- Favicons -->
   <link rel="apple-touch-icon" href="favicon.png">
   <link rel="icon" href="favicon.png">
@@ -589,7 +589,7 @@
   </div>
 
   <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/[email protected].0/dist/umd/popper.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/[email protected].1/dist/umd/popper.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"></script>
   <script>$.browser = {}</script>
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/jquery.ba-hashchange.min.js"></script>

diff --git a/issues/188.html b/issues/188.html
@@ -6,7 +6,7 @@
       'bootstrap-table.min.css'
     ],
     scripts: [
-      'https://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.28.0/tableExport.min.js',
+      'https://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.29.0/tableExport.min.js',
       'bootstrap-table.min.js',
       'extensions/export/bootstrap-table-export.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://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.28.0/tableExport.min.js',
+      'https://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.29.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://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.28.0/tableExport.min.js',
+      'https://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.29.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://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.28.0/tableExport.min.js',
+      'https://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.29.0/tableExport.min.js',
       'bootstrap-table.min.js',
       'extensions/export/bootstrap-table-export.min.js'
     ]

diff --git a/issues/986.html b/issues/986.html
@@ -3,11 +3,11 @@
     title: 'Issue #986',
     desc: 'Editable select box(<a href="https://github.com/wenzhixin/bootstrap-table/issues/986" target="_blank">#986</a>).',
     links: [
-      'https://cdn.jsdelivr.net/npm/[email protected].1/dist/bootstrap3-editable/css/bootstrap-editable.css',
+      'https://cdn.jsdelivr.net/npm/[email protected].11/dist/bootstrap3-editable/css/bootstrap-editable.css',
       'bootstrap-table.min.css'
     ],
     scripts: [
-      'https://cdn.jsdelivr.net/npm/[email protected].1/dist/bootstrap3-editable/js/bootstrap-editable.min.js',
+      'https://cdn.jsdelivr.net/npm/[email protected].11/dist/bootstrap3-editable/js/bootstrap-editable.min.js',
       'bootstrap-table.min.js',
       'extensions/editable/bootstrap-table-editable.min.js'
     ]

diff --git a/json/353.json b/json/353.json
@@ -29,4 +29,4 @@
     "account": 215,
     "computer": 289,
     "regcode": "1:2:215:289"
-}
+}
diff --git a/json/409.json b/json/409.json
@@ -14,4 +14,4 @@
         "name": "New Item 2",
         "price": "$12"
     }
-]
+]
diff --git a/json/data2.json b/json/data2.json
@@ -57,4 +57,4 @@
             "price": "$10"
         }
     ]
-}
+}
diff --git a/json/data3.json b/json/data3.json
@@ -29,4 +29,4 @@
             "description": "Show/hide password plugin for twitter bootstrap."
         }
     }
-]
+]
diff --git a/json/data4.json b/json/data4.json
@@ -32,4 +32,4 @@
             }
         }
     ]
-}
+}
diff --git a/json/data5.json b/json/data5.json
@@ -188,4 +188,4 @@
         "column3": "C 30",
         "column4": "C 40"
     }
-]
+]
diff --git a/json/treegrid.json b/json/treegrid.json
@@ -62,4 +62,4 @@
       "name": "删除环境",
       "permissionValue": "open:env:delete"
     }
-]
+]
diff --git a/methods/sort-by.html b/methods/sort-by.html
@@ -51,22 +51,22 @@
       var field = ''
       var sortOrder = ''
 
-      if (this.value == 'name_asc') {
+      if (this.value === 'name_asc') {
         field = 'github.name'
         sortOrder = 'asc'
-      } else if (this.value == 'name_desc') {
+      } else if (this.value === 'name_desc') {
         field = 'github.name'
         sortOrder = 'desc'
-      } else if (this.value == 'stargazers_asc') {
+      } else if (this.value === 'stargazers_asc') {
         field = 'github.count.stargazers'
         sortOrder = 'asc'
-      } else if (this.value == 'stargazers_desc') {
+      } else if (this.value === 'stargazers_desc') {
         field = 'github.count.stargazers'
         sortOrder = 'desc'
-      } else if (this.value == 'forks_asc') {
+      } else if (this.value === 'forks_asc') {
         field = 'github.count.forks'
         sortOrder = 'asc'
-      } else if (this.value == 'forks_desc') {
+      } else if (this.value === 'forks_desc') {
         field = 'github.count.forks'
         sortOrder = 'desc'
       }

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 font-awesome instead of bootstrap-icons by default.',
     links: [
-      'https://cdn.jsdelivr.net/npm/@fortawesome/[email protected].1/css/all.min.css',
+      'https://cdn.jsdelivr.net/npm/@fortawesome/[email protected].2/css/all.min.css',
       'bootstrap-table.min.css'
     ],
     scripts: ['bootstrap-table.min.js']

diff --git a/options/sort-empty-last.html b/options/sort-empty-last.html
@@ -55,4 +55,4 @@
     ]
     $table.bootstrapTable({data: data})
   }
-</script>
+</script>
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].4/dist/bootstrap-table-locale-all.min.js'
+      'https://cdn.jsdelivr.net/npm/[email protected].5/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.4",
+  "version": "1.22.5",
   "description": "bootstrap-table-examples",
   "repository": {
     "type": "git",
@@ -13,18 +13,22 @@
   },
   "homepage": "https://github.com/wenzhixin/bootstrap-table-examples",
   "scripts": {
-    "lint": "eslint --ext .html,.js .",
+    "lint:js": "eslint --ext .html,.js .",
+    "lint:editor": "editorconfig-checker",
+    "lint": "run-s lint:*",
     "build": "babel utils/natural-sorting/src -d utils/natural-sorting/dist"
   },
   "devDependencies": {
     "@babel/cli": "^7.7.0",
     "@babel/core": "^7.7.2",
     "@babel/preset-env": "^7.7.1",
     "babel-eslint": "^10.0.3",
+    "editorconfig-checker": "^5.1.5",
     "eslint": "^5.10.0",
     "eslint-plugin-html": "^5.0.0",
     "eslint-plugin-vue": "^5.2.3",
-    "getopts": "^2.2.3"
+    "getopts": "^2.2.3",
+    "npm-run-all": "^4.1.5"
   },
   "dependencies": {
     "express": "^4.17.1"
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,4 +36,4 @@ @@
           "description": "my blog"
         }
       ]
-    }
+    }