Browse Source

Merge pull request #4494 from dalibor-dev/filter-control-fix

Fixed Filter Control select null value handling
文翼 6 years ago
parent
commit
300e86e926
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/extensions/filter-control/bootstrap-table-filter-control.js

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

@@ -239,7 +239,7 @@ const UtilsFilterControl = {
             formattedValue = Utils.calculateObjectValue(that.header, column.filterDataCollector, [fieldValue, data[i], formattedValue], formattedValue)
           }
 
-          if (typeof formattedValue === 'object') {
+          if (typeof formattedValue === 'object' && formattedValue !== null) {
             formattedValue.forEach((value) => {
               UtilsFilterControl.addOptionToSelectControl(selectControl, value, value, column.filterDefault)
             })