@kdcloudjs/table 1.1.3-canary.3 → 1.1.3-canary.4

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.
@@ -1,6 +1,6 @@
1
1
  /*!
2
2
  *
3
- * @kdcloudjs/table v1.1.3-canary.2
3
+ * @kdcloudjs/table v1.1.3-canary.3
4
4
  *
5
5
  * Copyright 2020-present, Kingdee, Inc.
6
6
  * All rights reserved.
@@ -1,6 +1,6 @@
1
1
  /*!
2
2
  *
3
- * @kdcloudjs/table v1.1.3-canary.2
3
+ * @kdcloudjs/table v1.1.3-canary.3
4
4
  *
5
5
  * Copyright 2020-present, Kingdee, Inc.
6
6
  * All rights reserved.
@@ -5723,7 +5723,7 @@ function filter() {
5723
5723
  return [item.key, _objectSpread({}, item)];
5724
5724
  }));
5725
5725
 
5726
- function isMatchedFilterCondition(record) {
5726
+ function isMatchedFilterCondition(record, rowIndex) {
5727
5727
  return !filtersKeys.some(function (key) {
5728
5728
  var _columnsMap$get, _columnsMap$get$featu;
5729
5729
 
@@ -5738,14 +5738,15 @@ function filter() {
5738
5738
  } else {
5739
5739
  console.warn("\u5217[".concat(key, "]\u672A\u914D\u7F6E\u7B5B\u9009\u51FD\u6570\uFF0C\u8BF7\u8BBE\u7F6E column.features.filterable \u6765\u4F5C\u4E3A\u8BE5\u5217\u7684\u7B5B\u9009\u51FD\u6570, \u76EE\u524D\u4F7F\u7528\u9ED8\u8BA4\u5305\u542B\u7B5B\u9009\u51FD\u6570"));
5740
5740
  comparisonFn = defaultFilterOptionsMap.get('contain').filter;
5741
- }
5741
+ } // 不符合过滤条件,退出循环
5742
+
5742
5743
 
5743
- return !comparisonFn(filterItem.filter)(record[key]); //不符合过滤条件,退出循环
5744
+ return !comparisonFn(filterItem.filter, filterItem)(_internals__WEBPACK_IMPORTED_MODULE_19__["internals"].safeGetValue(columnsMap.get(key), record, rowIndex), record);
5744
5745
  });
5745
5746
  }
5746
5747
 
5747
- return dataSource.reduce(function (pre, record) {
5748
- if (isMatchedFilterCondition(record)) {
5748
+ return dataSource.reduce(function (pre, record, rowIndex) {
5749
+ if (isMatchedFilterCondition(record, rowIndex)) {
5749
5750
  return pre.concat([record]);
5750
5751
  }
5751
5752