浏览代码

fix some filter control issues (#4895)

Co-authored-by: Dennis Hernández <dennishernandezvargas@gmail.com>
Dustin Utecht 5 年之前
父节点
当前提交
ed6299f8ee
共有 1 个文件被更改,包括 3 次插入9 次删除
  1. 3 9
      src/extensions/filter-control/bootstrap-table-filter-control.js

+ 3 - 9
src/extensions/filter-control/bootstrap-table-filter-control.js

@@ -683,21 +683,15 @@ $.BootstrapTable = class extends $.BootstrapTable {
       ? null
       : that.filterColumnsPartial
 
-    if (fp === null || Object.keys(fp).length <= 1) {
-      super.initSearch()
-    }
-
-    if (this.options.sidePagination === 'server') {
-      return
-    }
+    super.initSearch()
 
-    if (fp === null) {
+    if (this.options.sidePagination === 'server' || fp === null) {
       return
     }
 
     // Check partial column filter
     that.data = fp
-      ? that.options.data.filter((item, i) => {
+      ? that.data.filter((item, i) => {
         const itemIsExpected = []
         const keys1 = Object.keys(item)
         const keys2 = Object.keys(fp)