update

x-extends · Apr 23, 2020 · 98d57e3 · 98d57e3
1 parent 0d3dc02
commit 98d57e3
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/dist/index.common.js b/dist/index.common.js
diff --git a/dist/index.js b/dist/index.js
@@ -556,13 +556,14 @@
           "class": 'vxe-table--filter-iview-wrapper'
         }, optionGroups ? column.filters.map(function (option, oIndex) {
           var optionValue = option.data;
+          var props = getCellEditFilterProps(renderOpts, params, optionValue);
           return h('Select', {
             key: oIndex,
             attrs: attrs,
-            props: getCellEditFilterProps(renderOpts, params, optionValue),
+            props: props,
             on: getFilterOns(renderOpts, params, option, function () {
               // 处理 change 事件相关逻辑
-              handleConfirmFilter(params, option.data && option.data.length > 0, option);
+              handleConfirmFilter(params, props.multiple ? option.data && option.data.length > 0 : !_xeUtils["default"].eqNull(option.data), option);
             })
           }, _xeUtils["default"].map(optionGroups, function (group, gIndex) {
             return h('OptionGroup', {
@@ -574,13 +575,14 @@
           }));
         }) : column.filters.map(function (option, oIndex) {
           var optionValue = option.data;
+          var props = getCellEditFilterProps(renderOpts, params, optionValue);
           return h('Select', {
             key: oIndex,
             attrs: attrs,
-            props: getCellEditFilterProps(renderOpts, params, optionValue),
+            props: props,
             on: getFilterOns(renderOpts, params, option, function () {
               // 处理 change 事件相关逻辑
-              handleConfirmFilter(params, option.data && option.data.length > 0, option);
+              handleConfirmFilter(params, props.multiple ? option.data && option.data.length > 0 : !_xeUtils["default"].eqNull(option.data), option);
             })
           }, renderOptions(h, options, optionProps));
         }))];