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

Fixed Filter Control select null value handling
wenzhixin · Jul 14, 2019 · 300e86e · 300e86e
2 parents 42b2e38 + f9c3d19
commit 300e86e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/extensions/filter-control/bootstrap-table-filter-control.js b/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)
             })