Merge branch 'develop' into feature/5864

site/docs/api/events.md

@@ -348,6 +348,18 @@ $('#table').on('event-name.bs.table', function (e, arg1, arg2, ...) {
 
   * `cardView`: the cardView state of the table.
 
+## onTogglePagination
+
+- **jQuery Event:** `toggle-pagination.bs.table`
+
+- **Parameter:** `state`
+
+- **Detail:**
+
+  Fires when the pagination was toggled:
+
+  * `state`: the new pagination state (`true`-> Pagination is enabled, `false` -> Pagination is disabled )
+
 ## onUncheck
 
 - **jQuery Event:** `uncheck.bs.table`

src/bootstrap-table.js

@@ -3080,6 +3080,7 @@ class BootstrapTable {
     this.$toolbar.find('button[name="paginationSwitch"]')
       .html(`${Utils.sprintf(this.constants.html.icon, this.options.iconsPrefix, icon) } ${ text}`)
     this.updatePagination()
+    this.trigger('toggle-pagination', this.options.pagination)
   }
 
   toggleFullscreen () {

src/constants/index.js

@@ -394,6 +394,9 @@ const DEFAULTS = {
   },
   onScrollBody () {
     return false
+  },
+  onTogglePagination (newState) {
+    return false
   }
 }
 
@@ -564,7 +567,8 @@ const EVENTS = {
   'refresh-options.bs.table': 'onRefreshOptions',
   'reset-view.bs.table': 'onResetView',
   'refresh.bs.table': 'onRefresh',
-  'scroll-body.bs.table': 'onScrollBody'
+  'scroll-body.bs.table': 'onScrollBody',
+  'toggle-pagination.bs.table': 'onTogglePagination'
 }
 
 Object.assign(DEFAULTS, EN)

src/extensions/cookie/bootstrap-table-cookie.js

@@ -542,7 +542,7 @@ $.BootstrapTable = class extends $.BootstrapTable {
 
     if (columnsCookie) {
       for (const column of this.columns) {
-        column.visible = columnsCookie.filter(columnField => {
+        const filteredColumns = columnsCookie.filter(columnField => {
           if (this.isSelectionColumn(column)) {
             return true
           }
@@ -556,7 +556,9 @@ $.BootstrapTable = class extends $.BootstrapTable {
           }
 
           return columnField === column.field
-        }).length > 0 || !column.switchable
+        })
+
+        column.visible = (filteredColumns.length > 0 || !column.switchable) && column.visible
       }
     }
   }

src/extensions/group-by-v2/bootstrap-table-group-by.js

@@ -105,7 +105,7 @@ BootstrapTable.prototype.initSort = function (...args) {
         }
 
         if (this.isCollapsed(key, value)) {
-          item._class = 'hidden'
+          item._class += ' hidden'
         }
 
         item._data['parent-index'] = index