升级bootstrap-table到最新版本1.19.1

ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/auto-refresh/bootstrap-table-auto-refresh.js

@@ -8,6 +8,7 @@ var Utils = $.fn.bootstrapTable.utils
 
 $.extend($.fn.bootstrapTable.defaults, {
   autoRefresh: false,
+  showAutoRefresh: true,
   autoRefreshInterval: 60,
   autoRefreshSilent: true,
   autoRefreshStatus: true,
@@ -17,6 +18,7 @@ $.extend($.fn.bootstrapTable.defaults, {
 $.extend($.fn.bootstrapTable.defaults.icons, {
   autoRefresh: {
     bootstrap3: 'glyphicon-time icon-time',
+    bootstrap5: 'bi-clock',
     materialize: 'access_time',
     'bootstrap-table': 'icon-clock'
   }[$.fn.bootstrapTable.theme] || 'fa-clock'

ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js

@@ -225,6 +225,7 @@ $.BootstrapTable = class extends $.BootstrapTable {
     const initFixedBody = ($fixedColumns, $fixedHeader) => {
       $fixedColumns.find('.fixed-table-body').remove()
       $fixedColumns.append(this.$tableBody.clone(true))
+      $fixedColumns.find('.fixed-table-body table').removeAttr('id')
 
       const $fixedBody = $fixedColumns.find('.fixed-table-body')
 

ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/custom-view/bootstrap-table-custom-view.js

@@ -1,5 +1,6 @@
 /**
- * @author zhixin wen <wenzhixin2010@gmail.com>
+ * @author: Dustin Utecht
+ * @github: https://github.com/UtechtDustin
  */
 
 var Utils = $.fn.bootstrapTable.utils

ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js

@@ -43,6 +43,7 @@ $.extend($.fn.bootstrapTable.columnDefaults, {
 $.extend($.fn.bootstrapTable.defaults.icons, {
   export: {
     bootstrap3: 'glyphicon-export icon-share',
+    bootstrap5: 'bi-download',
     materialize: 'file_download',
     'bootstrap-table': 'icon-download'
   }[$.fn.bootstrapTable.theme] || 'fa-download'
@@ -91,30 +92,51 @@ $.BootstrapTable = class extends $.BootstrapTable {
 
       this.buttons = Object.assign(this.buttons, {
         export: {
-          html: exportTypes.length === 1 ? `
+          html:
-            <div class="export ${this.constants.classes.buttonsDropdown}"
+            (() => {
-            data-type="${exportTypes[0]}">
+              if (exportTypes.length === 1) {
-            <button class="${this.constants.buttonsClass}"
+                return `
-            aria-label="Export"
+                  <div class="export ${this.constants.classes.buttonsDropdown}"
-            type="button"
+                  data-type="${exportTypes[0]}">
-            title="${o.formatExport()}">
+                  <button class="${this.constants.buttonsClass}"
-            ${o.showButtonIcons ? Utils.sprintf(this.constants.html.icon, o.iconsPrefix, o.icons.export) : ''}
+                  aria-label="Export"
-            ${o.showButtonText ? o.formatExport() : ''}
+                  type="button"
-            </button>
+                  title="${o.formatExport()}">
-            </div>
+                  ${o.showButtonIcons ? Utils.sprintf(this.constants.html.icon, o.iconsPrefix, o.icons.export) : ''}
-          ` : `
+                  ${o.showButtonText ? o.formatExport() : ''}
-            <div class="export ${this.constants.classes.buttonsDropdown}">
+                  </button>
-            <button class="${this.constants.buttonsClass} dropdown-toggle"
+                  </div>
-            aria-label="Export"
+                `
-            ${this.constants.dataToggle}="dropdown"
+              }
-            type="button"
+
-            title="${o.formatExport()}">
+              const html = []
-            ${o.showButtonIcons ? Utils.sprintf(this.constants.html.icon, o.iconsPrefix, o.icons.export) : ''}
+
-            ${o.showButtonText ? o.formatExport() : ''}
+              html.push(`
-            ${this.constants.html.dropdownCaret}
+                <div class="export ${this.constants.classes.buttonsDropdown}">
-            </button>
+                <button class="${this.constants.buttonsClass} dropdown-toggle"
-            </div>
+                aria-label="Export"
-          `
+                ${this.constants.dataToggle}="dropdown"
+                type="button"
+                title="${o.formatExport()}">
+                ${o.showButtonIcons ? Utils.sprintf(this.constants.html.icon, o.iconsPrefix, o.icons.export) : ''}
+                ${o.showButtonText ? o.formatExport() : ''}
+                ${this.constants.html.dropdownCaret}
+                </button>
+                ${this.constants.html.toolbarDropdown[0]}
+              `)
+
+              for (const type of exportTypes) {
+                if (TYPE_NAME.hasOwnProperty(type)) {
+                  const $item = $(Utils.sprintf(this.constants.html.pageDropdownItem, '', TYPE_NAME[type]))
+
+                  $item.attr('data-type', type)
+                  html.push($item.prop('outerHTML'))
+                }
+              }
+
+              html.push(this.constants.html.toolbarDropdown[1], '</div>')
+              return html.join('')
+            })
         }
       })
     }
@@ -126,32 +148,14 @@ $.BootstrapTable = class extends $.BootstrapTable {
       return
     }
 
-    let $menu = $(this.constants.html.toolbarDropdown.join(''))
+    this.updateExportButton()
-    let $items = this.$export
+    let $exportButtons = this.$export.find('[data-type]')
 
-    if (exportTypes.length > 1) {
+    if (exportTypes.length === 1) {
-      this.$export.append($menu)
+      $exportButtons = this.$export.find('button')
-
-      // themes support
-      if ($menu.children().length) {
-        $menu = $menu.children().eq(0)
-      }
-      for (const type of exportTypes) {
-        if (TYPE_NAME.hasOwnProperty(type)) {
-          const $item = $(Utils.sprintf(this.constants.html.pageDropdownItem,
-            '', TYPE_NAME[type]))
-
-          $item.attr('data-type', type)
-          $menu.append($item)
-        }
-      }
-
-      $items = $menu.children()
     }
 
-    this.updateExportButton()
+    $exportButtons.click(e => {
-
-    $items.click(e => {
       e.preventDefault()
 
       const type = $(e.currentTarget).data('type')

ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/print/bootstrap-table-print.js

@@ -134,7 +134,8 @@ $.BootstrapTable = class extends $.BootstrapTable {
 
   doPrint (data) {
     const formatValue = (row, i, column) => {
-      const value = Utils.calculateObjectValue(column, column.printFormatter,
+      const value = Utils.calculateObjectValue(column,
+        column.printFormatter || column.formatter,
         [row[column.field], row, i], row[column.field])
 
       return typeof value === 'undefined' || value === null ?

ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/reorder-rows/bootstrap-table-reorder-rows.js

@@ -13,7 +13,7 @@ $.extend($.fn.bootstrapTable.defaults, {
   onDragStyle: null,
   onDropStyle: null,
   onDragClass: 'reorder_rows_onDragClass',
-  dragHandle: '>tbody>tr>td',
+  dragHandle: '>tbody>tr>td:not(.bs-checkbox)',
   useRowAttrFunc: false,
   // eslint-disable-next-line no-unused-vars
   onReorderRowsDrag (row) {

ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/resizable/bootstrap-table-resizable.js

@@ -43,6 +43,8 @@ $.BootstrapTable = class extends $.BootstrapTable {
       .on('column-switch.bs.table page-change.bs.table', () => {
         reInitResizable(this)
       })
+
+    reInitResizable(this)
   }
 
   toggleView (...args) {