Merge branch 'develop'

wenzhixin · Jul 27, 2024 · d24c460 · d24c460
2 parents 913ab41 + 150330a
commit d24c460
Show file tree

Hide file tree

Showing 15 changed files with 118 additions and 28 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].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://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].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://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/[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/export.html b/extensions/export.html
@@ -36,12 +36,30 @@
   data-toolbar="#toolbar"
   data-show-toggle="true"
   data-show-columns="true"
+  data-show-footer="true"
   data-url="https://examples.wenzhixin.net.cn/examples/bootstrap_table/data">
 </table>
 
 <script>
   var $table = $('#table')
 
+  function idFormatter() {
+    return 'Total'
+  }
+
+  function nameFormatter(data) {
+    return data.length
+  }
+
+  function priceFormatter(data) {
+    var field = this.field
+    return '$' + data.map(function (row) {
+      return +row[field].substring(1)
+    }).reduce(function (sum, i) {
+      return sum + i
+    }, 0)
+  }
+
   function mounted() {
     $('#toolbar').find('select').change(function () {
       $table.bootstrapTable('destroy').bootstrapTable({
@@ -55,15 +73,18 @@
           },
           {
             field: 'id',
-            title: 'ID'
+            title: 'ID',
+            footerFormatter: idFormatter
           },
           {
             field: 'name',
-            title: 'Item Name'
+            title: 'Item Name',
+            footerFormatter: nameFormatter
           },
           {
             field: 'price',
-            title: 'Item Price'
+            title: 'Item Price',
+            footerFormatter: priceFormatter
           }
         ]
       })

diff --git a/index.html b/index.html
@@ -161,6 +161,7 @@
               <li><a href="#options/basic-columns.html">Basic Columns</a></li>
               <li><a href="#options/buttons.html">Buttons Custom</a></li>
               <li><a href="#options/buttons-align.html">Buttons Align</a></li>
+              <li><a href="#options/buttons-attribute-title.html">Buttons Attribute Title</a></li>
               <li data-show="bootstrap3,bootstrap4,"><a href="#options/buttons-class.html">Buttons Class</a></li>
               <li><a href="#options/buttons-order.html">Buttons Order</a></li>
               <li data-show="bootstrap3,bootstrap4,"><a href="#options/buttons-prefix.html">Buttons Prefix</a></li>

diff --git a/methods/insert-row.html b/methods/insert-row.html
@@ -11,12 +11,13 @@
   <button id="button" class="btn btn-secondary">insertRow</button>
 </div>
 <table id="table"
-      data-toggle="table"
-      data-toolbar="#toolbar"
-      data-height="428"
-      data-url="json/data1.json">
+  data-toggle="table"
+  data-toolbar="#toolbar"
+  data-height="428"
+  data-url="json/data1.json">
   <thead>
   <tr>
+    <th data-field="state" data-checkbox="true"></th>
     <th data-field="id">ID</th>
     <th data-field="name">Item Name</th>
     <th data-field="price">Item Price</th>
@@ -40,5 +41,9 @@
         }
       })
     })
+
+    $table.on('check.bs.table', (event, row) => {
+      console.log(JSON.stringify(row))
+    })
   }
 </script>
diff --git a/methods/update-cell.html b/methods/update-cell.html
@@ -8,20 +8,27 @@
 </script>
 
 <div id="toolbar">
+  <div class="form-check form-check-inline">
+    <input class="form-check-input" type="checkbox" checked id="reinit">
+    <label class="form-check-label" for="flexCheckDefault">
+      reinit
+    </label>
+  </div>
   <button id="button" class="btn btn-secondary">updateCell</button>
 </div>
 <table
   id="table"
   data-toggle="table"
   data-toolbar="#toolbar"
   data-height="428"
+  data-search="true"
   data-url="json/data1.json">
   <thead>
     <tr>
       <th data-checkbox="true" data-field="state"></th>
-      <th data-field="id">ID</th>
-      <th data-field="name" data-width="300">Item Name</th>
-      <th data-field="price">Item Price</th>
+      <th data-field="id" data-sortable="true">ID</th>
+      <th data-field="name" data-sortable="true" data-width="300">Item Name</th>
+      <th data-field="price" data-sortable="true">Item Price</th>
     </tr>
   </thead>
 </table>
@@ -32,15 +39,28 @@
 
   function mounted() {
     $button.click(function () {
-      let i = 0
-      setInterval(() => {
+      const checked = $('#reinit').prop('checked')
+
+      if (!checked) {
+        let i = 0
+        const timeout = setInterval(() => {
+          $table.bootstrapTable('updateCell', {
+            index: 1,
+            field: 'name',
+            value: `Updated Name ${i++}`,
+            reinit: false
+          })
+          if (i > 10) {
+            clearInterval(timeout)
+          }
+        }, 100)
+      } else {
         $table.bootstrapTable('updateCell', {
           index: 1,
           field: 'name',
-          value: `Updated Name ${i++}`,
-          reinit: false
+          value: 'Updated Name'
         })
-      }, 100)
+      }
     })
   }
 </script>
diff --git a/methods/update-row.html b/methods/update-row.html
@@ -15,12 +15,13 @@
   data-toggle="table"
   data-toolbar="#toolbar"
   data-height="428"
+  data-search="true"
   data-url="json/data1.json">
   <thead>
     <tr>
-      <th data-field="id">ID</th>
-      <th data-field="name">Item Name</th>
-      <th data-field="price">Item Price</th>
+      <th data-field="id" data-sortable="true">ID</th>
+      <th data-field="name" data-sortable="true">Item Name</th>
+      <th data-field="price" data-sortable="true">Item Price</th>
     </tr>
   </thead>
 </table>

diff --git a/options/buttons-attribute-title.html b/options/buttons-attribute-title.html
@@ -0,0 +1,35 @@
+<script>
+  init({
+    title: 'Buttons Attribute Title',
+    desc: 'Customize the title attribute of the toolbar buttons, which is mainly used to customize the toolbar style.',
+    links: [
+      'https://unpkg.com/[email protected]/src/hint-css.css',
+      'bootstrap-table.min.css'
+    ],
+    scripts: [
+      'https://unpkg.com/[email protected]/src/hint-css.js',
+      'bootstrap-table.min.js'
+    ]
+  })
+</script>
+
+<table
+  id="table"
+  data-toggle="table"
+  data-height="460"
+  data-search="true"
+  data-show-pagination-switch="true"
+  data-show-refresh="true"
+  data-show-toggle="true"
+  data-show-columns="true"
+  data-show-fullscreen="true"
+  data-buttons-attribute-title="data-hint"
+  data-url="json/data1.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>
diff --git a/options/search-highlight.html b/options/search-highlight.html
@@ -17,7 +17,14 @@
     <tr>
       <th data-field="id">ID</th>
       <th data-field="name">Item Name</th>
-      <th data-field="price">Item Price</th>
+      <th data-field="price" data-formatter="priceFormatter">Item Price</th>
     </tr>
   </thead>
 </table>
+
+<script>
+  function priceFormatter (value, row) {
+    return `<span>${value}</span>
+      <span style="margin-left: 5px">(${row.name})</span>`
+  }
+</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].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.23.1",
+  "version": "1.23.2",
   "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.1",
+    "bootstrap-table": "^1.23.2",
     "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.1",
+    "bootstrap-table": "^1.23.2",
     "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].1/dist/bootstrap-table-locale-all.min.js',
+      'https://cdn.jsdelivr.net/npm/[email protected].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/[email protected].1/dist/bootstrap-table-vue.umd.js'
+      'https://cdn.jsdelivr.net/npm/[email protected].2/dist/bootstrap-table-vue.umd.js'
     ]
   })
 </script>