Browse Source

Merge pull request #5081 from wenzhixin/fix/5071

Check if the variable value is a array or not, to use the correct data
文翼 5 years ago
parent
commit
6e2722d97c
1 changed files with 6 additions and 1 deletions
  1. 6 1
      src/extensions/filter-control/bootstrap-table-filter-control.js

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

@@ -526,8 +526,13 @@ const filterDataMethods = {
   },
   var (filterDataSource, selectControl, filterOrderBy, selected) {
     const variableValues = window[filterDataSource]
+    const isArray = Array.isArray(variableValues)
     for (const key in variableValues) {
-      UtilsFilterControl.addOptionToSelectControl(selectControl, key, variableValues[key], selected)
+      if (isArray) {
+        UtilsFilterControl.addOptionToSelectControl(selectControl, variableValues[key], variableValues[key], selected)
+      } else {
+        UtilsFilterControl.addOptionToSelectControl(selectControl, key, variableValues[key], selected)
+      }
     }
     UtilsFilterControl.sortSelectControl(selectControl, filterOrderBy)
   },