Merge branch 'develop' into develop

src/bootstrap-table.js

@@ -2342,7 +2342,7 @@ class BootstrapTable {
     this.initBody()
 
     if (this.options.showColumns) {
-      const $items = this.$toolbar.find('.keep-open input').prop('disabled', false)
+      const $items = this.$toolbar.find('.keep-open input:not(".toggle-all")').prop('disabled', false)
 
       if (needUpdate) {
         $items.filter(Utils.sprintf('[value="%s"]', index)).prop('checked', checked)

src/extensions/filter-control/bootstrap-table-filter-control.js

@@ -792,11 +792,11 @@ $.BootstrapTable = class extends $.BootstrapTable {
     super.initToolbar()
   }
 
-  resetSearch () {
+  resetSearch (text) {
     if (this.options.filterControl && this.options.showSearchClearButton) {
       this.clearFilterControl()
     }
-    super.resetSearch()
+    super.resetSearch(text)
   }
 
   clearFilterControl () {