Merge branch 'develop' into keep-details-open

src/bootstrap-table.js

@@ -2342,6 +2342,7 @@ class BootstrapTable {
         this.searchText ||
         this.options.customSearch ||
         this.options.sortName !== undefined ||
+        this.enableCustomSort || // Fix #4616: this.enableCustomSort is for extensions
         !Utils.isEmptyObject(this.filterColumns) ||
         !Utils.isEmptyObject(this.filterColumnsPartial)
       ) && (!params || !params.unfiltered)

src/extensions/multiple-sort/bootstrap-table-multiple-sort.js

@@ -679,6 +679,7 @@ BootstrapTable.prototype.destroy = function (...args) {
   _destroy.apply(this, Array.prototype.slice.apply(args))
 
   if (this.options.showMultiSort) {
+    this.enableCustomSort = false
     this.$sortModal.remove()
   }
 }
@@ -744,6 +745,7 @@ BootstrapTable.prototype.onMultipleSort = function () {
     return cmp(arr1, arr2)
   }
 
+  this.enableCustomSort = true
   this.data.sort((a, b) => arrayCmp(a, b))
 
   this.initBody()