linkmore-design 1.1.21 → 1.1.22-beta.1

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 (126) hide show
  1. package/dist/LmDrag/LmDrag.d.ts +2 -3
  2. package/dist/LmEditTable/EditTable.d.ts +14 -4
  3. package/dist/LmTable/common/index.d.ts +10 -0
  4. package/dist/LmTable/components/Container/Container.d.ts +18 -0
  5. package/dist/LmTable/components/Container/index.d.ts +2 -0
  6. package/dist/LmTable/components/DndContainer.d.ts +37 -5
  7. package/dist/LmTable/components/HeaderCol.d.ts +1 -0
  8. package/dist/LmTable/components/Item/Item.d.ts +37 -0
  9. package/dist/LmTable/components/Item/components/Action/Action.d.ts +10 -0
  10. package/dist/LmTable/components/Item/components/Action/index.d.ts +2 -0
  11. package/dist/LmTable/components/Item/components/Handle/index.d.ts +4 -0
  12. package/dist/LmTable/components/Item/components/Remove/index.d.ts +2 -0
  13. package/dist/LmTable/components/Item/components/index.d.ts +3 -0
  14. package/dist/LmTable/components/Item/index.d.ts +2 -0
  15. package/dist/LmTable/components/{sortableBoxCol.d.ts → SortableBox.d.ts} +0 -0
  16. package/dist/LmTable/demos/{excelGroup.d.ts → draggable.d.ts} +0 -0
  17. package/dist/LmTable/hooks/useDndItems.d.ts +13 -0
  18. package/dist/LmTable/multipleContainersKeyboardCoordinates.d.ts +3 -0
  19. package/dist/LmTable/testDemos/group.d.ts +2 -0
  20. package/dist/LmUpload/fns/index.d.ts +1 -0
  21. package/dist/index.d.ts +1 -0
  22. package/dist/index.umd.css +367 -0
  23. package/dist/index.umd.js +1775 -51950
  24. package/dist/index.umd.min.css +1 -1
  25. package/dist/index.umd.min.js +23 -47
  26. package/dist/variables.css +10 -2
  27. package/es/LmDrag/LmDrag.d.ts +2 -3
  28. package/es/LmEditTable/EditTable.d.ts +14 -4
  29. package/es/LmEditTable/EditTable.js +78 -54
  30. package/es/LmFilter/components/DropdownFIlter.js +26 -5
  31. package/es/LmFilter/style/index.css +9 -0
  32. package/es/LmFilter/style/variables.css +9 -0
  33. package/es/LmTable/Table.js +132 -125
  34. package/es/LmTable/common/index.d.ts +10 -0
  35. package/es/LmTable/common/index.js +38 -0
  36. package/es/LmTable/components/Container/Container.css +87 -0
  37. package/es/LmTable/components/Container/Container.d.ts +18 -0
  38. package/es/LmTable/components/Container/Container.js +48 -0
  39. package/es/LmTable/components/Container/index.d.ts +2 -0
  40. package/es/LmTable/components/Container/index.js +1 -0
  41. package/es/LmTable/components/DndContainer.d.ts +37 -5
  42. package/es/LmTable/components/DndContainer.js +699 -24
  43. package/es/LmTable/components/DndContainer.module.css +6 -0
  44. package/es/LmTable/components/HeaderCol.js +46 -0
  45. package/es/LmTable/components/Item/Item.css +113 -0
  46. package/es/LmTable/components/Item/Item.d.ts +37 -0
  47. package/es/LmTable/components/Item/Item.js +88 -0
  48. package/es/LmTable/components/Item/components/Action/Action.css +41 -0
  49. package/es/LmTable/components/Item/components/Action/Action.d.ts +10 -0
  50. package/es/LmTable/components/Item/components/Action/Action.js +35 -0
  51. package/es/LmTable/components/Item/components/Action/index.d.ts +2 -0
  52. package/es/LmTable/components/Item/components/Action/index.js +1 -0
  53. package/es/LmTable/components/Item/components/Handle/index.d.ts +4 -0
  54. package/es/LmTable/components/Item/components/Handle/index.js +15 -0
  55. package/es/LmTable/components/Item/components/Remove/index.d.ts +2 -0
  56. package/es/LmTable/components/Item/components/Remove/index.js +16 -0
  57. package/es/LmTable/components/Item/components/index.d.ts +3 -0
  58. package/es/LmTable/components/Item/components/index.js +3 -0
  59. package/es/LmTable/components/Item/index.d.ts +2 -0
  60. package/es/LmTable/components/Item/index.js +2 -0
  61. package/es/LmTable/components/{sortableBoxCol.js → SortableBox.js} +0 -0
  62. package/es/LmTable/hooks/useDndItems.d.ts +13 -0
  63. package/es/LmTable/hooks/useDndItems.js +156 -0
  64. package/es/LmTable/multipleContainersKeyboardCoordinates.d.ts +3 -0
  65. package/es/LmTable/multipleContainersKeyboardCoordinates.js +117 -0
  66. package/es/LmTable/style/index.css +1 -2
  67. package/es/LmTable/style/variables.css +1 -2
  68. package/es/LmTable/testDemos/group.js +131 -0
  69. package/es/LmUpload/UploadList/ItemPictureCard.js +2 -9
  70. package/es/LmUpload/UploadList/index.js +3 -6
  71. package/es/LmUpload/fns/index.d.ts +1 -0
  72. package/es/LmUpload/fns/index.js +17 -2
  73. package/es/index.d.ts +1 -0
  74. package/es/styles/variables.css +10 -2
  75. package/lib/LmDrag/LmDrag.d.ts +2 -3
  76. package/lib/LmEditTable/EditTable.d.ts +14 -4
  77. package/lib/LmEditTable/EditTable.js +77 -53
  78. package/lib/LmFilter/components/DropdownFIlter.js +26 -5
  79. package/lib/LmFilter/style/index.css +9 -0
  80. package/lib/LmFilter/style/variables.css +9 -0
  81. package/lib/LmTable/Table.js +132 -125
  82. package/lib/LmTable/common/index.d.ts +10 -0
  83. package/lib/LmTable/common/index.js +48 -0
  84. package/lib/LmTable/components/Container/Container.css +87 -0
  85. package/lib/LmTable/components/Container/Container.d.ts +18 -0
  86. package/lib/LmTable/components/Container/Container.js +62 -0
  87. package/lib/LmTable/components/Container/index.d.ts +2 -0
  88. package/lib/LmTable/components/Container/index.js +13 -0
  89. package/lib/LmTable/components/DndContainer.d.ts +37 -5
  90. package/lib/LmTable/components/DndContainer.js +709 -26
  91. package/lib/LmTable/components/DndContainer.module.css +6 -0
  92. package/lib/LmTable/components/HeaderCol.js +46 -0
  93. package/lib/LmTable/components/Item/Item.css +113 -0
  94. package/lib/LmTable/components/Item/Item.d.ts +37 -0
  95. package/lib/LmTable/components/Item/Item.js +104 -0
  96. package/lib/LmTable/components/Item/components/Action/Action.css +41 -0
  97. package/lib/LmTable/components/Item/components/Action/Action.d.ts +10 -0
  98. package/lib/LmTable/components/Item/components/Action/Action.js +50 -0
  99. package/lib/LmTable/components/Item/components/Action/index.d.ts +2 -0
  100. package/lib/LmTable/components/Item/components/Action/index.js +13 -0
  101. package/lib/LmTable/components/Item/components/Handle/index.d.ts +4 -0
  102. package/lib/LmTable/components/Item/components/Handle/index.js +27 -0
  103. package/lib/LmTable/components/Item/components/Remove/index.d.ts +2 -0
  104. package/lib/LmTable/components/Item/components/Remove/index.js +27 -0
  105. package/lib/LmTable/components/Item/components/index.d.ts +3 -0
  106. package/lib/LmTable/components/Item/components/index.js +31 -0
  107. package/lib/LmTable/components/Item/index.d.ts +2 -0
  108. package/lib/LmTable/components/Item/index.js +33 -0
  109. package/lib/LmTable/components/{sortableBoxCol.js → SortableBox.js} +0 -0
  110. package/lib/LmTable/hooks/useDndItems.d.ts +13 -0
  111. package/lib/LmTable/hooks/useDndItems.js +168 -0
  112. package/lib/LmTable/multipleContainersKeyboardCoordinates.d.ts +3 -0
  113. package/lib/LmTable/multipleContainersKeyboardCoordinates.js +126 -0
  114. package/lib/LmTable/style/index.css +1 -2
  115. package/lib/LmTable/style/variables.css +1 -2
  116. package/lib/LmTable/testDemos/group.js +131 -0
  117. package/lib/LmUpload/UploadList/ItemPictureCard.js +2 -9
  118. package/lib/LmUpload/UploadList/index.js +3 -6
  119. package/lib/LmUpload/fns/index.d.ts +1 -0
  120. package/lib/LmUpload/fns/index.js +17 -2
  121. package/lib/index.d.ts +1 -0
  122. package/lib/styles/variables.css +10 -2
  123. package/package.json +4 -4
  124. package/dist/LmTable/components/sortableItemCol.d.ts +0 -1
  125. package/es/LmTable/components/sortableItemCol.js +0 -56
  126. package/lib/LmTable/components/sortableItemCol.js +0 -56
@@ -9,12 +9,12 @@ Object.defineProperty(exports, "__esModule", {
9
9
  });
10
10
  exports.default = exports.Summary = void 0;
11
11
 
12
+ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
13
+
12
14
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
13
15
 
14
16
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
15
17
 
16
- var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
17
-
18
18
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
19
19
 
20
20
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
@@ -45,14 +45,8 @@ var _Empty = _interopRequireDefault(require("../Empty"));
45
45
 
46
46
  var _DndContainer = _interopRequireDefault(require("./components/DndContainer"));
47
47
 
48
- var _sortableBoxCol = _interopRequireDefault(require("./components/sortableBoxCol"));
49
-
50
- var _sortableItemCol = _interopRequireDefault(require("./components/sortableItemCol"));
51
-
52
48
  var _sheelTableCell = _interopRequireDefault(require("./components/sheelTableCell"));
53
49
 
54
- var _tableChartsModal = _interopRequireDefault(require("./components/tableChartsModal"));
55
-
56
50
  var _customRenderEmpty = _interopRequireDefault(require("./components/customRenderEmpty"));
57
51
 
58
52
  var _util = require("./util");
@@ -63,9 +57,15 @@ var _virTual = require("./virTual");
63
57
 
64
58
  var _useGroupDataSource3 = _interopRequireDefault(require("./hooks/useGroupDataSource"));
65
59
 
66
- var _excluded = ["columns", "dataSource", "autoSize", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "colSortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "openSheet", "editSheet", "dataChange", "groupRowKeys", "groupColKeys", "emptyProps"],
60
+ var _useDndItems2 = _interopRequireDefault(require("./hooks/useDndItems"));
61
+
62
+ var _HeaderCol = _interopRequireDefault(require("./components/HeaderCol"));
63
+
64
+ var _index = require("./common/index");
65
+
66
+ var _excluded = ["columns", "dataSource", "autoSize", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "colSortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "openSheet", "editSheet", "dataChange", "openColGroup", "colGroupTitle", "openRowGroup", "rowGroupTitle", "groupWidth", "emptyProps"],
67
67
  _excluded2 = ["className", "style"],
68
- _excluded3 = ["onResize", "width", "onResizeStop"];
68
+ _excluded3 = ["onResize", "width", "dataIndex", "onResizeStop"];
69
69
  var Summary = _proTable.default.Summary;
70
70
  exports.Summary = Summary;
71
71
  var ConfigContext = _ConfigProvider.default.ConfigContext;
@@ -136,8 +136,11 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
136
136
  _props$editSheet = props.editSheet,
137
137
  editSheet = _props$editSheet === void 0 ? false : _props$editSheet,
138
138
  dataChange = props.dataChange,
139
- groupRowKeys = props.groupRowKeys,
140
- groupColKeys = props.groupColKeys,
139
+ openColGroup = props.openColGroup,
140
+ colGroupTitle = props.colGroupTitle,
141
+ openRowGroup = props.openRowGroup,
142
+ rowGroupTitle = props.rowGroupTitle,
143
+ groupWidth = props.groupWidth,
141
144
  emptyProps = props.emptyProps,
142
145
  resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
143
146
  var _resetProps$rowKey = resetProps.rowKey,
@@ -167,11 +170,6 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
167
170
  setActiveKey = _useState2[1]; // 行选中
168
171
 
169
172
 
170
- var _useState3 = (0, _react.useState)([]),
171
- _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
172
- useColumns = _useState4[0],
173
- setColumns = _useState4[1];
174
-
175
173
  var tableWarpRef = (0, _react.useRef)(null);
176
174
  var dataSourceRef = (0, _react.useRef)(null);
177
175
  var columnsRef = (0, _react.useRef)(null);
@@ -180,17 +178,31 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
180
178
  var contentMenuRef = (0, _react.useRef)(null);
181
179
  /** 当前展开的列 */
182
180
 
183
- var _useState5 = (0, _react.useState)([]),
184
- _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
185
- expandedRowKeys = _useState6[0],
186
- setExpandedRowKeys = _useState6[1];
181
+ var _useState3 = (0, _react.useState)([]),
182
+ _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
183
+ expandedRowKeys = _useState4[0],
184
+ setExpandedRowKeys = _useState4[1];
187
185
 
188
186
  var deepDataSourceRef = (0, _react.useRef)([]);
189
187
  var deepColumnsRef = (0, _react.useRef)([]); //
190
188
 
191
- var copyAllData = (0, _react.useRef)(null);
189
+ var copyAllData = (0, _react.useRef)(null); //
190
+
191
+ var _useDndItems = (0, _useDndItems2.default)({
192
+ columns: customizeColumns,
193
+ openColGroup: openColGroup,
194
+ openRowGroup: openRowGroup,
195
+ colSortOpen: colSortOpen,
196
+ filterChange: filterChange
197
+ }),
198
+ dndColumns = _useDndItems.dndColumns,
199
+ items = _useDndItems.items,
200
+ groupRowKeys = _useDndItems.groupRowKeys,
201
+ groupColKeys = _useDndItems.groupColKeys,
202
+ updateItems = _useDndItems.updateItems;
192
203
  /** 记录最原始数据 */
193
204
 
205
+
194
206
  (0, _react.useEffect)(function () {
195
207
  dataSourceRef.current = customizeDataSource;
196
208
  }, [customizeDataSource]);
@@ -213,12 +225,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
213
225
  if (!(groupColKeys === null || groupColKeys === void 0 ? void 0 : groupColKeys.length)) {
214
226
  return {
215
227
  dataSource: groupDataSource,
216
- columns: customizeColumns
228
+ columns: dndColumns
217
229
  };
218
230
  }
219
231
 
220
- return (0, _util.transformWithColGroup)(customizeColumns, groupDataSource, groupColKeys);
221
- }, [customizeColumns, groupDataSource, groupColKeys]),
232
+ return (0, _util.transformWithColGroup)(dndColumns, groupDataSource, groupColKeys);
233
+ }, [dndColumns, groupDataSource, groupColKeys]),
222
234
  columns = _useMemo.columns,
223
235
  dataSource = _useMemo.dataSource;
224
236
 
@@ -229,7 +241,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
229
241
  }, [groupRowKeys, groupColKeys]);
230
242
  /** sheel数据的表格 */
231
243
 
232
- var _useState7 = (0, _react.useState)({
244
+ var _useState5 = (0, _react.useState)({
233
245
  // 记录框选的行列坐标信息
234
246
  start: {},
235
247
  end: {},
@@ -242,9 +254,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
242
254
  // 记录右下角小方块的拖动信息
243
255
  commiting: {}
244
256
  }),
245
- _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
246
- sheelStataus = _useState8[0],
247
- setSheelStatus = _useState8[1];
257
+ _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
258
+ sheelStataus = _useState6[0],
259
+ setSheelStatus = _useState6[1];
248
260
 
249
261
  var shellStatusRef = (0, _react.useRef)({
250
262
  start: {},
@@ -256,49 +268,45 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
256
268
  commiting: {}
257
269
  });
258
270
 
271
+ var _useState7 = (0, _react.useState)(false),
272
+ _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
273
+ selectIng = _useState8[0],
274
+ setSelectIng = _useState8[1];
275
+
259
276
  var _useState9 = (0, _react.useState)(false),
260
277
  _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
261
- selectIng = _useState10[0],
262
- setSelectIng = _useState10[1];
278
+ editIng = _useState10[0],
279
+ setEditIng = _useState10[1];
263
280
 
264
281
  var _useState11 = (0, _react.useState)(false),
265
282
  _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
266
- editIng = _useState12[0],
267
- setEditIng = _useState12[1];
268
-
269
- var _useState13 = (0, _react.useState)(false),
270
- _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
271
- commitIng = _useState14[0],
272
- setCommitIng = _useState14[1];
283
+ commitIng = _useState12[0],
284
+ setCommitIng = _useState12[1];
273
285
  /** 右键菜单是否显示 */
274
286
 
275
287
 
276
- var _useState15 = (0, _react.useState)(false),
277
- _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
278
- contextMenuStatus = _useState16[0],
279
- setContextMenuStatus = _useState16[1];
288
+ var _useState13 = (0, _react.useState)(false),
289
+ _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
290
+ contextMenuStatus = _useState14[0],
291
+ setContextMenuStatus = _useState14[1];
280
292
  /** 右键按钮的位置 */
281
293
 
282
294
 
283
- var _useState17 = (0, _react.useState)({
295
+ var _useState15 = (0, _react.useState)({
284
296
  position: 'fixed',
285
297
  left: 300,
286
298
  top: 200
287
299
  }),
288
- _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
289
- style = _useState18[0],
290
- setStyle = _useState18[1];
291
-
292
- var _useState19 = (0, _react.useState)(null),
293
- _useState20 = (0, _slicedToArray2.default)(_useState19, 2),
294
- chartsModalStatus = _useState20[0],
295
- setChartsModalStatus = _useState20[1]; // 列设置
300
+ _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
301
+ style = _useState16[0],
302
+ setStyle = _useState16[1]; // const [chartsModalStatus, setChartsModalStatus] = useState(null)
303
+ // 列设置
296
304
 
297
305
 
298
- var _useState21 = (0, _react.useState)(false),
299
- _useState22 = (0, _slicedToArray2.default)(_useState21, 2),
300
- columnsStateMap = _useState22[0],
301
- setColumnsStateMap = _useState22[1];
306
+ var _useState17 = (0, _react.useState)(false),
307
+ _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
308
+ columnsStateMap = _useState18[0],
309
+ setColumnsStateMap = _useState18[1];
302
310
 
303
311
  var SortableItem = (0, _reactSortableHoc.SortableElement)(function (props) {
304
312
  return /*#__PURE__*/_react.default.createElement("tr", props);
@@ -341,6 +349,15 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
341
349
  deepColumnsRef.current = source;
342
350
  }, [columns, groupColKeys]);
343
351
 
352
+ var _useState19 = (0, _react.useState)(columns),
353
+ _useState20 = (0, _slicedToArray2.default)(_useState19, 2),
354
+ useColumns = _useState20[0],
355
+ setColumns = _useState20[1];
356
+
357
+ (0, _react.useEffect)(function () {
358
+ setColumns(columns);
359
+ }, [columns]);
360
+
344
361
  var onSortEnd = function onSortEnd(_ref) {
345
362
  var oldIndex = _ref.oldIndex,
346
363
  newIndex = _ref.newIndex;
@@ -354,20 +371,6 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
354
371
  }
355
372
  };
356
373
 
357
- var onColSortEnd = function onColSortEnd(active, over) {
358
- var oldIndex = columns.findIndex(function (item) {
359
- return item.dataIndex === active;
360
- });
361
- var newIndex = columns.findIndex(function (item) {
362
- return item.dataIndex === over;
363
- });
364
- filterChange === null || filterChange === void 0 ? void 0 : filterChange((0, _sortable.arrayMove)(columns, oldIndex, newIndex).map(function (item, index) {
365
- return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
366
- order: index
367
- });
368
- }));
369
- };
370
-
371
374
  var DraggableContainer = function DraggableContainer(props) {
372
375
  return /*#__PURE__*/_react.default.createElement(SortContainer, (0, _extends2.default)({
373
376
  useDragHandle: true,
@@ -1018,10 +1021,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1018
1021
  col.onHeaderCell = function (column) {
1019
1022
  return resizeable ? {
1020
1023
  width: column.width,
1024
+ dataIndex: column.dataIndex,
1021
1025
  onResize: handleResize(index),
1022
1026
  onResizeStop: endResize
1023
1027
  } : {
1024
- width: column.width
1028
+ width: column.width,
1029
+ dataIndex: column.dataIndex
1025
1030
  };
1026
1031
  };
1027
1032
 
@@ -1063,15 +1068,13 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1063
1068
  title: '分组',
1064
1069
  dataIndex: '_group',
1065
1070
  key: '_group',
1066
- width: 100
1071
+ width: groupWidth || 100,
1072
+ fixed: true
1067
1073
  }].concat((0, _toConsumableArray2.default)(innerColumns));
1068
1074
  }
1069
1075
 
1070
1076
  return sortOpen ? [sortDefaultColumnItem].concat((0, _toConsumableArray2.default)(innerColumns)) : innerColumns;
1071
- }, [useColumns, sortOpen, selectIng, dataSource, groupRowKeys, commitIng]);
1072
- (0, _react.useEffect)(function () {
1073
- setColumns(columns);
1074
- }, [columns]); // 行点击事件
1077
+ }, [useColumns, sortOpen, selectIng, dataSource, groupRowKeys, commitIng]); // 行点击事件
1075
1078
 
1076
1079
  var onRecord = function onRecord(record) {
1077
1080
  var _Object$assign = Object.assign(_resetConfig.default.checkConfig, checkConfig),
@@ -1257,12 +1260,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1257
1260
  return (0, _lodash.omit)(item, ['render', 'sorter', 'onFilter', 'filters']);
1258
1261
  })
1259
1262
  };
1260
- }); // loading触发清空选中状态
1261
- // useEffect(() => {
1262
- // console.log(3)
1263
- // setSelectedRows({ selectedRows: [] })
1264
- // }, [loading])
1265
-
1263
+ });
1266
1264
 
1267
1265
  var onTableChange = function onTableChange(pagination, filters, sorter, extra) {
1268
1266
  var resultColumns = useColumns.map(function (item) {
@@ -1296,6 +1294,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1296
1294
  var _props$onResize = props.onResize,
1297
1295
  onResize = _props$onResize === void 0 ? function () {} : _props$onResize,
1298
1296
  width = props.width,
1297
+ dataIndex = props.dataIndex,
1299
1298
  onResizeStop = props.onResizeStop,
1300
1299
  restProps = (0, _objectWithoutProperties2.default)(props, _excluded3);
1301
1300
 
@@ -1303,6 +1302,14 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1303
1302
  return /*#__PURE__*/_react.default.createElement("th", restProps);
1304
1303
  }
1305
1304
 
1305
+ var column = (0, _index.treeFind)(columnsRef.current, function (node) {
1306
+ return node.dataIndex === dataIndex;
1307
+ });
1308
+
1309
+ if (!column) {
1310
+ return /*#__PURE__*/_react.default.createElement("th", restProps);
1311
+ }
1312
+
1306
1313
  return /*#__PURE__*/_react.default.createElement(_reactResizable.Resizable, {
1307
1314
  width: width,
1308
1315
  height: 0,
@@ -1317,23 +1324,17 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1317
1324
  draggableOpts: {
1318
1325
  enableUserSelectHack: false
1319
1326
  }
1320
- }, /*#__PURE__*/_react.default.createElement("th", restProps));
1327
+ }, /*#__PURE__*/_react.default.createElement("th", restProps, /*#__PURE__*/_react.default.createElement(_HeaderCol.default, {
1328
+ column: column
1329
+ })));
1321
1330
  };
1322
1331
 
1323
1332
  var colDraggableContainer = (0, _react.useCallback)(function (_ref4) {
1324
1333
  var props = (0, _extends2.default)({}, _ref4);
1325
- return /*#__PURE__*/_react.default.createElement("tr", null, _react.default.Children.map(props.children, function (child) {
1326
- var _child$props, _child$props$column;
1334
+ var children = props.children;
1335
+ return /*#__PURE__*/_react.default.createElement("tr", null, children);
1336
+ }, [columns]); // 重写表格
1327
1337
 
1328
- if (child === null || child === void 0 ? void 0 : (_child$props = child.props) === null || _child$props === void 0 ? void 0 : (_child$props$column = _child$props.column) === null || _child$props$column === void 0 ? void 0 : _child$props$column.fixed) {
1329
- return child;
1330
- }
1331
-
1332
- return /*#__PURE__*/_react.default.createElement(_sortableItemCol.default, {
1333
- id: child.key
1334
- }, child);
1335
- }));
1336
- }, [columns]);
1337
1338
  var tableComponents = (0, _react.useMemo)(function () {
1338
1339
  var _ref5 = components || {},
1339
1340
  _ref5$body = _ref5.body,
@@ -1341,14 +1342,23 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1341
1342
  _ref5$header = _ref5.header,
1342
1343
  header = _ref5$header === void 0 ? {} : _ref5$header;
1343
1344
 
1345
+ var headerRow = null;
1346
+
1347
+ if (openRowGroup || openColGroup) {
1348
+ headerRow = colDraggableContainer;
1349
+ }
1350
+
1351
+ var headerCell = null;
1352
+
1353
+ if (openRowGroup || openColGroup || resizeable) {
1354
+ headerCell = ResizableTitle;
1355
+ }
1356
+
1344
1357
  return {
1345
- // table: (record) => {
1346
- // return <div style={record.style}>{record.children}</div>
1347
- // }
1348
1358
  table: virtual ? _virTual.VirtualTable : null,
1349
1359
  header: (0, _objectSpread2.default)({
1350
- row: colSortOpen ? colDraggableContainer : null,
1351
- cell: resizeable ? ResizableTitle : null
1360
+ row: headerRow,
1361
+ cell: headerCell
1352
1362
  }, header),
1353
1363
  body: (0, _objectSpread2.default)((0, _objectSpread2.default)({
1354
1364
  wrapper: sortOpen ? DraggableContainer : virtual ? _virTual.VirtualWrapper : null,
@@ -1371,12 +1381,11 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1371
1381
  } : emptyProps ? function () {
1372
1382
  return /*#__PURE__*/_react.default.createElement(_Empty.default, emptyProps, (emptyProps === null || emptyProps === void 0 ? void 0 : emptyProps.footer) || null);
1373
1383
  } : _customRenderEmpty.default
1374
- }, colSortOpen ? /*#__PURE__*/_react.default.createElement(_DndContainer.default, {
1375
- move: onColSortEnd
1376
- }, /*#__PURE__*/_react.default.createElement(_sortableBoxCol.default, {
1377
- items: columns.reduce(function (acc, item) {
1378
- return [].concat((0, _toConsumableArray2.default)(acc), [item.dataIndex]);
1379
- }, [])
1384
+ }, openRowGroup || openColGroup || colSortOpen ? /*#__PURE__*/_react.default.createElement(_DndContainer.default, {
1385
+ items: items,
1386
+ updateItems: updateItems,
1387
+ rowGroupTitle: rowGroupTitle,
1388
+ colGroupTitle: colGroupTitle
1380
1389
  }, /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
1381
1390
  loading: loading,
1382
1391
  dataSource: dataSource,
@@ -1403,7 +1412,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1403
1412
  summary: function summary(pageData) {
1404
1413
  return _summary && _summary(pageData, resultColumns);
1405
1414
  }
1406
- })))) : /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
1415
+ }))) : /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
1407
1416
  loading: loading,
1408
1417
  dataSource: dataSource,
1409
1418
  components: tableComponents,
@@ -1441,35 +1450,24 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1441
1450
  }, "\u590D\u5236"), /*#__PURE__*/_react.default.createElement("div", {
1442
1451
  className: "rightClickItems",
1443
1452
  onClick: handleCopyAll
1444
- }, "\u590D\u5236\u5168\u90E8")), chartsModalStatus && /*#__PURE__*/_react.default.createElement(_tableChartsModal.default, {
1445
- type: chartsModalStatus,
1446
- onCancel: function onCancel() {
1447
- return setChartsModalStatus(false);
1448
- },
1449
- onOk: function onOk() {
1450
- return setChartsModalStatus(false);
1451
- },
1452
- data: dataSource,
1453
- deepDataSource: deepDataSourceRef.current,
1454
- rowKey: rowKey,
1455
- columns: columns,
1456
- selectInfo: (0, _lodash.pick)(shellStatusRef.current, ['start', 'end'])
1457
- }));
1453
+ }, "\u590D\u5236\u5168\u90E8")));
1458
1454
  }); // 监听大小: 这里的高度是整个表格的高度,表体需要减去列头和分页的高度
1459
1455
 
1460
1456
  /** 1: 使用scroll.x y 来控制宽高 默认都是100% */
1461
1457
 
1462
1458
  var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1463
1459
  var _props$autoSizer = props.autoSizer,
1464
- autoSizer = _props$autoSizer === void 0 ? false : _props$autoSizer;
1460
+ autoSizer = _props$autoSizer === void 0 ? false : _props$autoSizer,
1461
+ openRowGroup = props.openRowGroup,
1462
+ openColGroup = props.openColGroup;
1465
1463
 
1466
- var _useState23 = (0, _react.useState)({
1464
+ var _useState21 = (0, _react.useState)({
1467
1465
  width: '100%',
1468
1466
  height: '100%'
1469
1467
  }),
1470
- _useState24 = (0, _slicedToArray2.default)(_useState23, 2),
1471
- tableSize = _useState24[0],
1472
- setTableSize = _useState24[1];
1468
+ _useState22 = (0, _slicedToArray2.default)(_useState21, 2),
1469
+ tableSize = _useState22[0],
1470
+ setTableSize = _useState22[1];
1473
1471
 
1474
1472
  var defaultRef = ref || (0, _react.useRef)(null);
1475
1473
  var tableWarpRef = (0, _react.useRef)(null);
@@ -1494,7 +1492,12 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1494
1492
  }
1495
1493
 
1496
1494
  var resetHeight = (0, _react.useMemo)(function () {
1497
- var height = tableSize.height; // 头部高度
1495
+ var height = tableSize.height;
1496
+
1497
+ if (typeof height === 'string') {
1498
+ return height;
1499
+ } // 头部高度
1500
+
1498
1501
 
1499
1502
  var h = height - (props.size === 'middle' ? 47 : 40);
1500
1503
 
@@ -1508,6 +1511,10 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1508
1511
  h -= 32;
1509
1512
  }
1510
1513
 
1514
+ if (openRowGroup || openColGroup) {
1515
+ h -= 100;
1516
+ }
1517
+
1511
1518
  return h;
1512
1519
  }, [props.hiddenPage, props.customCheck, props.columns, tableSize]);
1513
1520
  var throttleSize = (0, _react.useCallback)(function () {
@@ -0,0 +1,10 @@
1
+ /**
2
+ * 查找单极树节点
3
+ * @param tree
4
+ * @param func
5
+ * @param options
6
+ * @returns
7
+ */
8
+ export declare const treeFind: (tree: any[] | Object, func: (node: any) => boolean, options?: any) => any;
9
+ declare const _default: {};
10
+ export default _default;
@@ -0,0 +1,38 @@
1
+ /**
2
+ * 查找单极树节点
3
+ * @param tree
4
+ * @param func
5
+ * @param options
6
+ * @returns
7
+ */
8
+ export var treeFind = function treeFind(tree, func) {
9
+ var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
10
+ var _options$children = options.children,
11
+ children = _options$children === void 0 ? 'children' : _options$children;
12
+ var list = [];
13
+
14
+ if (Array.isArray(tree)) {
15
+ list = tree;
16
+ } else if (Object.prototype.toString.call(tree) === '[object Object]') {
17
+ list.push(tree);
18
+ }
19
+
20
+ for (var i = 0; i < list.length; i += 1) {
21
+ var data = list[i];
22
+
23
+ if (func(data)) {
24
+ return data;
25
+ }
26
+
27
+ if (data["".concat(children)]) {
28
+ var res = treeFind(data["".concat(children)], func, options);
29
+
30
+ if (res) {
31
+ return res;
32
+ }
33
+ }
34
+ }
35
+
36
+ return null;
37
+ };
38
+ export default {};
@@ -0,0 +1,87 @@
1
+ .dnd_container {
2
+ display: flex;
3
+ flex-direction: column;
4
+ grid-auto-rows: max-content;
5
+ overflow: hidden;
6
+ box-sizing: border-box;
7
+ appearance: none;
8
+ outline: none;
9
+ flex: 1;
10
+ border-radius: 5px;
11
+ margin-bottom: 10px;
12
+ margin-right: 10px;
13
+ transition: background-color 350ms ease;
14
+ background-color: #fff;
15
+ border: 1px solid rgba(0, 0, 0, 0.05);
16
+ font-size: 1em;
17
+ }
18
+ .dnd_container:last-child {
19
+ margin-right: 0;
20
+ }
21
+ .dnd_container ul {
22
+ display: flex;
23
+ flex-wrap: wrap;
24
+ list-style: none;
25
+ padding: 10px;
26
+ margin: 0;
27
+ min-height: 40px;
28
+ }
29
+ .dnd_container.scrollable ul {
30
+ overflow-y: auto;
31
+ }
32
+ .dnd_container.placeholder {
33
+ justify-content: center;
34
+ align-items: center;
35
+ cursor: pointer;
36
+ color: rgba(0, 0, 0, 0.5);
37
+ background-color: transparent;
38
+ border-style: dashed;
39
+ border-color: rgba(0, 0, 0, 0.08);
40
+ }
41
+ .dnd_container.placeholder:hover {
42
+ border-color: rgba(0, 0, 0, 0.15);
43
+ }
44
+ .dnd_container.hover {
45
+ background-color: #ebebeb;
46
+ }
47
+ .dnd_container.unstyled {
48
+ overflow: visible;
49
+ background-color: transparent !important;
50
+ border: none !important;
51
+ }
52
+ .dnd_container.horizontal {
53
+ width: 100%;
54
+ }
55
+ .dnd_container.horizontal ul {
56
+ grid-auto-flow: column;
57
+ }
58
+ .dnd_container.shadow {
59
+ box-shadow: 0 1px 10px 0 rgba(34, 33, 81, 0.1);
60
+ }
61
+ .dnd_container:focus-visible {
62
+ border-color: transparent;
63
+ box-shadow: 0 0 0 2px rgba(255, 255, 255, 0), 0 0px 0px 2px #4c9ffe;
64
+ }
65
+ .dnd_header {
66
+ display: flex;
67
+ padding: 5px 20px;
68
+ padding-right: 8px;
69
+ align-items: center;
70
+ justify-content: space-between;
71
+ background-color: #fff;
72
+ border-top-left-radius: 5px;
73
+ border-top-right-radius: 5px;
74
+ border-bottom: 1px solid rgba(0, 0, 0, 0.08);
75
+ }
76
+ .dnd_header:hover .Actions > * {
77
+ opacity: 1 !important;
78
+ }
79
+ .dnd_actions {
80
+ display: flex;
81
+ }
82
+ .dnd_actions > *:first-child:not(:last-child) {
83
+ opacity: 0;
84
+ }
85
+ .dnd_actions > *:first-child:not(:last-child):focus-visible {
86
+ opacity: 1;
87
+ }
@@ -0,0 +1,18 @@
1
+ import React from 'react';
2
+ import './Container.less';
3
+ export interface Props {
4
+ children: React.ReactNode;
5
+ columns?: number;
6
+ label?: string;
7
+ style?: React.CSSProperties;
8
+ horizontal?: boolean;
9
+ hover?: boolean;
10
+ handleProps?: React.HTMLAttributes<any>;
11
+ scrollable?: boolean;
12
+ shadow?: boolean;
13
+ placeholder?: boolean;
14
+ unstyled?: boolean;
15
+ onClick?: (e: any) => void;
16
+ onRemove?: (e: any) => void;
17
+ }
18
+ export declare const Container: React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLDivElement>>;
@@ -0,0 +1,48 @@
1
+ var __rest = this && this.__rest || function (s, e) {
2
+ var t = {};
3
+
4
+ for (var p in s) {
5
+ if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
6
+ }
7
+
8
+ if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
9
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
10
+ }
11
+ return t;
12
+ };
13
+
14
+ import React, { forwardRef } from 'react';
15
+ import classNames from 'classnames'; // import {Handle, Remove} from '../Item';
16
+
17
+ import "./Container.css";
18
+ export var Container = /*#__PURE__*/forwardRef(function (_a, ref) {
19
+ var children = _a.children,
20
+ _a$columns = _a.columns,
21
+ columns = _a$columns === void 0 ? 1 : _a$columns,
22
+ handleProps = _a.handleProps,
23
+ horizontal = _a.horizontal,
24
+ hover = _a.hover,
25
+ onClick = _a.onClick,
26
+ onRemove = _a.onRemove,
27
+ label = _a.label,
28
+ placeholder = _a.placeholder,
29
+ style = _a.style,
30
+ scrollable = _a.scrollable,
31
+ shadow = _a.shadow,
32
+ unstyled = _a.unstyled,
33
+ props = __rest(_a, ["children", "columns", "handleProps", "horizontal", "hover", "onClick", "onRemove", "label", "placeholder", "style", "scrollable", "shadow", "unstyled"]);
34
+
35
+ return /*#__PURE__*/React.createElement("div", Object.assign({}, props, {
36
+ ref: ref,
37
+ style: Object.assign(Object.assign({}, style), {
38
+ '--columns': columns
39
+ }),
40
+ className: classNames('dnd_container', unstyled && 'unstyled', horizontal && 'horizontal', hover && 'hover', placeholder && 'placeholder', scrollable && 'scrollable', shadow && 'shadow'),
41
+ onClick: onClick,
42
+ tabIndex: onClick ? 0 : undefined
43
+ }), label ? /*#__PURE__*/React.createElement("div", {
44
+ className: 'dnd_header'
45
+ }, label, /*#__PURE__*/React.createElement("div", {
46
+ className: 'dnd_actions'
47
+ })) : null, placeholder ? children : /*#__PURE__*/React.createElement("ul", null, children));
48
+ });