Merge branch 'develop'

wenzhixin · Feb 27, 2024 · 8b1c0a6 · 8b1c0a6
2 parents b5b183a + 5f8bb00
commit 8b1c0a6
Show file tree

Hide file tree

Showing 25 changed files with 858 additions and 722 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].2/dist/',
+  cdnUrl: 'https://cdn.jsdelivr.net/npm/[email protected].3/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://cdn.jsdelivr.net/npm/[email protected].2/dist/bootstrap-table.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].3/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://cdn.jsdelivr.net/npm/[email protected].2/dist/bootstrap-table.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/[email protected].3/dist/bootstrap-table.min.js"></script>
 </head>
 <body>
   <div class="container">

diff --git a/extensions/addrbar-page.html b/extensions/addrbar-page.html
@@ -14,6 +14,7 @@
 
 <table
   id="table"
+  data-sort-reset="true"
   data-addrbar="true"
   data-pagination="true"
   data-search="true"

diff --git a/extensions/export.html b/extensions/export.html
@@ -6,9 +6,8 @@
       'bootstrap-table.min.css'
     ],
     scripts: [
-      'https://cdn.jsdelivr.net/npm/[email protected]/tableExport.min.js',
-      'https://cdn.jsdelivr.net/npm/[email protected]/libs/jsPDF/jspdf.min.js',
-      'https://cdn.jsdelivr.net/npm/[email protected]/libs/jsPDF-AutoTable/jspdf.plugin.autotable.js',
+      'https://cdn.jsdelivr.net/npm/[email protected]/tableExport.min.js',
+      'https://cdn.jsdelivr.net/npm/[email protected]/libs/jsPDF/jspdf.umd.min.js',
       'bootstrap-table.min.js',
       'extensions/export/bootstrap-table-export.min.js'
     ]
@@ -57,10 +56,12 @@
           {
             field: 'id',
             title: 'ID'
-          }, {
+          },
+          {
             field: 'name',
             title: 'Item Name'
-          }, {
+          },
+          {
             field: 'price',
             title: 'Item Price'
           }

diff --git a/index.html b/index.html
@@ -186,8 +186,9 @@
               <li><a href="#options/detail-view-unique-id.html">Detail View Unique ID</a></li>
               <li><a href="#options/table-escape.html">Escape</a></li>
               <li><a href="#options/table-escape-title.html">Escape Title</a></li>
-              <li><a href="#options/footer-field.html">Footer Field</a></li>
               <li><a href="#options/filter-options.html">Filter Options</a></li>
+              <li><a href="#options/fixed-scroll.html">Fixed Scroll</a></li>
+              <li><a href="#options/footer-field.html">Footer Field</a></li>
               <li><a href="#options/footer-style.html">Footer Style</a></li>
               <li><a href="#options/header-style.html">Header Style</a></li>
               <li><a href="#options/table-height.html">Height</a></li>

diff --git a/integrate/angular/app.js b/integrate/angular/app.js
@@ -49,42 +49,49 @@ window.angular.module('app', ['bsTable'])
           clickToSelect: false,
           showToggle: true,
           maintainSelected: true,
-          columns: [{
-            field: 'state',
-            checkbox: true
-          }, {
-            field: 'index',
-            title: '#',
-            align: 'right',
-            valign: 'bottom',
-            sortable: true
-          }, {
-            field: 'id',
-            title: 'Item ID',
-            align: 'center',
-            valign: 'bottom',
-            sortable: true
-          }, {
-            field: 'name',
-            title: 'Item Name',
-            align: 'center',
-            valign: 'middle',
-            sortable: true
-          }, {
-            field: 'workspace',
-            title: 'Workspace',
-            align: 'left',
-            valign: 'top',
-            sortable: true
-          }, {
-            field: 'flag',
-            title: 'Flag',
-            align: 'center',
-            valign: 'middle',
-            clickToSelect: false,
-            formatter: flagFormatter
-            // events: flagEvents
-          }]
+          columns: [
+            {
+              field: 'state',
+              checkbox: true
+            },
+            {
+              field: 'index',
+              title: '#',
+              align: 'right',
+              valign: 'bottom',
+              sortable: true
+            },
+            {
+              field: 'id',
+              title: 'Item ID',
+              align: 'center',
+              valign: 'bottom',
+              sortable: true
+            },
+            {
+              field: 'name',
+              title: 'Item Name',
+              align: 'center',
+              valign: 'middle',
+              sortable: true
+            },
+            {
+              field: 'workspace',
+              title: 'Workspace',
+              align: 'left',
+              valign: 'top',
+              sortable: true
+            },
+            {
+              field: 'flag',
+              title: 'Flag',
+              align: 'center',
+              valign: 'middle',
+              clickToSelect: false,
+              formatter: flagFormatter
+              // events: flagEvents
+            }
+          ]
         }
       }
     })

diff --git a/issues/137.html b/issues/137.html
@@ -24,11 +24,13 @@
   var $table = $('#table')
   function mounted() {
     $table.bootstrapTable({
-      data: [{
-        'id': 0,
-        'name': 'Item 0',
-        'price': '$0'
-      }]
+      data: [
+        {
+          id: 0,
+          name: 'Item 0',
+          price: '$0'
+        }
+      ]
     })
     $('#button').click(function () {
       $table.bootstrapTable('refresh', {url: 'json/data1.json'})

diff --git a/issues/177.html b/issues/177.html
@@ -23,19 +23,22 @@
   function mounted() {
     $('#table').bootstrapTable({
       data: data,
-      columns: [{
-        field: 'fullName',
-        title: 'Full Name',
-        formatter: function (value, row) {
-          return [row.firstName, row.lastName].join(' ')
+      columns: [
+        {
+          field: 'fullName',
+          title: 'Full Name',
+          formatter: function (value, row) {
+            return [row.firstName, row.lastName].join(' ')
+          }
+        },
+        {
+          field: 'field',
+          title: 'Field',
+          formatter: function (value, row) {
+            return [row.field1, row.field2, row.field3].join('+')
+          }
         }
-      }, {
-        field: 'field',
-        title: 'Field',
-        formatter: function (value, row) {
-          return [row.field1, row.field2, row.field3].join('+')
-        }
-      }]
+      ]
     })
   }
 </script>
diff --git a/issues/4586.html b/issues/4586.html
@@ -61,10 +61,12 @@
           {
             field: 'id',
             title: 'ID'
-          }, {
+          },
+          {
             field: 'name',
             title: 'Item Name'
-          }, {
+          },
+          {
             field: 'price',
             title: 'Item Price'
           }

diff --git a/issues/579.html b/issues/579.html
@@ -28,17 +28,23 @@
 
   function mounted() {
     $table.bootstrapTable({
-      data: [{
-        name: 'Name 1'
-      }, {
-        name: 'Name 2'
-      }, {
-        name: 'Name 3'
-      }, {
-        name: 'Name 4'
-      }, {
-        name: 'Name 5'
-      }]
+      data: [
+        {
+          name: 'Name 1'
+        },
+        {
+          name: 'Name 2'
+        },
+        {
+          name: 'Name 3'
+        },
+        {
+          name: 'Name 4'
+        },
+        {
+          name: 'Name 5'
+        }
+      ]
     })
   }