@kdcloudjs/table 1.1.3 → 1.1.4-canary.2

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.
Files changed (75) hide show
  1. package/dist/@kdcloudjs/table.css +1 -1
  2. package/dist/@kdcloudjs/table.js +642 -288
  3. package/dist/@kdcloudjs/table.js.map +1 -1
  4. package/dist/@kdcloudjs/table.min.css +1 -1
  5. package/dist/@kdcloudjs/table.min.js +10 -9
  6. package/dist/@kdcloudjs/table.min.js.map +1 -1
  7. package/es/table/base/html-table.js +1 -1
  8. package/es/table/base/styles.d.ts +10 -2
  9. package/es/table/base/styles.js +17 -7
  10. package/es/table/base/table.d.ts +2 -0
  11. package/es/table/base/table.js +31 -53
  12. package/es/table/base/utils.d.ts +7 -0
  13. package/es/table/base/utils.js +29 -1
  14. package/es/table/pipeline/features/columnDrag.js +21 -11
  15. package/es/table/pipeline/features/columnFilter.d.ts +4 -2
  16. package/es/table/pipeline/features/columnFilter.js +39 -17
  17. package/es/table/pipeline/features/columnResizeWidth.js +1 -1
  18. package/es/table/pipeline/features/filter/DefaultFilterContent.js +22 -2
  19. package/es/table/pipeline/features/filter/DefaultFilterIcon.d.ts +5 -0
  20. package/es/table/pipeline/features/filter/DefaultFilterIcon.js +20 -0
  21. package/es/table/pipeline/features/filter/Filter.d.ts +3 -2
  22. package/es/table/pipeline/features/filter/Filter.js +44 -34
  23. package/es/table/pipeline/features/filter/FilterPanel.d.ts +2 -1
  24. package/es/table/pipeline/features/filter/FilterPanel.js +29 -20
  25. package/es/table/pipeline/features/filter/util.js +4 -4
  26. package/es/table/pipeline/features/footerDataSource.d.ts +9 -0
  27. package/es/table/pipeline/features/footerDataSource.js +25 -0
  28. package/es/table/pipeline/features/index.d.ts +1 -0
  29. package/es/table/pipeline/features/index.js +2 -1
  30. package/es/table/pipeline/features/multiSelect.js +7 -2
  31. package/es/table/pipeline/features/rangeSelection.d.ts +1 -1
  32. package/es/table/pipeline/features/rangeSelection.js +156 -28
  33. package/es/table/pipeline/features/singleSelect.js +4 -0
  34. package/es/table/pipeline/features/treeMode.d.ts +2 -0
  35. package/es/table/pipeline/features/treeMode.js +18 -20
  36. package/es/table/pipeline/pipeline.d.ts +5 -1
  37. package/es/table/pipeline/pipeline.js +12 -11
  38. package/es/table/utils/keyCode.d.ts +4 -0
  39. package/es/table/utils/keyCode.js +4 -0
  40. package/es/table/utils/mergeCellProps.js +2 -6
  41. package/lib/table/base/html-table.js +1 -1
  42. package/lib/table/base/styles.d.ts +10 -2
  43. package/lib/table/base/styles.js +17 -7
  44. package/lib/table/base/table.d.ts +2 -0
  45. package/lib/table/base/table.js +31 -53
  46. package/lib/table/base/utils.d.ts +7 -0
  47. package/lib/table/base/utils.js +35 -1
  48. package/lib/table/pipeline/features/columnDrag.js +21 -11
  49. package/lib/table/pipeline/features/columnFilter.d.ts +4 -2
  50. package/lib/table/pipeline/features/columnFilter.js +37 -17
  51. package/lib/table/pipeline/features/columnResizeWidth.js +1 -1
  52. package/lib/table/pipeline/features/filter/DefaultFilterContent.js +23 -1
  53. package/lib/table/pipeline/features/filter/DefaultFilterIcon.d.ts +5 -0
  54. package/lib/table/pipeline/features/filter/DefaultFilterIcon.js +30 -0
  55. package/lib/table/pipeline/features/filter/Filter.d.ts +3 -2
  56. package/lib/table/pipeline/features/filter/Filter.js +46 -34
  57. package/lib/table/pipeline/features/filter/FilterPanel.d.ts +2 -1
  58. package/lib/table/pipeline/features/filter/FilterPanel.js +30 -19
  59. package/lib/table/pipeline/features/filter/util.js +4 -4
  60. package/lib/table/pipeline/features/footerDataSource.d.ts +9 -0
  61. package/lib/table/pipeline/features/footerDataSource.js +41 -0
  62. package/lib/table/pipeline/features/index.d.ts +1 -0
  63. package/lib/table/pipeline/features/index.js +15 -1
  64. package/lib/table/pipeline/features/multiSelect.js +6 -1
  65. package/lib/table/pipeline/features/rangeSelection.d.ts +1 -1
  66. package/lib/table/pipeline/features/rangeSelection.js +158 -30
  67. package/lib/table/pipeline/features/singleSelect.js +4 -0
  68. package/lib/table/pipeline/features/treeMode.d.ts +2 -0
  69. package/lib/table/pipeline/features/treeMode.js +19 -22
  70. package/lib/table/pipeline/pipeline.d.ts +5 -1
  71. package/lib/table/pipeline/pipeline.js +13 -11
  72. package/lib/table/utils/keyCode.d.ts +4 -0
  73. package/lib/table/utils/keyCode.js +11 -0
  74. package/lib/table/utils/mergeCellProps.js +2 -6
  75. package/package.json +3 -3
@@ -7,7 +7,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
7
7
  Object.defineProperty(exports, "__esModule", {
8
8
  value: true
9
9
  });
10
- exports.lastClickCell = void 0;
10
+ exports.lastClickCellKey = void 0;
11
11
  exports.rangeSelection = rangeSelection;
12
12
  exports.rangeSelectionKey = void 0;
13
13
 
@@ -35,42 +35,44 @@ var _classnames = _interopRequireDefault(require("classnames"));
35
35
 
36
36
  var rangeSelectionKey = 'rangeSelection';
37
37
  exports.rangeSelectionKey = rangeSelectionKey;
38
- var lastClickCell = 'lastClickCell';
39
- exports.lastClickCell = lastClickCell;
38
+ var lastClickCellKey = 'lastClickCell';
39
+ exports.lastClickCellKey = lastClickCellKey;
40
40
 
41
41
  function rangeSelection(opts) {
42
42
  return function step(pipeline) {
43
43
  var SCROLL_SIZE = 30;
44
44
  var tableBody = pipeline.ref.current.domHelper && pipeline.ref.current.domHelper.tableBody;
45
+ var tableFooter = pipeline.ref.current.domHelper && pipeline.ref.current.domHelper.tableFooter;
45
46
 
46
47
  if (!tableBody) {
47
48
  return pipeline;
48
49
  }
49
50
 
50
51
  var columns = pipeline.getColumns();
52
+ var dataSource = pipeline.getDataSource();
51
53
 
52
54
  var rangeSelectedChange = function rangeSelectedChange(rangeSelection) {
53
55
  var _a;
54
56
 
55
57
  pipeline.setStateAtKey(rangeSelectionKey, rangeSelection);
56
58
  (_a = opts === null || opts === void 0 ? void 0 : opts.rangeSelectedChange) === null || _a === void 0 ? void 0 : _a.call(opts, rangeSelection);
57
- }; // if (!pipeline.getFeatureOptions(rangeSelectionKey)) {
58
- // pipeline.setFeatureOptions(rangeSelectionKey, {
59
- // optionKey: rangeSelectionKey,
60
- // rangeSelectedChange: rangeSelectedChange
61
- // })
62
- // }
63
-
59
+ };
64
60
 
65
61
  var setRangeSelection = function setRangeSelection(startDragCell, draggingCell) {
66
- if (!startDragCell || !draggingCell || isSameCell(startDragCell, draggingCell)) return;
62
+ if (!startDragCell || !draggingCell) return;
67
63
  var rangeColumns = getRangeColumns(startDragCell, draggingCell, columns);
68
- var isTopToBottom = startDragCell.rowIndex <= draggingCell.rowIndex;
64
+
65
+ var _getRangeSelectionRow = getRangeSelectionRowInfo(startDragCell, draggingCell, dataSource),
66
+ startRow = _getRangeSelectionRow.startRow,
67
+ endRow = _getRangeSelectionRow.endRow,
68
+ footerRowRange = _getRangeSelectionRow.footerRowRange;
69
+
69
70
  var rangeSelection = {
70
- startRow: isTopToBottom ? startDragCell.rowIndex : startDragCell.rowIndex + startDragCell.rowSpan - 1,
71
- endRow: isTopToBottom ? draggingCell.rowIndex + draggingCell.rowSpan - 1 : draggingCell.rowIndex,
71
+ startRow: startRow,
72
+ endRow: endRow,
72
73
  columns: rangeColumns,
73
- startColumn: startDragCell.column
74
+ startColumn: startDragCell.column,
75
+ footerRowRange: footerRowRange
74
76
  };
75
77
  rangeSelectedChange(rangeSelection);
76
78
  };
@@ -81,23 +83,23 @@ function rangeSelection(opts) {
81
83
 
82
84
  if (clickCell) {
83
85
  if (event.shiftKey) {
84
- var _lastClickCell = pipeline.getStateAtKey(lastClickCell);
86
+ var _lastClickCell = pipeline.getStateAtKey(lastClickCellKey);
85
87
 
86
88
  if (_lastClickCell) {
87
89
  setRangeSelection(_lastClickCell, clickCell);
88
90
  } else {
89
91
  // 第一次进来就按住shift键,这时候要记住点击的单元格
90
- pipeline.setStateAtKey(lastClickCell, clickCell);
92
+ pipeline.setStateAtKey(lastClickCellKey, clickCell);
91
93
  }
92
94
  } else {
93
- pipeline.setStateAtKey(lastClickCell, clickCell);
94
- rangeSelectedChange(null);
95
+ pipeline.setStateAtKey(lastClickCellKey, clickCell);
96
+ setRangeSelection(clickCell, clickCell);
95
97
  }
96
98
  }
97
99
  };
98
100
 
99
101
  var onMouseDown = function onMouseDown(mouseDownEvent) {
100
- if (mouseDownEvent.button !== 0 || !(0, _utils.isElementInEventPath)(tableBody, mouseDownEvent.nativeEvent)) return; // mouseDownEvent.preventDefault()
102
+ if (mouseDownEvent.button !== 0 || !((0, _utils.isElementInEventPath)(tableBody, mouseDownEvent.nativeEvent) || (0, _utils.isElementInEventPath)(tableFooter, mouseDownEvent.nativeEvent))) return; // mouseDownEvent.preventDefault()
101
103
  // shift + 点击选中
102
104
 
103
105
  shiftKeySelect(mouseDownEvent);
@@ -153,10 +155,11 @@ function rangeSelection(opts) {
153
155
  };
154
156
 
155
157
  var onKeyDown = function onKeyDown(e) {
156
- if (!(0, _utils.isElementInEventPath)(tableBody, e.nativeEvent)) return;
158
+ if (!((0, _utils.isElementInEventPath)(tableBody, e.nativeEvent) || (0, _utils.isElementInEventPath)(tableFooter, e.nativeEvent))) return;
157
159
 
158
160
  if ((e.ctrlKey || e.metaKey) && e.key === 'a') {
159
161
  var rowLen = pipeline.getDataSource().length;
162
+ var footerDataSource = pipeline.getFooterDataSource() || [];
160
163
 
161
164
  if (columns.length && rowLen) {
162
165
  opts.preventkDefaultOfKeyDownEvent !== false && e.preventDefault();
@@ -164,7 +167,11 @@ function rangeSelection(opts) {
164
167
  startRow: 0,
165
168
  endRow: rowLen - 1,
166
169
  columns: columns,
167
- startColumn: columns[0]
170
+ startColumn: columns[0],
171
+ footerRowRange: footerDataSource.length > 0 ? {
172
+ startRow: 0,
173
+ endRow: footerDataSource.length - 1
174
+ } : null
168
175
  });
169
176
  }
170
177
  }
@@ -173,7 +180,8 @@ function rangeSelection(opts) {
173
180
  pipeline.addTableProps({
174
181
  onMouseDown: onMouseDown,
175
182
  onKeyDown: onKeyDown,
176
- tabIndex: -1
183
+ tabIndex: -1,
184
+ className: (0, _classnames.default)([_styles.Classes.rangeSelection])
177
185
  }); // todo: 后面可以把mousedown放到一个流里面
178
186
 
179
187
  return pipeline.mapColumns((0, _utils.makeRecursiveMapper)(function (col) {
@@ -189,15 +197,29 @@ function rangeSelection(opts) {
189
197
  var _cx;
190
198
 
191
199
  var prevCellProps = prevGetCellProps === null || prevGetCellProps === void 0 ? void 0 : prevGetCellProps(value, record, rowIndex);
200
+ var isInFooter = record[pipeline.getFeatureOptions('footerRowMetaKey')];
192
201
  var startRow = rangeSelection.startRow,
193
202
  endRow = rangeSelection.endRow,
194
- columns = rangeSelection.columns;
195
- var startIndex = startRow < endRow ? startRow : endRow;
196
- var endIndex = startRow < endRow ? endRow : startRow;
203
+ columns = rangeSelection.columns,
204
+ footerRowRange = rangeSelection.footerRowRange;
205
+
206
+ var _getRowIndex = getRowIndex(startRow, endRow),
207
+ startRowIndex = _getRowIndex.startRowIndex,
208
+ endRowIndex = _getRowIndex.endRowIndex;
209
+
210
+ var _getFooterRowIndex = getFooterRowIndex(footerRowRange),
211
+ footerStartRowIndex = _getFooterRowIndex.startRowIndex,
212
+ footerEndRowIndex = _getFooterRowIndex.endRowIndex;
213
+
197
214
  var startCol = columns[0];
198
215
  var endCol = columns[columns.length - 1];
199
- var match = rowIndex >= startIndex && rowIndex <= endIndex;
200
- var className = (0, _classnames.default)((_cx = {}, (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeSelected, match), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeTop, rowIndex === startIndex), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeLeft, col.code === startCol.code && match), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeBottom, rowIndex === endIndex), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeRight, col.code === endCol.code && match), _cx));
216
+ var bodyMatch = !isInFooter && rowIndex >= startRowIndex && rowIndex <= endRowIndex;
217
+ var footerMatch = isInFooter && footerRowRange && rowIndex >= footerStartRowIndex && rowIndex <= footerEndRowIndex;
218
+ var match = footerMatch || bodyMatch;
219
+ var matchSingleCell = match && isCellRangeSingleCell(rangeSelection); // 单个范围选中单元格不显示样式
220
+
221
+ var showCellRangeStyle = match && !matchSingleCell;
222
+ var className = (0, _classnames.default)((_cx = {}, (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeSingleCell, matchSingleCell), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeSelected, showCellRangeStyle), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeTop, showCellRangeStyle && (isInFooter ? startRowIndex !== -1 ? false : rowIndex === footerStartRowIndex : rowIndex === startRowIndex)), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeLeft, showCellRangeStyle && col.code === startCol.code), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeBottom, showCellRangeStyle && (isInFooter ? rowIndex === footerEndRowIndex : footerRowRange ? false : rowIndex === endRowIndex)), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeRight, showCellRangeStyle && col.code === endCol.code), _cx));
201
223
  return (0, _utils.mergeCellProps)(prevCellProps, {
202
224
  className: className
203
225
  });
@@ -223,7 +245,8 @@ function getTargetCell(target, columns) {
223
245
  rowIndex: parseInt(target.getAttribute('data-rowindex')),
224
246
  rowSpan: parseInt(target.getAttribute('rowspan') || 1),
225
247
  code: columnCode,
226
- column: column
248
+ column: column,
249
+ isInFooter: isEleInFooter(target)
227
250
  }
228
251
  };
229
252
  }();
@@ -238,7 +261,19 @@ function getTargetCell(target, columns) {
238
261
  }
239
262
 
240
263
  function isSameCell(cell1, cell2) {
241
- return cell1.rowIndex === cell2.rowIndex && cell1.code === cell2.code;
264
+ return cell1.rowIndex === cell2.rowIndex && cell1.code === cell2.code && cell1.isInFooter === cell2.isInFooter;
265
+ }
266
+
267
+ function isEleInFooter(target) {
268
+ while (target && !target.classList.contains(_styles.Classes.artTable)) {
269
+ if (target.classList.contains(_styles.Classes.tableFooter)) {
270
+ return true;
271
+ }
272
+
273
+ target = target.parentElement;
274
+ }
275
+
276
+ return false;
242
277
  }
243
278
 
244
279
  function getRangeColumns(startCell, endCell, columns) {
@@ -255,4 +290,97 @@ function getRangeColumns(startCell, endCell, columns) {
255
290
  } else {
256
291
  return (0, _slice.default)(flatColumns).call(flatColumns, endIndex, startIndex + 1);
257
292
  }
293
+ }
294
+
295
+ function getRangeSelectionRowInfo(startCell, endCell, dataSource) {
296
+ var footerRowRange = null;
297
+ var startRow = -1;
298
+ var endRow = -1;
299
+
300
+ var _getCellRangeRow = getCellRangeRow(startCell, endCell),
301
+ _startRow = _getCellRangeRow.startRow,
302
+ _endRow = _getCellRangeRow.endRow; // 两个单元格都在表体
303
+
304
+
305
+ if (!startCell.isInFooter && !endCell.isInFooter) {
306
+ startRow = _startRow;
307
+ endRow = _endRow;
308
+ } else if (startCell.isInFooter && endCell.isInFooter) {
309
+ // 两个单元格都在表底
310
+ footerRowRange = {
311
+ startRow: _startRow,
312
+ endRow: _endRow
313
+ };
314
+ } else {
315
+ // 一个单元格在表体,一个在表底
316
+ if (startCell.isInFooter) {
317
+ startRow = dataSource.length - 1;
318
+ endRow = endCell.rowIndex;
319
+ footerRowRange = {
320
+ startRow: startCell.rowIndex,
321
+ endRow: 0
322
+ };
323
+ } else {
324
+ startRow = startCell.rowIndex;
325
+ endRow = dataSource.length - 1;
326
+ footerRowRange = {
327
+ startRow: 0,
328
+ endRow: endCell.rowIndex
329
+ };
330
+ }
331
+ }
332
+
333
+ return {
334
+ startRow: startRow,
335
+ endRow: endRow,
336
+ footerRowRange: footerRowRange
337
+ };
338
+ }
339
+
340
+ function getCellRangeRow(startCell, endCell) {
341
+ if (isSameCell(startCell, endCell)) {
342
+ return {
343
+ startRow: startCell.rowIndex,
344
+ endRow: startCell.rowIndex
345
+ };
346
+ }
347
+
348
+ var isTopToBottom = startCell.rowIndex <= endCell.rowIndex;
349
+ var startRow = isTopToBottom ? startCell.rowIndex : startCell.rowIndex + startCell.rowSpan - 1;
350
+ var endRow = isTopToBottom ? endCell.rowIndex + endCell.rowSpan - 1 : endCell.rowIndex;
351
+ return {
352
+ startRow: startRow,
353
+ endRow: endRow
354
+ };
355
+ }
356
+
357
+ function isCellRangeSingleCell(rangeSelection) {
358
+ var startRow = rangeSelection.startRow,
359
+ endRow = rangeSelection.endRow,
360
+ columns = rangeSelection.columns,
361
+ footerRowRange = rangeSelection.footerRowRange;
362
+ var isBodySingleCell = !footerRowRange && startRow === endRow && columns.length === 1;
363
+ var isFooterSingleCell = startRow === -1 && footerRowRange.startRow === footerRowRange.endRow && columns.length === 1;
364
+ return isBodySingleCell || isFooterSingleCell;
365
+ }
366
+
367
+ function getRowIndex(startRow, endRow) {
368
+ var isReverse = startRow > endRow;
369
+ var startRowIndex = isReverse ? endRow : startRow;
370
+ var endRowIndex = isReverse ? startRow : endRow;
371
+ return {
372
+ startRowIndex: startRowIndex,
373
+ endRowIndex: endRowIndex
374
+ };
375
+ }
376
+
377
+ function getFooterRowIndex(footerRowRange) {
378
+ if (footerRowRange) {
379
+ return getRowIndex(footerRowRange.startRow, footerRowRange.endRow);
380
+ }
381
+
382
+ return {
383
+ startRowIndex: -1,
384
+ endRowIndex: -1
385
+ };
258
386
  }
@@ -76,6 +76,10 @@ function singleSelect() {
76
76
  return preCellProps;
77
77
  },
78
78
  render: function render(_, row, rowIndex) {
79
+ if (row[pipeline.getFeatureOptions('footerRowMetaKey')]) {
80
+ return null;
81
+ }
82
+
79
83
  var rowKey = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
80
84
 
81
85
  return /*#__PURE__*/_react.default.createElement(Radio, {
@@ -32,6 +32,8 @@ export interface TreeModeFeatureOptions {
32
32
  stopClickEventPropagation?: boolean;
33
33
  /** 指定表格每一行元信息的记录字段 */
34
34
  treeMetaKey?: string | symbol;
35
+ /** 指定展开列 */
36
+ expandColCode?: string;
35
37
  }
36
38
  export declare function treeMode(opts?: TreeModeFeatureOptions): (pipeline: TablePipeline) => TablePipeline;
37
39
  export {};
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
 
3
- var _sliceInstanceProperty2 = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
3
+ var _sliceInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
4
4
 
5
5
  var _Array$from = require("@babel/runtime-corejs3/core-js-stable/array/from");
6
6
 
@@ -16,8 +16,6 @@ Object.defineProperty(exports, "__esModule", {
16
16
  exports.treeMetaSymbol = void 0;
17
17
  exports.treeMode = treeMode;
18
18
 
19
- var _toArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toArray"));
20
-
21
19
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
22
20
 
23
21
  var _extends3 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
@@ -32,7 +30,7 @@ var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-sta
32
30
 
33
31
  var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
34
32
 
35
- var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
33
+ var _findIndex = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find-index"));
36
34
 
37
35
  var _classnames = _interopRequireDefault(require("classnames"));
38
36
 
@@ -48,7 +46,7 @@ var _styles = require("../../base/styles");
48
46
 
49
47
  function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol2 !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
50
48
 
51
- function _unsupportedIterableToArray(o, minLen) { var _context3; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty2(_context3 = Object.prototype.toString.call(o)).call(_context3, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
49
+ function _unsupportedIterableToArray(o, minLen) { var _context2; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context2 = Object.prototype.toString.call(o)).call(_context2, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
52
50
 
53
51
  function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
54
52
 
@@ -63,11 +61,6 @@ function treeMode() {
63
61
  var stateKey = 'treeMode';
64
62
  var ctx = pipeline.ctx;
65
63
  var primaryKey = pipeline.ensurePrimaryKey('treeMode');
66
-
67
- if (typeof primaryKey !== 'string') {
68
- throw new Error('treeMode 仅支持字符串作为 primaryKey');
69
- }
70
-
71
64
  var openKeys = (_c = (_b = (_a = opts.openKeys) !== null && _a !== void 0 ? _a : pipeline.getStateAtKey(stateKey)) !== null && _b !== void 0 ? _b : opts.defaultOpenKeys) !== null && _c !== void 0 ? _c : [];
72
65
  var openKeySet = new _set.default(openKeys);
73
66
 
@@ -122,7 +115,9 @@ function treeMode() {
122
115
  try {
123
116
  for (_iterator.s(); !(_step = _iterator.n()).done;) {
124
117
  var node = _step.value;
125
- var rowKey = node[primaryKey];
118
+
119
+ var rowKey = _internals.internals.safeGetRowKey(primaryKey, node, -1);
120
+
126
121
  var expanded = openKeySet.has(rowKey);
127
122
  var isLeaf = isLeafNode(node, {
128
123
  depth: depth,
@@ -152,18 +147,19 @@ function treeMode() {
152
147
  }
153
148
 
154
149
  function processColumns(columns) {
155
- var _context2;
156
-
157
150
  if (columns.length === 0) {
158
151
  return columns;
159
152
  }
160
153
 
161
- var _columns = (0, _toArray2.default)(columns),
162
- firstCol = _columns[0],
163
- others = (0, _slice.default)(_columns).call(_columns, 1);
154
+ var expandColIndex = (0, _findIndex.default)(columns).call(columns, function (_ref) {
155
+ var code = _ref.code;
156
+ return code && opts.expandColCode === code;
157
+ });
158
+ expandColIndex = expandColIndex === -1 ? 0 : expandColIndex;
159
+ var expandCol = columns[expandColIndex];
164
160
 
165
161
  var render = function render(value, record, recordIndex) {
166
- var content = _internals.internals.safeRender(firstCol, record, recordIndex);
162
+ var content = _internals.internals.safeRender(expandCol, record, recordIndex);
167
163
 
168
164
  if (record[treeMetaKey] == null) {
169
165
  // 没有 treeMeta 信息的话,就返回原先的渲染结果
@@ -223,7 +219,7 @@ function treeMode() {
223
219
  };
224
220
 
225
221
  var getCellProps = function getCellProps(value, record, rowIndex) {
226
- var prevProps = _internals.internals.safeGetCellProps(firstCol, record, rowIndex);
222
+ var prevProps = _internals.internals.safeGetCellProps(expandCol, record, rowIndex);
227
223
 
228
224
  if (record[treeMetaKey] == null) {
229
225
  // 没有 treeMeta 信息的话,就返回原先的 cellProps
@@ -252,15 +248,16 @@ function treeMode() {
252
248
  });
253
249
  };
254
250
 
255
- return (0, _concat.default)(_context2 = [(0, _extends3.default)((0, _extends3.default)({}, firstCol), {
251
+ columns[expandColIndex] = (0, _extends3.default)((0, _extends3.default)({}, expandCol), {
256
252
  title: /*#__PURE__*/_react.default.createElement("span", {
257
253
  style: {
258
254
  marginLeft: iconIndent + iconWidth + iconGap
259
255
  }
260
- }, _internals.internals.safeRenderHeader(firstCol)),
256
+ }, _internals.internals.safeRenderHeader(expandCol)),
261
257
  render: render,
262
- getCellProps: clickArea === 'cell' ? getCellProps : firstCol.getCellProps
263
- })]).call(_context2, (0, _toConsumableArray2.default)(others));
258
+ getCellProps: clickArea === 'cell' ? getCellProps : expandCol.getCellProps
259
+ });
260
+ return (0, _toConsumableArray2.default)(columns);
264
261
  }
265
262
  };
266
263
  }
@@ -36,7 +36,7 @@ export declare class TablePipeline {
36
36
  private _tableProps;
37
37
  private _dataSource;
38
38
  private _columns;
39
- private _footerDataSource;
39
+ private _footerDataSource?;
40
40
  static defaultIndents: TablePipelineIndentsConfig;
41
41
  readonly ctx: TablePipelineCtx;
42
42
  private readonly state;
@@ -88,6 +88,10 @@ export declare class TablePipeline {
88
88
  setFeatureOptions(optionKey: string, value: any): void;
89
89
  /** 获取 BaseTable 的 props,结果中包含 dataSource/columns/primaryKey/getRowProps 四个字段 */
90
90
  getProps(this: TablePipeline): TableProps;
91
+ /**
92
+ * 清除范围选中内容
93
+ */
94
+ clearRangeSelection(): void;
91
95
  }
92
96
  export declare function useTablePipeline(ctx?: Partial<TablePipelineCtx>): TablePipeline;
93
97
  export {};
@@ -28,6 +28,8 @@ var _utils = require("../utils");
28
28
 
29
29
  var _autoFill = require("./features/autoFill");
30
30
 
31
+ var _rangeSelection = require("./features/rangeSelection");
32
+
31
33
  /**
32
34
  * 表格数据处理流水线。TablePipeline 提供了表格数据处理过程中的一些上下方与工具方法,包括……
33
35
  *
@@ -286,25 +288,25 @@ var TablePipeline = /*#__PURE__*/function () {
286
288
  var preTableWidth = _this2.getStateAtKey(_autoFill.tableWidthKey);
287
289
 
288
290
  if (preTableWidth !== tableWidth) {
289
- _this2.setStateAtKey(_autoFill.tableWidthKey, tableWidth);
291
+ tableWidth && _this2.setStateAtKey(_autoFill.tableWidthKey, tableWidth);
290
292
  }
291
293
  };
292
294
 
293
295
  result.setTableDomHelper = function (domHelper) {
294
296
  _this2.ref.current.domHelper = domHelper;
295
- }; // if (this.getFeatureOptions(rangeSelectionKey)) {
296
- // result.clearRangeSelectionStatus = () => {
297
- // const { rangeSelectedChange } = this.getFeatureOptions(rangeSelectionKey)
298
- // const rangeSelection = this.getStateAtKey(rangeSelectionKey)
299
- // if (rangeSelection) {
300
- // rangeSelectedChange?.(null)
301
- // }
302
- // }
303
- // }
304
-
297
+ };
305
298
 
306
299
  return result;
307
300
  }
301
+ /**
302
+ * 清除范围选中内容
303
+ */
304
+
305
+ }, {
306
+ key: "clearRangeSelection",
307
+ value: function clearRangeSelection() {
308
+ this.setStateAtKey(_rangeSelection.rangeSelectionKey, null);
309
+ }
308
310
  }]);
309
311
  return TablePipeline;
310
312
  }();
@@ -0,0 +1,4 @@
1
+ declare const KeyCode: {
2
+ ENTER: number;
3
+ };
4
+ export default KeyCode;
@@ -0,0 +1,11 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.default = void 0;
7
+ var KeyCode = {
8
+ ENTER: 13
9
+ };
10
+ var _default = KeyCode;
11
+ exports.default = _default;
@@ -17,13 +17,9 @@ var _classnames = _interopRequireDefault(require("classnames"));
17
17
 
18
18
  function composeEventHandler(handler1, handler2) {
19
19
  return function () {
20
- for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
21
- args[_key] = arguments[_key];
22
- }
23
-
24
20
  // 先执行原有的事件回调函数
25
- handler1(args);
26
- handler2(args); // 事件回调函数没有返回值,故这里不进行 return
21
+ handler1.apply(void 0, arguments);
22
+ handler2.apply(void 0, arguments); // 事件回调函数没有返回值,故这里不进行 return
27
23
  };
28
24
  }
29
25
  /** 合并两个 cellProps(单元格属性)对象,返回一个合并后的全新对象。
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kdcloudjs/table",
3
- "version": "1.1.3",
3
+ "version": "1.1.4-canary.2",
4
4
  "description": "金蝶 react table 组件",
5
5
  "title": "table",
6
6
  "keywords": [
@@ -54,8 +54,8 @@
54
54
  "test:update": "jest --config .jest.js --cache=false -u",
55
55
  "test:ci": "jest --config .jest.js --coverage --ci --update-snapshot",
56
56
  "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s --skip-unstable",
57
- "pub": "npm run build && cross-env PUB_ENV=pub np --no-cleanup --no-tests",
58
- "pub:beta": "npm run test:all && npm run build && cross-env PUB_ENV=pub np --no-cleanup --anyBranch --no-tests --tag=beta",
57
+ "pub": "npm run test:all && npm run build && cross-env PUB_ENV=pub np --no-cleanup --no-tests",
58
+ "pub:canary": "npm run build && cross-env PUB_ENV=pub np --no-cleanup --anyBranch --no-tests --tag=canary",
59
59
  "new": "node scripts/create-component.js",
60
60
  "kd-ui": "npm install @kingdee-ui/kui --registry http://npm.kingdee.com/"
61
61
  },