Merge branch 'develop'

wenzhixin · Oct 1, 2024 · 8936d59 · 8936d59
2 parents 0561512 + d6e856e
commit 8936d59
Show file tree

Hide file tree

Showing 10 changed files with 51 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/[email protected].4/dist/',
+  cdnUrl: 'https://cdn.jsdelivr.net/npm/[email protected].5/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/[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].4/dist/bootstrap-table.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 {
@@ -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://cdn.jsdelivr.net/npm/[email protected]/dist/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].5/dist/bootstrap-table.min.js"></script>
 </head>
 <body>
   <div class="container">

diff --git a/index.html b/index.html
@@ -318,6 +318,7 @@
               <li><a href="#methods/expand-collapse-row.html">Expand/Collapse Row</a></li>
               <li><a href="#methods/filter-by.html">Filter By</a></li>
               <li><a href="#methods/get-data.html">Get Data</a></li>
+              <li><a href="#methods/get-footer-data.html">Get Footer Data</a></li>
               <li><a href="#methods/get-hidden-rows.html">Get Hidden Rows</a></li>
               <li><a href="#methods/get-options.html">Get Options</a></li>
               <li><a href="#methods/get-row-by-unique-id.html">Get Row By Unique Id</a></li>

diff --git a/methods/get-footer-data.html b/methods/get-footer-data.html
@@ -0,0 +1,41 @@
+<script>
+  init({
+    title: 'Get Footer Data',
+    desc: 'Get the loaded data of the footer: `$table.bootstrapTable(\'getFooterData\')`.',
+    links: ['bootstrap-table.min.css'],
+    scripts: ['bootstrap-table.min.js']
+  })
+</script>
+
+<div id="toolbar">
+  <button id="button" class="btn btn-secondary">getFooterData</button>
+</div>
+<table
+  id="table"
+  data-toggle="table"
+  data-toolbar="#toolbar"
+  data-height="460"
+  data-show-footer="true"
+  data-pagination="true"
+  data-side-pagination="server"
+  data-data-field="items"
+  data-url="json/footerField.json">
+  <thead>
+    <tr>
+      <th data-field="id">ID</th>
+      <th data-field="name">Item Name</th>
+      <th data-field="price">Item Price</th>
+    </tr>
+  </thead>
+</table>
+
+<script>
+  var $table = $('#table')
+  var $button = $('#button')
+
+  function mounted() {
+    $button.click(function () {
+      alert(JSON.stringify($table.bootstrapTable('getFooterData')))
+    })
+  }
+</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.23.4",
+  "version": "1.23.5",
   "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.4",
+    "bootstrap-table": "^1.23.5",
     "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.4",
+    "bootstrap-table": "^1.23.5",
     "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/[email protected]/tableExport.min.js',
       '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',
       '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/[email protected].4/dist/bootstrap-table-vue.umd.js'
+      'https://cdn.jsdelivr.net/npm/[email protected].5/dist/bootstrap-table-vue.umd.js'
     ]
   })
 </script>