浏览代码

Merge pull request #5516 from wenzhixin/fix/5512

Dont quite the function if filter control container is used
文翼 5 年之前
父节点
当前提交
c2563aafa2
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      src/extensions/filter-control/bootstrap-table-filter-control.js

+ 4 - 1
src/extensions/filter-control/bootstrap-table-filter-control.js

@@ -123,7 +123,10 @@ $.BootstrapTable = class extends $.BootstrapTable {
           // Avoid recreate the controls
           const $controlContainer = UtilsFilterControl.getControlContainer(this)
 
-          if ($controlContainer.find('select').length > 0 || $controlContainer.find('input:not([type="checkbox"]):not([type="radio"])').length > 0) {
+          if (
+            ($controlContainer.find('select').length > 0 || $controlContainer.find('input:not([type="checkbox"]):not([type="radio"])').length > 0) &&
+            !this.options.filterControlContainer
+          ) {
             return
           }