evui 3.4.12 → 3.4.13

package/dist/evui.common.js

@@ -8109,7 +8109,7 @@ $({ target: 'Number', stat: true }, {
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"3.4.12\"}");
+module.exports = JSON.parse("{\"a\":\"3.4.13\"}");
 
 /***/ }),
 
@@ -32229,29 +32229,38 @@ var uses_filterEvent = function filterEvent(params) {
     var originStore = stores.originStore;
     var filterStore = [];
     var filteredOnce = false;
-    fields.forEach(function (field) {
+    var prevStore = [];
+    fields.forEach(function (field, idx) {
       var filters = filteringItemsByColumn[field];
       var index = getColumnIndex(field);
       var columnType = props.columns[index].type;
+      var OR = idx > 0 && filterInfo.columnOperator === 'or';
+      var AND = idx > 0 && filterInfo.columnOperator === 'and';
       filters.forEach(function (item, ix) {
         if (!filterStore.length && !filteredOnce) {
           filterStore = getFilteringData(originStore, columnType, _objectSpread2(_objectSpread2({}, item), {}, {
             index: index
           }));
-        } else if (ix === 0 && filterInfo.columnOperator === 'or') {
-          var _filterStore;
+        } else if (AND && item.operator === 'or') {
+          if (ix > 0) {
+            var _filterStore;
 
-          (_filterStore = filterStore).push.apply(_filterStore, _toConsumableArray(getFilteringData(originStore, columnType, _objectSpread2(_objectSpread2({}, item), {}, {
-            index: index
-          }))));
-        } else if (ix !== 0 && item.operator === 'or') {
+            (_filterStore = filterStore).push.apply(_filterStore, _toConsumableArray(getFilteringData(prevStore, columnType, _objectSpread2(_objectSpread2({}, item), {}, {
+              index: index
+            }))));
+          } else {
+            // ix === 0
+            filterStore = getFilteringData(prevStore, columnType, _objectSpread2(_objectSpread2({}, item), {}, {
+              index: index
+            }));
+          }
+        } else if (OR || item.operator === 'or') {
           var _filterStore2;
 
           (_filterStore2 = filterStore).push.apply(_filterStore2, _toConsumableArray(getFilteringData(originStore, columnType, _objectSpread2(_objectSpread2({}, item), {}, {
             index: index
           }))));
         } else {
-          // (ix === 0 && filterInfo.columnOperator === 'and') || item.operator === 'and'
           filterStore = getFilteringData(filterStore, columnType, _objectSpread2(_objectSpread2({}, item), {}, {
             index: index
           }));
@@ -32259,6 +32268,7 @@ var uses_filterEvent = function filterEvent(params) {
 
         filteredOnce = true;
       });
+      prevStore = JSON.parse(JSON.stringify(filterStore));
     });
 
     if (!filteredOnce) {