@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.
@@ -134,7 +134,7 @@ export function filter() {
134
134
  return [item.key, _extends({}, item)];
135
135
  }));
136
136
 
137
- function isMatchedFilterCondition(record) {
137
+ function isMatchedFilterCondition(record, rowIndex) {
138
138
  return !filtersKeys.some(function (key) {
139
139
  var _a, _b;
140
140
 
@@ -149,14 +149,15 @@ export function filter() {
149
149
  } else {
150
150
  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"));
151
151
  comparisonFn = _filterInstanceProperty(defaultFilterOptionsMap.get('contain'));
152
- }
152
+ } // 不符合过滤条件,退出循环
153
153
 
154
- return !comparisonFn(_filterInstanceProperty(filterItem))(record[key]); //不符合过滤条件,退出循环
154
+
155
+ return !comparisonFn(_filterInstanceProperty(filterItem), filterItem)(internals.safeGetValue(columnsMap.get(key), record, rowIndex), record);
155
156
  });
156
157
  }
157
158
 
158
- return dataSource.reduce(function (pre, record) {
159
- if (isMatchedFilterCondition(record)) {
159
+ return dataSource.reduce(function (pre, record, rowIndex) {
160
+ if (isMatchedFilterCondition(record, rowIndex)) {
160
161
  return _concatInstanceProperty(pre).call(pre, [record]);
161
162
  }
162
163
 
@@ -157,7 +157,7 @@ function filter() {
157
157
  return [item.key, (0, _extends2.default)({}, item)];
158
158
  }));
159
159
 
160
- function isMatchedFilterCondition(record) {
160
+ function isMatchedFilterCondition(record, rowIndex) {
161
161
  return !filtersKeys.some(function (key) {
162
162
  var _a, _b;
163
163
 
@@ -172,14 +172,15 @@ function filter() {
172
172
  } else {
173
173
  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"));
174
174
  comparisonFn = (0, _filter.default)(defaultFilterOptionsMap.get('contain'));
175
- }
175
+ } // 不符合过滤条件,退出循环
176
176
 
177
- return !comparisonFn((0, _filter.default)(filterItem))(record[key]); //不符合过滤条件,退出循环
177
+
178
+ return !comparisonFn((0, _filter.default)(filterItem), filterItem)(_internals.internals.safeGetValue(columnsMap.get(key), record, rowIndex), record);
178
179
  });
179
180
  }
180
181
 
181
- return dataSource.reduce(function (pre, record) {
182
- if (isMatchedFilterCondition(record)) {
182
+ return dataSource.reduce(function (pre, record, rowIndex) {
183
+ if (isMatchedFilterCondition(record, rowIndex)) {
183
184
  return (0, _concat.default)(pre).call(pre, [record]);
184
185
  }
185
186
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kdcloudjs/table",
3
- "version": "1.1.3-canary.3",
3
+ "version": "1.1.3-canary.4",
4
4
  "description": "金蝶 react table 组件",
5
5
  "title": "table",
6
6
  "keywords": [