evui 3.4.13 → 3.4.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/evui.common.js
CHANGED
|
@@ -8109,7 +8109,7 @@ $({ target: 'Number', stat: true }, {
|
|
|
8109
8109
|
/***/ "9224":
|
|
8110
8110
|
/***/ (function(module) {
|
|
8111
8111
|
|
|
8112
|
-
module.exports = JSON.parse("{\"a\":\"3.4.
|
|
8112
|
+
module.exports = JSON.parse("{\"a\":\"3.4.14\"}");
|
|
8113
8113
|
|
|
8114
8114
|
/***/ }),
|
|
8115
8115
|
|
|
@@ -32234,7 +32234,7 @@ var uses_filterEvent = function filterEvent(params) {
|
|
|
32234
32234
|
var filters = filteringItemsByColumn[field];
|
|
32235
32235
|
var index = getColumnIndex(field);
|
|
32236
32236
|
var columnType = props.columns[index].type;
|
|
32237
|
-
var OR =
|
|
32237
|
+
var OR = filterInfo.columnOperator === 'or';
|
|
32238
32238
|
var AND = idx > 0 && filterInfo.columnOperator === 'and';
|
|
32239
32239
|
filters.forEach(function (item, ix) {
|
|
32240
32240
|
if (!filterStore.length && !filteredOnce) {
|
|
@@ -32254,7 +32254,7 @@ var uses_filterEvent = function filterEvent(params) {
|
|
|
32254
32254
|
index: index
|
|
32255
32255
|
}));
|
|
32256
32256
|
}
|
|
32257
|
-
} else if (OR || item.operator === 'or') {
|
|
32257
|
+
} else if (ix === 0 && OR || ix !== 0 && item.operator === 'or') {
|
|
32258
32258
|
var _filterStore2;
|
|
32259
32259
|
|
|
32260
32260
|
(_filterStore2 = filterStore).push.apply(_filterStore2, _toConsumableArray(getFilteringData(originStore, columnType, _objectSpread2(_objectSpread2({}, item), {}, {
|