@kdcloudjs/table 1.1.4-canary.2 → 1.1.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.
Files changed (75) hide show
  1. package/dist/@kdcloudjs/table.css +1 -1
  2. package/dist/@kdcloudjs/table.js +280 -625
  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 +9 -10
  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 +2 -10
  9. package/es/table/base/styles.js +7 -17
  10. package/es/table/base/table.d.ts +0 -2
  11. package/es/table/base/table.js +53 -31
  12. package/es/table/base/utils.d.ts +0 -7
  13. package/es/table/base/utils.js +1 -29
  14. package/es/table/pipeline/features/columnDrag.js +4 -5
  15. package/es/table/pipeline/features/columnFilter.d.ts +2 -4
  16. package/es/table/pipeline/features/columnFilter.js +17 -39
  17. package/es/table/pipeline/features/columnResizeWidth.js +1 -1
  18. package/es/table/pipeline/features/filter/DefaultFilterContent.js +2 -22
  19. package/es/table/pipeline/features/filter/Filter.d.ts +2 -3
  20. package/es/table/pipeline/features/filter/Filter.js +34 -44
  21. package/es/table/pipeline/features/filter/FilterPanel.d.ts +1 -2
  22. package/es/table/pipeline/features/filter/FilterPanel.js +20 -29
  23. package/es/table/pipeline/features/filter/util.js +4 -4
  24. package/es/table/pipeline/features/index.d.ts +0 -1
  25. package/es/table/pipeline/features/index.js +1 -2
  26. package/es/table/pipeline/features/multiSelect.js +2 -7
  27. package/es/table/pipeline/features/rangeSelection.d.ts +1 -1
  28. package/es/table/pipeline/features/rangeSelection.js +28 -156
  29. package/es/table/pipeline/features/singleSelect.js +0 -4
  30. package/es/table/pipeline/features/treeMode.d.ts +0 -2
  31. package/es/table/pipeline/features/treeMode.js +20 -18
  32. package/es/table/pipeline/pipeline.d.ts +1 -5
  33. package/es/table/pipeline/pipeline.js +10 -11
  34. package/es/table/utils/mergeCellProps.js +6 -2
  35. package/lib/table/base/html-table.js +1 -1
  36. package/lib/table/base/styles.d.ts +2 -10
  37. package/lib/table/base/styles.js +7 -17
  38. package/lib/table/base/table.d.ts +0 -2
  39. package/lib/table/base/table.js +53 -31
  40. package/lib/table/base/utils.d.ts +0 -7
  41. package/lib/table/base/utils.js +1 -35
  42. package/lib/table/pipeline/features/columnDrag.js +4 -5
  43. package/lib/table/pipeline/features/columnFilter.d.ts +2 -4
  44. package/lib/table/pipeline/features/columnFilter.js +17 -37
  45. package/lib/table/pipeline/features/columnResizeWidth.js +1 -1
  46. package/lib/table/pipeline/features/filter/DefaultFilterContent.js +1 -23
  47. package/lib/table/pipeline/features/filter/Filter.d.ts +2 -3
  48. package/lib/table/pipeline/features/filter/Filter.js +34 -46
  49. package/lib/table/pipeline/features/filter/FilterPanel.d.ts +1 -2
  50. package/lib/table/pipeline/features/filter/FilterPanel.js +19 -30
  51. package/lib/table/pipeline/features/filter/util.js +4 -4
  52. package/lib/table/pipeline/features/index.d.ts +0 -1
  53. package/lib/table/pipeline/features/index.js +1 -15
  54. package/lib/table/pipeline/features/multiSelect.js +1 -6
  55. package/lib/table/pipeline/features/rangeSelection.d.ts +1 -1
  56. package/lib/table/pipeline/features/rangeSelection.js +30 -158
  57. package/lib/table/pipeline/features/singleSelect.js +0 -4
  58. package/lib/table/pipeline/features/treeMode.d.ts +0 -2
  59. package/lib/table/pipeline/features/treeMode.js +22 -19
  60. package/lib/table/pipeline/pipeline.d.ts +1 -5
  61. package/lib/table/pipeline/pipeline.js +10 -12
  62. package/lib/table/utils/mergeCellProps.js +6 -2
  63. package/package.json +3 -3
  64. package/es/table/pipeline/features/filter/DefaultFilterIcon.d.ts +0 -5
  65. package/es/table/pipeline/features/filter/DefaultFilterIcon.js +0 -20
  66. package/es/table/pipeline/features/footerDataSource.d.ts +0 -9
  67. package/es/table/pipeline/features/footerDataSource.js +0 -25
  68. package/es/table/utils/keyCode.d.ts +0 -4
  69. package/es/table/utils/keyCode.js +0 -4
  70. package/lib/table/pipeline/features/filter/DefaultFilterIcon.d.ts +0 -5
  71. package/lib/table/pipeline/features/filter/DefaultFilterIcon.js +0 -30
  72. package/lib/table/pipeline/features/footerDataSource.d.ts +0 -9
  73. package/lib/table/pipeline/features/footerDataSource.js +0 -41
  74. package/lib/table/utils/keyCode.d.ts +0 -4
  75. package/lib/table/utils/keyCode.js +0 -11
@@ -10,42 +10,40 @@ import { map, takeUntil } from 'rxjs/operators';
10
10
  import { Classes } from '../../base/styles';
11
11
  import cx from 'classnames';
12
12
  export var rangeSelectionKey = 'rangeSelection';
13
- export var lastClickCellKey = 'lastClickCell';
13
+ export var lastClickCell = 'lastClickCell';
14
14
  export function rangeSelection(opts) {
15
15
  return function step(pipeline) {
16
16
  var SCROLL_SIZE = 30;
17
17
  var tableBody = pipeline.ref.current.domHelper && pipeline.ref.current.domHelper.tableBody;
18
- var tableFooter = pipeline.ref.current.domHelper && pipeline.ref.current.domHelper.tableFooter;
19
18
 
20
19
  if (!tableBody) {
21
20
  return pipeline;
22
21
  }
23
22
 
24
23
  var columns = pipeline.getColumns();
25
- var dataSource = pipeline.getDataSource();
26
24
 
27
25
  var rangeSelectedChange = function rangeSelectedChange(rangeSelection) {
28
26
  var _a;
29
27
 
30
28
  pipeline.setStateAtKey(rangeSelectionKey, rangeSelection);
31
29
  (_a = opts === null || opts === void 0 ? void 0 : opts.rangeSelectedChange) === null || _a === void 0 ? void 0 : _a.call(opts, rangeSelection);
32
- };
30
+ }; // if (!pipeline.getFeatureOptions(rangeSelectionKey)) {
31
+ // pipeline.setFeatureOptions(rangeSelectionKey, {
32
+ // optionKey: rangeSelectionKey,
33
+ // rangeSelectedChange: rangeSelectedChange
34
+ // })
35
+ // }
36
+
33
37
 
34
38
  var setRangeSelection = function setRangeSelection(startDragCell, draggingCell) {
35
- if (!startDragCell || !draggingCell) return;
39
+ if (!startDragCell || !draggingCell || isSameCell(startDragCell, draggingCell)) return;
36
40
  var rangeColumns = getRangeColumns(startDragCell, draggingCell, columns);
37
-
38
- var _getRangeSelectionRow = getRangeSelectionRowInfo(startDragCell, draggingCell, dataSource),
39
- startRow = _getRangeSelectionRow.startRow,
40
- endRow = _getRangeSelectionRow.endRow,
41
- footerRowRange = _getRangeSelectionRow.footerRowRange;
42
-
41
+ var isTopToBottom = startDragCell.rowIndex <= draggingCell.rowIndex;
43
42
  var rangeSelection = {
44
- startRow: startRow,
45
- endRow: endRow,
43
+ startRow: isTopToBottom ? startDragCell.rowIndex : startDragCell.rowIndex + startDragCell.rowSpan - 1,
44
+ endRow: isTopToBottom ? draggingCell.rowIndex + draggingCell.rowSpan - 1 : draggingCell.rowIndex,
46
45
  columns: rangeColumns,
47
- startColumn: startDragCell.column,
48
- footerRowRange: footerRowRange
46
+ startColumn: startDragCell.column
49
47
  };
50
48
  rangeSelectedChange(rangeSelection);
51
49
  };
@@ -56,23 +54,23 @@ export function rangeSelection(opts) {
56
54
 
57
55
  if (clickCell) {
58
56
  if (event.shiftKey) {
59
- var _lastClickCell = pipeline.getStateAtKey(lastClickCellKey);
57
+ var _lastClickCell = pipeline.getStateAtKey(lastClickCell);
60
58
 
61
59
  if (_lastClickCell) {
62
60
  setRangeSelection(_lastClickCell, clickCell);
63
61
  } else {
64
62
  // 第一次进来就按住shift键,这时候要记住点击的单元格
65
- pipeline.setStateAtKey(lastClickCellKey, clickCell);
63
+ pipeline.setStateAtKey(lastClickCell, clickCell);
66
64
  }
67
65
  } else {
68
- pipeline.setStateAtKey(lastClickCellKey, clickCell);
69
- setRangeSelection(clickCell, clickCell);
66
+ pipeline.setStateAtKey(lastClickCell, clickCell);
67
+ rangeSelectedChange(null);
70
68
  }
71
69
  }
72
70
  };
73
71
 
74
72
  var onMouseDown = function onMouseDown(mouseDownEvent) {
75
- if (mouseDownEvent.button !== 0 || !(isElementInEventPath(tableBody, mouseDownEvent.nativeEvent) || isElementInEventPath(tableFooter, mouseDownEvent.nativeEvent))) return; // mouseDownEvent.preventDefault()
73
+ if (mouseDownEvent.button !== 0 || !isElementInEventPath(tableBody, mouseDownEvent.nativeEvent)) return; // mouseDownEvent.preventDefault()
76
74
  // shift + 点击选中
77
75
 
78
76
  shiftKeySelect(mouseDownEvent);
@@ -128,11 +126,10 @@ export function rangeSelection(opts) {
128
126
  };
129
127
 
130
128
  var onKeyDown = function onKeyDown(e) {
131
- if (!(isElementInEventPath(tableBody, e.nativeEvent) || isElementInEventPath(tableFooter, e.nativeEvent))) return;
129
+ if (!isElementInEventPath(tableBody, e.nativeEvent)) return;
132
130
 
133
131
  if ((e.ctrlKey || e.metaKey) && e.key === 'a') {
134
132
  var rowLen = pipeline.getDataSource().length;
135
- var footerDataSource = pipeline.getFooterDataSource() || [];
136
133
 
137
134
  if (columns.length && rowLen) {
138
135
  opts.preventkDefaultOfKeyDownEvent !== false && e.preventDefault();
@@ -140,11 +137,7 @@ export function rangeSelection(opts) {
140
137
  startRow: 0,
141
138
  endRow: rowLen - 1,
142
139
  columns: columns,
143
- startColumn: columns[0],
144
- footerRowRange: footerDataSource.length > 0 ? {
145
- startRow: 0,
146
- endRow: footerDataSource.length - 1
147
- } : null
140
+ startColumn: columns[0]
148
141
  });
149
142
  }
150
143
  }
@@ -153,8 +146,7 @@ export function rangeSelection(opts) {
153
146
  pipeline.addTableProps({
154
147
  onMouseDown: onMouseDown,
155
148
  onKeyDown: onKeyDown,
156
- tabIndex: -1,
157
- className: cx([Classes.rangeSelection])
149
+ tabIndex: -1
158
150
  }); // todo: 后面可以把mousedown放到一个流里面
159
151
 
160
152
  return pipeline.mapColumns(makeRecursiveMapper(function (col) {
@@ -170,29 +162,15 @@ export function rangeSelection(opts) {
170
162
  var _cx;
171
163
 
172
164
  var prevCellProps = prevGetCellProps === null || prevGetCellProps === void 0 ? void 0 : prevGetCellProps(value, record, rowIndex);
173
- var isInFooter = record[pipeline.getFeatureOptions('footerRowMetaKey')];
174
165
  var startRow = rangeSelection.startRow,
175
166
  endRow = rangeSelection.endRow,
176
- columns = rangeSelection.columns,
177
- footerRowRange = rangeSelection.footerRowRange;
178
-
179
- var _getRowIndex = getRowIndex(startRow, endRow),
180
- startRowIndex = _getRowIndex.startRowIndex,
181
- endRowIndex = _getRowIndex.endRowIndex;
182
-
183
- var _getFooterRowIndex = getFooterRowIndex(footerRowRange),
184
- footerStartRowIndex = _getFooterRowIndex.startRowIndex,
185
- footerEndRowIndex = _getFooterRowIndex.endRowIndex;
186
-
167
+ columns = rangeSelection.columns;
168
+ var startIndex = startRow < endRow ? startRow : endRow;
169
+ var endIndex = startRow < endRow ? endRow : startRow;
187
170
  var startCol = columns[0];
188
171
  var endCol = columns[columns.length - 1];
189
- var bodyMatch = !isInFooter && rowIndex >= startRowIndex && rowIndex <= endRowIndex;
190
- var footerMatch = isInFooter && footerRowRange && rowIndex >= footerStartRowIndex && rowIndex <= footerEndRowIndex;
191
- var match = footerMatch || bodyMatch;
192
- var matchSingleCell = match && isCellRangeSingleCell(rangeSelection); // 单个范围选中单元格不显示样式
193
-
194
- var showCellRangeStyle = match && !matchSingleCell;
195
- var className = cx((_cx = {}, _defineProperty(_cx, Classes.tableCellRangeSingleCell, matchSingleCell), _defineProperty(_cx, Classes.tableCellRangeSelected, showCellRangeStyle), _defineProperty(_cx, Classes.tableCellRangeTop, showCellRangeStyle && (isInFooter ? startRowIndex !== -1 ? false : rowIndex === footerStartRowIndex : rowIndex === startRowIndex)), _defineProperty(_cx, Classes.tableCellRangeLeft, showCellRangeStyle && col.code === startCol.code), _defineProperty(_cx, Classes.tableCellRangeBottom, showCellRangeStyle && (isInFooter ? rowIndex === footerEndRowIndex : footerRowRange ? false : rowIndex === endRowIndex)), _defineProperty(_cx, Classes.tableCellRangeRight, showCellRangeStyle && col.code === endCol.code), _cx));
172
+ var match = rowIndex >= startIndex && rowIndex <= endIndex;
173
+ var className = cx((_cx = {}, _defineProperty(_cx, Classes.tableCellRangeSelected, match), _defineProperty(_cx, Classes.tableCellRangeTop, rowIndex === startIndex), _defineProperty(_cx, Classes.tableCellRangeLeft, col.code === startCol.code && match), _defineProperty(_cx, Classes.tableCellRangeBottom, rowIndex === endIndex), _defineProperty(_cx, Classes.tableCellRangeRight, col.code === endCol.code && match), _cx));
196
174
  return mergeCellProps(prevCellProps, {
197
175
  className: className
198
176
  });
@@ -218,8 +196,7 @@ function getTargetCell(target, columns) {
218
196
  rowIndex: parseInt(target.getAttribute('data-rowindex')),
219
197
  rowSpan: parseInt(target.getAttribute('rowspan') || 1),
220
198
  code: columnCode,
221
- column: column,
222
- isInFooter: isEleInFooter(target)
199
+ column: column
223
200
  }
224
201
  };
225
202
  }();
@@ -234,19 +211,7 @@ function getTargetCell(target, columns) {
234
211
  }
235
212
 
236
213
  function isSameCell(cell1, cell2) {
237
- return cell1.rowIndex === cell2.rowIndex && cell1.code === cell2.code && cell1.isInFooter === cell2.isInFooter;
238
- }
239
-
240
- function isEleInFooter(target) {
241
- while (target && !target.classList.contains(Classes.artTable)) {
242
- if (target.classList.contains(Classes.tableFooter)) {
243
- return true;
244
- }
245
-
246
- target = target.parentElement;
247
- }
248
-
249
- return false;
214
+ return cell1.rowIndex === cell2.rowIndex && cell1.code === cell2.code;
250
215
  }
251
216
 
252
217
  function getRangeColumns(startCell, endCell, columns) {
@@ -265,97 +230,4 @@ function getRangeColumns(startCell, endCell, columns) {
265
230
  } else {
266
231
  return _sliceInstanceProperty(flatColumns).call(flatColumns, endIndex, startIndex + 1);
267
232
  }
268
- }
269
-
270
- function getRangeSelectionRowInfo(startCell, endCell, dataSource) {
271
- var footerRowRange = null;
272
- var startRow = -1;
273
- var endRow = -1;
274
-
275
- var _getCellRangeRow = getCellRangeRow(startCell, endCell),
276
- _startRow = _getCellRangeRow.startRow,
277
- _endRow = _getCellRangeRow.endRow; // 两个单元格都在表体
278
-
279
-
280
- if (!startCell.isInFooter && !endCell.isInFooter) {
281
- startRow = _startRow;
282
- endRow = _endRow;
283
- } else if (startCell.isInFooter && endCell.isInFooter) {
284
- // 两个单元格都在表底
285
- footerRowRange = {
286
- startRow: _startRow,
287
- endRow: _endRow
288
- };
289
- } else {
290
- // 一个单元格在表体,一个在表底
291
- if (startCell.isInFooter) {
292
- startRow = dataSource.length - 1;
293
- endRow = endCell.rowIndex;
294
- footerRowRange = {
295
- startRow: startCell.rowIndex,
296
- endRow: 0
297
- };
298
- } else {
299
- startRow = startCell.rowIndex;
300
- endRow = dataSource.length - 1;
301
- footerRowRange = {
302
- startRow: 0,
303
- endRow: endCell.rowIndex
304
- };
305
- }
306
- }
307
-
308
- return {
309
- startRow: startRow,
310
- endRow: endRow,
311
- footerRowRange: footerRowRange
312
- };
313
- }
314
-
315
- function getCellRangeRow(startCell, endCell) {
316
- if (isSameCell(startCell, endCell)) {
317
- return {
318
- startRow: startCell.rowIndex,
319
- endRow: startCell.rowIndex
320
- };
321
- }
322
-
323
- var isTopToBottom = startCell.rowIndex <= endCell.rowIndex;
324
- var startRow = isTopToBottom ? startCell.rowIndex : startCell.rowIndex + startCell.rowSpan - 1;
325
- var endRow = isTopToBottom ? endCell.rowIndex + endCell.rowSpan - 1 : endCell.rowIndex;
326
- return {
327
- startRow: startRow,
328
- endRow: endRow
329
- };
330
- }
331
-
332
- function isCellRangeSingleCell(rangeSelection) {
333
- var startRow = rangeSelection.startRow,
334
- endRow = rangeSelection.endRow,
335
- columns = rangeSelection.columns,
336
- footerRowRange = rangeSelection.footerRowRange;
337
- var isBodySingleCell = !footerRowRange && startRow === endRow && columns.length === 1;
338
- var isFooterSingleCell = startRow === -1 && footerRowRange.startRow === footerRowRange.endRow && columns.length === 1;
339
- return isBodySingleCell || isFooterSingleCell;
340
- }
341
-
342
- function getRowIndex(startRow, endRow) {
343
- var isReverse = startRow > endRow;
344
- var startRowIndex = isReverse ? endRow : startRow;
345
- var endRowIndex = isReverse ? startRow : endRow;
346
- return {
347
- startRowIndex: startRowIndex,
348
- endRowIndex: endRowIndex
349
- };
350
- }
351
-
352
- function getFooterRowIndex(footerRowRange) {
353
- if (footerRowRange) {
354
- return getRowIndex(footerRowRange.startRow, footerRowRange.endRow);
355
- }
356
-
357
- return {
358
- startRowIndex: -1,
359
- endRowIndex: -1
360
- };
361
233
  }
@@ -60,10 +60,6 @@ export function singleSelect() {
60
60
  return preCellProps;
61
61
  },
62
62
  render: function render(_, row, rowIndex) {
63
- if (row[pipeline.getFeatureOptions('footerRowMetaKey')]) {
64
- return null;
65
- }
66
-
67
63
  var rowKey = internals.safeGetRowKey(primaryKey, row, rowIndex);
68
64
  return /*#__PURE__*/React.createElement(Radio, {
69
65
  checked: value === rowKey,
@@ -32,8 +32,6 @@ export interface TreeModeFeatureOptions {
32
32
  stopClickEventPropagation?: boolean;
33
33
  /** 指定表格每一行元信息的记录字段 */
34
34
  treeMetaKey?: string | symbol;
35
- /** 指定展开列 */
36
- expandColCode?: string;
37
35
  }
38
36
  export declare function treeMode(opts?: TreeModeFeatureOptions): (pipeline: TablePipeline) => TablePipeline;
39
37
  export {};
@@ -1,13 +1,13 @@
1
- import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
2
1
  import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
3
2
  import _getIteratorMethod from "@babel/runtime-corejs3/core-js/get-iterator-method";
3
+ import _toArray from "@babel/runtime-corejs3/helpers/toArray";
4
4
  import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
5
5
  import _extends from "@babel/runtime-corejs3/helpers/extends";
6
6
  import _toConsumableArray from "@babel/runtime-corejs3/helpers/toConsumableArray";
7
7
 
8
8
  function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "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; } } }; }
9
9
 
10
- 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); }
10
+ function _unsupportedIterableToArray(o, minLen) { var _context3; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_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); }
11
11
 
12
12
  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; }
13
13
 
@@ -15,7 +15,7 @@ import _Symbol from "@babel/runtime-corejs3/core-js-stable/symbol";
15
15
  import _Set from "@babel/runtime-corejs3/core-js-stable/set";
16
16
  import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
17
17
  import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
18
- import _findIndexInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find-index";
18
+ import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
19
19
  import cx from 'classnames';
20
20
  import React from 'react';
21
21
  import { ExpansionCell, icons, InlineFlexCell } from '../../common-views';
@@ -31,6 +31,11 @@ export function treeMode() {
31
31
  var stateKey = 'treeMode';
32
32
  var ctx = pipeline.ctx;
33
33
  var primaryKey = pipeline.ensurePrimaryKey('treeMode');
34
+
35
+ if (typeof primaryKey !== 'string') {
36
+ throw new Error('treeMode 仅支持字符串作为 primaryKey');
37
+ }
38
+
34
39
  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 : [];
35
40
  var openKeySet = new _Set(openKeys);
36
41
 
@@ -85,7 +90,7 @@ export function treeMode() {
85
90
  try {
86
91
  for (_iterator.s(); !(_step = _iterator.n()).done;) {
87
92
  var node = _step.value;
88
- var rowKey = internals.safeGetRowKey(primaryKey, node, -1);
93
+ var rowKey = node[primaryKey];
89
94
  var expanded = openKeySet.has(rowKey);
90
95
  var isLeaf = isLeafNode(node, {
91
96
  depth: depth,
@@ -115,20 +120,18 @@ export function treeMode() {
115
120
  }
116
121
 
117
122
  function processColumns(columns) {
123
+ var _context2;
124
+
118
125
  if (columns.length === 0) {
119
126
  return columns;
120
127
  }
121
128
 
122
- var expandColIndex = _findIndexInstanceProperty(columns).call(columns, function (_ref) {
123
- var code = _ref.code;
124
- return code && opts.expandColCode === code;
125
- });
126
-
127
- expandColIndex = expandColIndex === -1 ? 0 : expandColIndex;
128
- var expandCol = columns[expandColIndex];
129
+ var _columns = _toArray(columns),
130
+ firstCol = _columns[0],
131
+ others = _sliceInstanceProperty(_columns).call(_columns, 1);
129
132
 
130
133
  var render = function render(value, record, recordIndex) {
131
- var content = internals.safeRender(expandCol, record, recordIndex);
134
+ var content = internals.safeRender(firstCol, record, recordIndex);
132
135
 
133
136
  if (record[treeMetaKey] == null) {
134
137
  // 没有 treeMeta 信息的话,就返回原先的渲染结果
@@ -188,7 +191,7 @@ export function treeMode() {
188
191
  };
189
192
 
190
193
  var getCellProps = function getCellProps(value, record, rowIndex) {
191
- var prevProps = internals.safeGetCellProps(expandCol, record, rowIndex);
194
+ var prevProps = internals.safeGetCellProps(firstCol, record, rowIndex);
192
195
 
193
196
  if (record[treeMetaKey] == null) {
194
197
  // 没有 treeMeta 信息的话,就返回原先的 cellProps
@@ -217,16 +220,15 @@ export function treeMode() {
217
220
  });
218
221
  };
219
222
 
220
- columns[expandColIndex] = _extends(_extends({}, expandCol), {
223
+ return _concatInstanceProperty(_context2 = [_extends(_extends({}, firstCol), {
221
224
  title: /*#__PURE__*/React.createElement("span", {
222
225
  style: {
223
226
  marginLeft: iconIndent + iconWidth + iconGap
224
227
  }
225
- }, internals.safeRenderHeader(expandCol)),
228
+ }, internals.safeRenderHeader(firstCol)),
226
229
  render: render,
227
- getCellProps: clickArea === 'cell' ? getCellProps : expandCol.getCellProps
228
- });
229
- return _toConsumableArray(columns);
230
+ getCellProps: clickArea === 'cell' ? getCellProps : firstCol.getCellProps
231
+ })]).call(_context2, _toConsumableArray(others));
230
232
  }
231
233
  };
232
234
  }
@@ -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,10 +88,6 @@ 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;
95
91
  }
96
92
  export declare function useTablePipeline(ctx?: Partial<TablePipelineCtx>): TablePipeline;
97
93
  export {};
@@ -8,7 +8,6 @@ import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instan
8
8
  import { useState, useRef } from 'react';
9
9
  import { mergeCellProps } from '../utils';
10
10
  import { autoFillTableWidth, tableWidthKey } from './features/autoFill';
11
- import { rangeSelectionKey } from './features/rangeSelection';
12
11
  /**
13
12
  * 表格数据处理流水线。TablePipeline 提供了表格数据处理过程中的一些上下方与工具方法,包括……
14
13
  *
@@ -277,18 +276,18 @@ export var TablePipeline = /*#__PURE__*/function () {
277
276
 
278
277
  result.setTableDomHelper = function (domHelper) {
279
278
  _this2.ref.current.domHelper = domHelper;
280
- };
279
+ }; // if (this.getFeatureOptions(rangeSelectionKey)) {
280
+ // result.clearRangeSelectionStatus = () => {
281
+ // const { rangeSelectedChange } = this.getFeatureOptions(rangeSelectionKey)
282
+ // const rangeSelection = this.getStateAtKey(rangeSelectionKey)
283
+ // if (rangeSelection) {
284
+ // rangeSelectedChange?.(null)
285
+ // }
286
+ // }
287
+ // }
281
288
 
282
- return result;
283
- }
284
- /**
285
- * 清除范围选中内容
286
- */
287
289
 
288
- }, {
289
- key: "clearRangeSelection",
290
- value: function clearRangeSelection() {
291
- this.setStateAtKey(rangeSelectionKey, null);
290
+ return result;
292
291
  }
293
292
  }]);
294
293
 
@@ -5,9 +5,13 @@ import cx from 'classnames';
5
5
 
6
6
  function composeEventHandler(handler1, handler2) {
7
7
  return function () {
8
+ for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
9
+ args[_key] = arguments[_key];
10
+ }
11
+
8
12
  // 先执行原有的事件回调函数
9
- handler1.apply(void 0, arguments);
10
- handler2.apply(void 0, arguments); // 事件回调函数没有返回值,故这里不进行 return
13
+ handler1(args);
14
+ handler2(args); // 事件回调函数没有返回值,故这里不进行 return
11
15
  };
12
16
  }
13
17
  /** 合并两个 cellProps(单元格属性)对象,返回一个合并后的全新对象。
@@ -141,7 +141,7 @@ function HtmlTable(_ref) {
141
141
  positionStyle.left = hozInfo.stickyLeftMap.get(colIndex);
142
142
  } else if (colIndex >= fullFlatCount - rightFlatCount) {
143
143
  positionStyle.position = 'sticky';
144
- positionStyle.right = hozInfo.stickyRightMap.get(colIndex) - (typeof stickyRightOffset === 'number' ? stickyRightOffset : 0);
144
+ positionStyle.right = hozInfo.stickyRightMap.get(colIndex) - stickyRightOffset;
145
145
  }
146
146
 
147
147
  return /*#__PURE__*/_react.default.createElement('td', (0, _extends2.default)((0, _extends2.default)((0, _extends2.default)((0, _extends2.default)({
@@ -2,7 +2,6 @@ export declare const LOCK_SHADOW_PADDING = 20;
2
2
  export declare const Classes: {
3
3
  /** BaseTable 表格组件的外层包裹 div */
4
4
  readonly artTableWrapper: string;
5
- readonly artTableBordered: string;
6
5
  readonly artTable: string;
7
6
  readonly tableHeaderMain: string;
8
7
  readonly tableHeader: string;
@@ -41,8 +40,6 @@ export declare const Classes: {
41
40
  readonly button: string;
42
41
  readonly buttonPrimary: string;
43
42
  readonly filterIcon: string;
44
- readonly rangeSelection: string;
45
- readonly tableCellRangeSingleCell: string;
46
43
  readonly tableCellRangeSelected: string;
47
44
  readonly tableCellRangeTop: string;
48
45
  readonly tableCellRangeLeft: string;
@@ -63,9 +60,6 @@ export declare const Classes: {
63
60
  readonly leaf: string;
64
61
  readonly expanded: string;
65
62
  readonly collapsed: string;
66
- readonly popup: string;
67
- readonly popupHeader: string;
68
- readonly popupBody: string;
69
63
  };
70
64
  export declare const MenuClasses: {
71
65
  menu: string;
@@ -118,13 +112,13 @@ export declare type BaseTableCSSVariables = Partial<{
118
112
  '--border-color': string;
119
113
  /** 单元格边框,默认为 1px solid #dfe3e8 */
120
114
  '--cell-border': string;
121
- /** 单元格上下边框,默认为 none ,默认值为 1px solid #dfe3e8 */
115
+ /** 单元格上下边框,默认为 #dfe3e8 */
122
116
  '--cell-border-horizontal': string;
123
117
  /** 单元格左右边框,默认为 #dfe3e8 */
124
118
  '--cell-border-vertical': string;
125
119
  /** 表头单元格边框,默认为 1px solid #dfe3e8 */
126
120
  '--header-cell-border': string;
127
- /** 表头单元格上下边框,默认为 none ,默认值为 1px solid #dfe3e8 */
121
+ /** 表头单元格上下边框,默认为 1px solid #dfe3e8 */
128
122
  '--header-cell-border-horizontal': string;
129
123
  /** 表头单元格左右边框,默认为 1px solid #dfe3e8 */
130
124
  '--header-cell-border-vertical': string;
@@ -154,9 +148,7 @@ export declare const defaultCSSVariables: {
154
148
  '--cell-border-horizontal': string;
155
149
  '---cell-border-vertical': string;
156
150
  '--header-cell-border': string;
157
- '--cell-border-vertical': string;
158
151
  '--header-cell-border-horizontal': string;
159
- '--header-cell-border-vertical': string;
160
152
  };
161
153
  export declare const variableConst: string;
162
154
  export declare const StyledArtTableWrapper: any;