linkmore-design 1.0.84 → 1.0.87

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 (121) hide show
  1. package/dist/ConfigProvider/demos/componentSize.d.ts +2 -0
  2. package/dist/ConfigProvider/demos/style.d.ts +2 -0
  3. package/dist/ConfigProvider/index.d.ts +2 -2
  4. package/dist/Form/demos/responsive.d.ts +1 -0
  5. package/dist/Form/demos/responsiveAll.d.ts +3 -0
  6. package/dist/Form/util.d.ts +1 -0
  7. package/dist/ImageViewer/fns/index.d.ts +1 -0
  8. package/dist/Input/index.d.ts +1 -1
  9. package/dist/InputRange/demos/basic.d.ts +2 -0
  10. package/dist/InputRange/index.d.ts +8 -0
  11. package/dist/InputRange/style/index.d.ts +1 -0
  12. package/dist/LmEditTable/EditTable.d.ts +2 -0
  13. package/dist/LmTable/util.d.ts +7 -0
  14. package/dist/LmTable/virTual/VirtualTable.d.ts +2 -2
  15. package/dist/LmUpload/LmUpload.d.ts +1 -0
  16. package/dist/LmUpload/demos/formCard.d.ts +2 -0
  17. package/dist/LmUpload/fns/index.d.ts +1 -0
  18. package/dist/LmUpload/utils.d.ts +1 -0
  19. package/dist/LmUpload/wrapper/UploadWrapper.d.ts +4 -3
  20. package/dist/index.d.ts +3 -0
  21. package/dist/index.umd.js +483 -218
  22. package/dist/index.umd.min.js +5 -5
  23. package/es/Button/index.js +4 -2
  24. package/es/ConfigProvider/cssVariables.js +1 -1
  25. package/es/ConfigProvider/index.d.ts +2 -2
  26. package/es/ConfigProvider/index.js +2 -1
  27. package/es/DatePicker/generatePicker/generateSinglePicker.js +3 -3
  28. package/es/Form/container.js +2 -16
  29. package/es/Form/style/index.css +8 -2
  30. package/es/Form/util.d.ts +1 -0
  31. package/es/Form/util.js +22 -0
  32. package/es/ImageViewer/components/Carousel.js +20 -2
  33. package/es/ImageViewer/components/Thumb.js +24 -5
  34. package/es/ImageViewer/fns/index.d.ts +1 -0
  35. package/es/ImageViewer/fns/index.js +19 -2
  36. package/es/ImageViewer/style/index.css +26 -15
  37. package/es/Input/index.d.ts +1 -1
  38. package/es/Input/index.js +6 -2
  39. package/es/Input/style/index.css +9 -0
  40. package/es/InputRange/index.d.ts +8 -0
  41. package/es/InputRange/index.js +67 -0
  42. package/es/InputRange/style/index.css +511 -0
  43. package/es/InputRange/style/index.d.ts +1 -0
  44. package/es/InputRange/style/index.js +1 -0
  45. package/es/LmEditTable/EditTable.d.ts +2 -0
  46. package/es/LmEditTable/EditTable.js +19 -5
  47. package/es/LmFilter/style/index.css +159 -0
  48. package/es/LmTable/Table.js +50 -64
  49. package/es/LmTable/components/sheelTableCell.js +2 -2
  50. package/es/LmTable/style/index.css +1 -0
  51. package/es/LmTable/util.js +73 -16
  52. package/es/LmTable/virTual/VirtualTable.d.ts +2 -2
  53. package/es/LmTable/virTual/VirtualTable.js +6 -4
  54. package/es/LmUpload/LmUpload.d.ts +1 -0
  55. package/es/LmUpload/LmUpload.js +46 -26
  56. package/es/LmUpload/UploadList/ItemPicture.js +5 -4
  57. package/es/LmUpload/UploadList/ItemPictureCard.js +26 -12
  58. package/es/LmUpload/UploadList/ItemText.js +4 -3
  59. package/es/LmUpload/body/UploadCore.js +1 -1
  60. package/es/LmUpload/fns/index.d.ts +1 -0
  61. package/es/LmUpload/fns/index.js +91 -46
  62. package/es/LmUpload/style/index.css +42 -35
  63. package/es/LmUpload/utils.d.ts +1 -0
  64. package/es/LmUpload/utils.js +12 -0
  65. package/es/LmUpload/wrapper/UploadRoot.js +7 -13
  66. package/es/LmUpload/wrapper/UploadWrapper.d.ts +4 -3
  67. package/es/LmUpload/wrapper/UploadWrapper.js +1 -1
  68. package/es/Select/index.js +3 -2
  69. package/es/Tabs/index.js +3 -2
  70. package/es/index.d.ts +3 -0
  71. package/es/index.js +2 -1
  72. package/lib/Button/index.js +5 -2
  73. package/lib/ConfigProvider/cssVariables.js +1 -1
  74. package/lib/ConfigProvider/index.d.ts +2 -2
  75. package/lib/ConfigProvider/index.js +2 -1
  76. package/lib/DatePicker/generatePicker/generateSinglePicker.js +7 -7
  77. package/lib/Form/container.js +3 -16
  78. package/lib/Form/style/index.css +8 -2
  79. package/lib/Form/util.d.ts +1 -0
  80. package/lib/Form/util.js +24 -0
  81. package/lib/ImageViewer/components/Carousel.js +20 -2
  82. package/lib/ImageViewer/components/Thumb.js +25 -5
  83. package/lib/ImageViewer/fns/index.d.ts +1 -0
  84. package/lib/ImageViewer/fns/index.js +18 -1
  85. package/lib/ImageViewer/style/index.css +26 -15
  86. package/lib/Input/index.d.ts +1 -1
  87. package/lib/Input/index.js +7 -2
  88. package/lib/Input/style/index.css +9 -0
  89. package/lib/InputRange/index.d.ts +8 -0
  90. package/lib/InputRange/index.js +79 -0
  91. package/lib/InputRange/style/index.css +511 -0
  92. package/lib/InputRange/style/index.d.ts +1 -0
  93. package/lib/InputRange/style/index.js +3 -0
  94. package/lib/LmEditTable/EditTable.d.ts +2 -0
  95. package/lib/LmEditTable/EditTable.js +19 -4
  96. package/lib/LmFilter/style/index.css +159 -0
  97. package/lib/LmTable/Table.js +50 -64
  98. package/lib/LmTable/components/sheelTableCell.js +2 -2
  99. package/lib/LmTable/style/index.css +1 -0
  100. package/lib/LmTable/util.js +73 -16
  101. package/lib/LmTable/virTual/VirtualTable.d.ts +2 -2
  102. package/lib/LmTable/virTual/VirtualTable.js +6 -4
  103. package/lib/LmUpload/LmUpload.d.ts +1 -0
  104. package/lib/LmUpload/LmUpload.js +46 -26
  105. package/lib/LmUpload/UploadList/ItemPicture.js +5 -4
  106. package/lib/LmUpload/UploadList/ItemPictureCard.js +26 -12
  107. package/lib/LmUpload/UploadList/ItemText.js +4 -3
  108. package/lib/LmUpload/body/UploadCore.js +1 -1
  109. package/lib/LmUpload/fns/index.d.ts +1 -0
  110. package/lib/LmUpload/fns/index.js +89 -45
  111. package/lib/LmUpload/style/index.css +42 -35
  112. package/lib/LmUpload/utils.d.ts +1 -0
  113. package/lib/LmUpload/utils.js +17 -1
  114. package/lib/LmUpload/wrapper/UploadRoot.js +7 -13
  115. package/lib/LmUpload/wrapper/UploadWrapper.d.ts +4 -3
  116. package/lib/LmUpload/wrapper/UploadWrapper.js +2 -1
  117. package/lib/Select/index.js +4 -2
  118. package/lib/Tabs/index.js +4 -2
  119. package/lib/index.d.ts +3 -0
  120. package/lib/index.js +9 -1
  121. package/package.json +1 -1
@@ -258,6 +258,165 @@
258
258
  .ant-dropdown .filter_dropdown .ant-checkbox-wrapper .ant-checkbox {
259
259
  top: initial;
260
260
  }
261
+ .ant-drawer .ant-drawer-header .ant-drawer-title {
262
+ font-size: 14px;
263
+ }
264
+ .ant-drawer.lm_filter_drawer .filter_drawer_group {
265
+ font-size: 12px;
266
+ line-height: 1;
267
+ }
268
+ .ant-drawer.lm_filter_drawer .filter_drawer_group .ant-form-item {
269
+ margin-bottom: 16px;
270
+ }
271
+ .ant-drawer.lm_filter_drawer .filter_drawer_group .ant-form-item-label {
272
+ padding-bottom: 0;
273
+ }
274
+ .ant-drawer.lm_filter_drawer .filter_drawer_group .ant-form-item-label label {
275
+ font-size: 12px;
276
+ }
277
+ .ant-drawer.lm_filter_drawer .filter_drawer_group input {
278
+ font-size: 12px;
279
+ }
280
+ .ant-drawer.lm_filter_drawer .filter_drawer_group .ant-radio-wrapper {
281
+ display: inline-flex;
282
+ align-items: center;
283
+ font-size: 12px;
284
+ }
285
+ .ant-drawer.lm_filter_drawer .filter_drawer_group .ant-radio-wrapper .ant-radio {
286
+ top: 0;
287
+ }
288
+ .ant-drawer.lm_filter_drawer .filter_drawer_group_add {
289
+ padding: 0 0 8px;
290
+ }
291
+ .ant-drawer.lm_filter_drawer .filter_drawer_group_add .ant-btn {
292
+ font-size: 12px;
293
+ max-width: initial;
294
+ }
295
+ .ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item {
296
+ margin-bottom: var(--gap);
297
+ }
298
+ .ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box {
299
+ line-height: 1;
300
+ border: 1px solid transparent;
301
+ border-radius: 2px;
302
+ background: var(--background-color);
303
+ padding: calc(var(--gap) * 2);
304
+ cursor: pointer;
305
+ transition: 0.3s;
306
+ }
307
+ .ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_header {
308
+ display: flex;
309
+ align-items: center;
310
+ justify-content: space-between;
311
+ }
312
+ .ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_header .item_header_title {
313
+ font-size: 12px;
314
+ font-weight: 500;
315
+ }
316
+ .ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_header .item_header_icon {
317
+ font-size: 16px;
318
+ color: #8C8C8C;
319
+ transition: 0.3s;
320
+ }
321
+ .ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_header .item_header_icon.icon_plus {
322
+ color: var(--font-color);
323
+ }
324
+ .ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_header .item_header_icon:hover {
325
+ color: var(--font-color);
326
+ }
327
+ .ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_tags {
328
+ display: flex;
329
+ flex-flow: wrap;
330
+ gap: var(--gap);
331
+ padding-top: 12px;
332
+ }
333
+ .ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_tags .ant-tag {
334
+ color: var(--font-color);
335
+ background-color: var(--background-color);
336
+ margin: 0;
337
+ }
338
+ .ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_tags .ant-tag.add_tags {
339
+ background: transparent;
340
+ border-style: dashed;
341
+ cursor: pointer;
342
+ }
343
+ .ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_tags .ant-tag.add_tags:hover {
344
+ color: var(--primary-color);
345
+ border-color: var(--primary-color);
346
+ }
347
+ .ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_tags .tag-input {
348
+ width: 78px;
349
+ margin-right: 8px;
350
+ vertical-align: top;
351
+ }
352
+ .ant-drawer.lm_filter_drawer .complex_filter_body .checked_group {
353
+ margin-bottom: 24px;
354
+ }
355
+ .ant-drawer.lm_filter_drawer .complex_filter_body .list_group .list_group_title {
356
+ font-size: 14px;
357
+ font-weight: 500;
358
+ line-height: 1.25;
359
+ }
360
+ .ant-drawer.lm_filter_drawer .complex_filter_body .list_group .list_group_search {
361
+ margin: 16px 0;
362
+ }
363
+ .ant-drawer.lm_det_drawer .checkbox_tag {
364
+ display: inline-flex;
365
+ align-items: center;
366
+ justify-content: center;
367
+ font-size: 12px;
368
+ height: 24px;
369
+ border-radius: 2px;
370
+ color: var(--font-color);
371
+ background-color: var(--stripe-color);
372
+ padding: 0 8px;
373
+ transition: 0.3s;
374
+ cursor: pointer;
375
+ }
376
+ .ant-drawer.lm_det_drawer .checkbox_tag:hover,
377
+ .ant-drawer.lm_det_drawer .checkbox_tag.active {
378
+ color: #fff;
379
+ background-color: var(--primary-color);
380
+ }
381
+ .ant-drawer.lm_det_drawer .ant-form-item {
382
+ margin-bottom: 16px;
383
+ }
384
+ .ant-drawer.lm_det_drawer .ant-form-item .ant-form-item-label > label {
385
+ font-weight: 500;
386
+ }
387
+ .ant-drawer.lm_det_drawer .auto_height {
388
+ max-height: 418px;
389
+ overflow-y: auto;
390
+ }
391
+ .ant-drawer.lm_det_drawer .ant-radio-wrapper {
392
+ display: inline-flex;
393
+ align-items: center;
394
+ font-size: 12px;
395
+ }
396
+ .ant-drawer.lm_det_drawer .ant-radio-wrapper .ant-radio {
397
+ top: 0;
398
+ }
399
+ .ant-drawer.lm_det_drawer .ant-select {
400
+ font-size: 12px;
401
+ width: 100%;
402
+ }
403
+ .ant-drawer.lm_det_drawer .custom_form {
404
+ display: flex;
405
+ flex-flow: column;
406
+ height: 100%;
407
+ gap: 24px;
408
+ }
409
+ .ant-drawer.lm_det_drawer .custom_form .custom_label {
410
+ font-size: 14px;
411
+ font-weight: 500;
412
+ margin-bottom: 16px;
413
+ color: var(--font-color);
414
+ }
415
+ .ant-drawer.lm_det_drawer .custom_form .custom_full {
416
+ display: flex;
417
+ flex-flow: column;
418
+ flex: 1;
419
+ }
261
420
  .lm_filter_dropdown_picker {
262
421
  padding: 0 !important;
263
422
  }
@@ -13,12 +13,12 @@ require("antd/es/config-provider/style");
13
13
 
14
14
  var _configProvider = _interopRequireDefault(require("antd/es/config-provider"));
15
15
 
16
+ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
17
+
16
18
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
17
19
 
18
20
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
19
21
 
20
- var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
21
-
22
22
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
23
23
 
24
24
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -29,10 +29,6 @@ var _sortable = require("@dnd-kit/sortable");
29
29
 
30
30
  var _classnames = _interopRequireDefault(require("classnames"));
31
31
 
32
- var _Empty = _interopRequireDefault(require("../Empty"));
33
-
34
- var _IconFont = _interopRequireDefault(require("../IconFont"));
35
-
36
32
  var _lodash = require("lodash");
37
33
 
38
34
  var _react = _interopRequireWildcard(require("react"));
@@ -43,7 +39,9 @@ var _immer = require("immer");
43
39
 
44
40
  var _reactSortableHoc = require("react-sortable-hoc");
45
41
 
46
- var _hooks = require("../hooks");
42
+ var _IconFont = _interopRequireDefault(require("../IconFont"));
43
+
44
+ var _Empty = _interopRequireDefault(require("../Empty"));
47
45
 
48
46
  var _DndContainer = _interopRequireDefault(require("./components/DndContainer"));
49
47
 
@@ -113,8 +111,8 @@ var sortDefaultColumnItem = {
113
111
  }
114
112
  };
115
113
  var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
116
- var columns = props.columns,
117
- dataSource = props.dataSource,
114
+ var customizeColumns = props.columns,
115
+ customizeDataSource = props.dataSource,
118
116
  autoSize = props.autoSize,
119
117
  rowClick = props.rowClick,
120
118
  _onDoubleClick = props.onDoubleClick,
@@ -185,6 +183,30 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
185
183
  setExpandedRowKeys = _useState8[1];
186
184
 
187
185
  var deepDataSourceRef = (0, _react.useRef)([]);
186
+ /** 行分组 */
187
+
188
+ var groupDataSource = (0, _react.useMemo)(function () {
189
+ if (!(groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length)) {
190
+ return customizeDataSource;
191
+ }
192
+
193
+ return (0, _util.transformWithRowGroup)(customizeDataSource, groupInfo);
194
+ }, [customizeDataSource, groupInfo]);
195
+ /** 列分组 */
196
+
197
+ var _useMemo = (0, _react.useMemo)(function () {
198
+ if (!(columnKeys === null || columnKeys === void 0 ? void 0 : columnKeys.length)) {
199
+ return {
200
+ dataSource: groupDataSource,
201
+ columns: customizeColumns
202
+ };
203
+ }
204
+
205
+ return (0, _util.transformWithColGroup)(customizeColumns, groupDataSource, columnKeys);
206
+ }, [customizeColumns, groupDataSource, columnKeys]),
207
+ columns = _useMemo.columns,
208
+ dataSource = _useMemo.dataSource;
209
+
188
210
  (0, _react.useEffect)(function () {
189
211
  setExpandedRowKeys([]);
190
212
  }, [groupInfo]);
@@ -266,33 +288,6 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
266
288
  (0, _react.useEffect)(function () {
267
289
  dataSourceRef.current = dataSource;
268
290
  }, [dataSource]);
269
-
270
- var groupBy = function groupBy(lastFilter, oGroup) {
271
- if (!(oGroup === null || oGroup === void 0 ? void 0 : oGroup.length)) return lastFilter;
272
- var group = oGroup.slice();
273
- var filterKey = group.shift();
274
- var map = lastFilter.reduce(function (acc, el) {
275
- var value = el[filterKey];
276
- acc[value] = [].concat((0, _toConsumableArray2.default)(acc[value] || []), [el]);
277
- return acc;
278
- }, {});
279
- return Object.keys(map).map(function (item) {
280
- return {
281
- type: filterKey,
282
- group: item,
283
- key: "".concat(item, "_").concat(filterKey),
284
- children: groupBy(map[item], group)
285
- };
286
- });
287
- };
288
-
289
- var groupDataSource = (0, _react.useMemo)(function () {
290
- if (!(groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length)) {
291
- return dataSource;
292
- }
293
-
294
- return groupBy(dataSource, groupInfo);
295
- }, [dataSource, groupInfo]);
296
291
  (0, _react.useEffect)(function () {
297
292
  var source = [];
298
293
 
@@ -306,12 +301,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
306
301
  });
307
302
  };
308
303
 
309
- deepChildren(groupDataSource);
304
+ deepChildren(dataSource);
310
305
  deepDataSourceRef.current = source;
311
- }, [groupDataSource, expandedRowKeys]);
312
- var dataEffect = (0, _react.useMemo)(function () {
313
- return openSheet ? [dataSource] : [];
314
- }, [openSheet]);
306
+ }, [dataSource, expandedRowKeys]);
315
307
 
316
308
  var onSortEnd = function onSortEnd(_ref) {
317
309
  var oldIndex = _ref.oldIndex,
@@ -458,7 +450,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
458
450
  };
459
451
 
460
452
  var onMouseOver = function onMouseOver(i, j) {
461
- var _shellStatusRef$curre4;
453
+ var _shellStatusRef$curre4, _shellStatusRef$curre7, _checkStatus, _shellStatusRef$curre8;
462
454
 
463
455
  if (isEmpty(shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre4 = shellStatusRef.current) === null || _shellStatusRef$curre4 === void 0 ? void 0 : _shellStatusRef$curre4.commiting)) {
464
456
  var _shellStatusRef$curre5, _shellStatusRef$curre6;
@@ -477,23 +469,19 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
477
469
  }
478
470
  }));
479
471
  }
480
- } else {
481
- var _shellStatusRef$curre7, _checkStatus, _shellStatusRef$curre8;
482
-
483
- if (!isEmpty((shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre7 = shellStatusRef.current) === null || _shellStatusRef$curre7 === void 0 ? void 0 : _shellStatusRef$curre7.commiting) || {}) && ((_checkStatus = (0, _util.checkStatus)(i, j, shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre8 = shellStatusRef.current) === null || _shellStatusRef$curre8 === void 0 ? void 0 : _shellStatusRef$curre8.commiting)) === null || _checkStatus === void 0 ? void 0 : _checkStatus.isVaildCommit)) {
484
- shellStatusRef.current = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, shellStatusRef.current), {}, {
485
- end: {
486
- i: i,
487
- j: j
488
- }
489
- });
490
- setSheelStatus((0, _objectSpread2.default)((0, _objectSpread2.default)({}, sheelStataus), {}, {
491
- end: {
492
- i: i,
493
- j: j
494
- }
495
- }));
496
- }
472
+ } else if (!isEmpty((shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre7 = shellStatusRef.current) === null || _shellStatusRef$curre7 === void 0 ? void 0 : _shellStatusRef$curre7.commiting) || {}) && ((_checkStatus = (0, _util.checkStatus)(i, j, shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre8 = shellStatusRef.current) === null || _shellStatusRef$curre8 === void 0 ? void 0 : _shellStatusRef$curre8.commiting)) === null || _checkStatus === void 0 ? void 0 : _checkStatus.isVaildCommit)) {
473
+ shellStatusRef.current = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, shellStatusRef.current), {}, {
474
+ end: {
475
+ i: i,
476
+ j: j
477
+ }
478
+ });
479
+ setSheelStatus((0, _objectSpread2.default)((0, _objectSpread2.default)({}, sheelStataus), {}, {
480
+ end: {
481
+ i: i,
482
+ j: j
483
+ }
484
+ }));
497
485
  }
498
486
  };
499
487
  /** sheel 表格 鼠标松开 */
@@ -1189,7 +1177,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1189
1177
  }, [])
1190
1178
  }, /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
1191
1179
  loading: loading,
1192
- dataSource: groupDataSource || dataSource,
1180
+ dataSource: dataSource,
1193
1181
  components: tableComponents,
1194
1182
  onChange: onTableChange,
1195
1183
  expandable: {
@@ -1215,7 +1203,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1215
1203
  }
1216
1204
  })))) : /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
1217
1205
  loading: loading,
1218
- dataSource: groupDataSource || dataSource,
1206
+ dataSource: dataSource,
1219
1207
  components: tableComponents,
1220
1208
  onChange: onTableChange,
1221
1209
  expandable: {
@@ -1361,9 +1349,7 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1361
1349
 
1362
1350
  var handResize = (0, _lodash.throttle)(changeSize, 600);
1363
1351
  (0, _react.useEffect)(function () {
1364
- var hiddenPage = props.hiddenPage,
1365
- customCheck = props.customCheck,
1366
- summary = props.summary;
1352
+ var summary = props.summary;
1367
1353
  setTimeout(function () {
1368
1354
  var _tableWarpRef$current5;
1369
1355
 
@@ -98,7 +98,7 @@ var SheelTabelCell = function SheelTabelCell(props) {
98
98
 
99
99
  var handleContextMenu = function handleContextMenu(e) {
100
100
  if (!col.disableEvents) {
101
- onContextMenu(e, rowIndex, colIndex);
101
+ onContextMenu === null || onContextMenu === void 0 ? void 0 : onContextMenu(e, rowIndex, colIndex);
102
102
  }
103
103
  };
104
104
  /** 鼠标松开 */
@@ -114,7 +114,7 @@ var SheelTabelCell = function SheelTabelCell(props) {
114
114
 
115
115
  var handleDoubleClick = function handleDoubleClick(e) {
116
116
  if (!(col === null || col === void 0 ? void 0 : col.disableEvents)) {
117
- onDoubleClick(rowIndex, colIndex, col);
117
+ onDoubleClick === null || onDoubleClick === void 0 ? void 0 : onDoubleClick(rowIndex, colIndex, col);
118
118
  }
119
119
  };
120
120
 
@@ -944,6 +944,7 @@ p {
944
944
  padding: 8px;
945
945
  font-size: 12px;
946
946
  background: var(--color-4);
947
+ text-align: left;
947
948
  }
948
949
  #lm_protable_warp .lm_protable .ant-table.ant-table-small {
949
950
  font-size: 12px;
@@ -8,11 +8,36 @@ Object.defineProperty(exports, "__esModule", {
8
8
  exports.checkIsSelectd = checkIsSelectd;
9
9
  exports.checkStatus = checkStatus;
10
10
  exports.transformWithColGroup = transformWithColGroup;
11
+ exports.transformWithRowGroup = transformWithRowGroup;
11
12
 
12
13
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
13
14
 
14
15
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
15
16
 
17
+ var _lodash = _interopRequireDefault(require("lodash"));
18
+
19
+ /**
20
+ * 对数据进行分组
21
+ * @param {Array} data
22
+ * @param {string} key
23
+ * @return {Object}
24
+ */
25
+ function dataGroup(data, key) {
26
+ var result = {};
27
+ data.forEach(function (item) {
28
+ if (item.children) {
29
+ var temp = dataGroup(item.children, key);
30
+ Object.keys(temp).forEach(function (k) {
31
+ if (!result[k]) result[k] = [];
32
+ result[k] = result[k].concat(temp[k]);
33
+ });
34
+ } else {
35
+ var value = item[key];
36
+ result[value] = [].concat((0, _toConsumableArray2.default)(result[value] || []), [item]);
37
+ }
38
+ });
39
+ return result;
40
+ }
16
41
  /**
17
42
  * 列分组数据转换
18
43
  * @param columns 表格的columns属性值
@@ -20,21 +45,28 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
20
45
  * @param columnKeys 列分组的keys
21
46
  * @returns
22
47
  */
48
+
49
+
23
50
  function transformWithColGroup(columns, dataSource, columnKeys) {
24
51
  if (!Array.isArray(columnKeys) || !columnKeys.length) {
25
52
  return {
26
53
  columns: columns,
27
54
  dataSource: dataSource
28
55
  };
29
- } // 去重
56
+ }
57
+
58
+ var columnsCopy = _lodash.default.cloneDeep(columns);
59
+
60
+ var dataSourceCopy = _lodash.default.cloneDeep(dataSource); // 去重
30
61
 
31
62
 
32
- columnKeys = (0, _toConsumableArray2.default)(new Set(columnKeys));
63
+ var columnKeysCopy = (0, _toConsumableArray2.default)(new Set(columnKeys));
64
+ debugger;
33
65
 
34
- var groupBy = function groupBy(lastFilter, columns, oGroup, markStr) {
66
+ var groupBy = function groupBy(source, columns, oGroup, markStr) {
35
67
  if (!(oGroup === null || oGroup === void 0 ? void 0 : oGroup.length)) {
36
68
  return columns.filter(function (c) {
37
- return columnKeys.indexOf(c.dataIndex) === -1;
69
+ return columnKeysCopy.indexOf(c.dataIndex) === -1;
38
70
  }).map(function (item) {
39
71
  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
40
72
  dataIndex: "".concat(markStr, "_").concat(item.dataIndex)
@@ -44,26 +76,21 @@ function transformWithColGroup(columns, dataSource, columnKeys) {
44
76
 
45
77
  var group = oGroup.slice();
46
78
  var filterKey = group.shift();
47
- var map = lastFilter.reduce(function (acc, el) {
48
- var value = el[filterKey];
49
- acc[value] = [].concat((0, _toConsumableArray2.default)(acc[value] || []), [el]);
50
- return acc;
51
- }, {});
79
+ var map = dataGroup(source, filterKey);
52
80
  return Object.keys(map).map(function (item) {
53
81
  return {
54
82
  type: filterKey,
55
83
  title: item,
56
84
  key: "".concat(item, "_").concat(filterKey),
57
- children: groupBy(map[item], columns, group, "".concat(markStr ? markStr + '_' : '').concat(filterKey, "_").concat(item))
85
+ children: groupBy(map[item], columns, group, "".concat(markStr ? "".concat(markStr, "_") : '').concat(filterKey, "_").concat(item))
58
86
  };
59
87
  });
60
88
  };
61
89
 
62
- var _columns = groupBy(dataSource, columns, columnKeys, null);
63
-
64
- var _dataSource = [dataSource.reduce(function (prev, cur) {
90
+ var tempColumns = groupBy(dataSourceCopy, columnsCopy, columnKeysCopy, null);
91
+ var tempDataSource = [dataSourceCopy.reduce(function (prev, cur) {
65
92
  var str = '';
66
- columnKeys.forEach(function (dataIndex, i) {
93
+ columnKeysCopy.forEach(function (dataIndex, i) {
67
94
  if (i !== 0) {
68
95
  str += '_';
69
96
  }
@@ -76,10 +103,40 @@ function transformWithColGroup(columns, dataSource, columnKeys) {
76
103
  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, prev), cur);
77
104
  }, {})];
78
105
  return {
79
- columns: _columns,
80
- dataSource: _dataSource
106
+ columns: tempColumns,
107
+ dataSource: tempDataSource
81
108
  };
82
109
  }
110
+ /**
111
+ * 行分组
112
+ * @param {Array} dataSource 数据源
113
+ * @param {Array} groupInfo 行分组的keys
114
+ * @returns
115
+ */
116
+
117
+
118
+ function transformWithRowGroup(dataSource, groupInfo) {
119
+ var groupBy = function groupBy(lastFilter, oGroup) {
120
+ if (!(oGroup === null || oGroup === void 0 ? void 0 : oGroup.length)) return lastFilter;
121
+ var group = oGroup.slice();
122
+ var filterKey = group.shift();
123
+ var map = lastFilter.reduce(function (acc, el) {
124
+ var value = el[filterKey];
125
+ acc[value] = [].concat((0, _toConsumableArray2.default)(acc[value] || []), [el]);
126
+ return acc;
127
+ }, {});
128
+ return Object.keys(map).map(function (item) {
129
+ return {
130
+ type: filterKey,
131
+ group: item,
132
+ key: "".concat(item, "_").concat(filterKey),
133
+ children: groupBy(map[item], group)
134
+ };
135
+ });
136
+ };
137
+
138
+ return groupBy(dataSource, groupInfo);
139
+ }
83
140
 
84
141
  function checkIsSelectd(i, j) {
85
142
  var start = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
@@ -1,3 +1,3 @@
1
- import React from 'react';
2
- declare const VirtualTable: React.NamedExoticComponent<object>;
1
+ import React, { PropsWithChildren } from 'react';
2
+ declare const VirtualTable: React.MemoExoticComponent<(tableProps: PropsWithChildren<any>) => JSX.Element>;
3
3
  export default VirtualTable;
@@ -18,7 +18,7 @@ var _reactVirtual = require("react-virtual");
18
18
  var _context = require("./context");
19
19
 
20
20
  var VirtualTable = /*#__PURE__*/_react.default.memo(function (tableProps) {
21
- var _a, _b;
21
+ var _a, _b, _c, _d;
22
22
 
23
23
  var bodyRef = (0, _react.useRef)(null);
24
24
 
@@ -45,9 +45,11 @@ var VirtualTable = /*#__PURE__*/_react.default.memo(function (tableProps) {
45
45
  parentRef: {
46
46
  current: (_b = bodyRef === null || bodyRef === void 0 ? void 0 : bodyRef.current) === null || _b === void 0 ? void 0 : _b.parentNode
47
47
  },
48
- estimateSize: _react.default.useCallback(function () {
49
- return 200;
50
- }, [200]),
48
+ estimateSize: _react.default.useCallback(function (i) {
49
+ var _a, _b;
50
+
51
+ return (_b = (_a = tableProps === null || tableProps === void 0 ? void 0 : tableProps.children[0]) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.colWidths[i];
52
+ }, [(_d = (_c = tableProps.children[0]) === null || _c === void 0 ? void 0 : _c.props) === null || _d === void 0 ? void 0 : _d.colWidths]),
51
53
  overscan: 5
52
54
  });
53
55
  var instance = {
@@ -2,6 +2,7 @@ import React from 'react';
2
2
  declare const _default: React.ForwardRefExoticComponent<Pick<{
3
3
  [x: string]: any;
4
4
  fileConfig: any;
5
+ fileNames: any;
5
6
  components: any;
6
7
  ossConfig: any;
7
8
  }, string | number> & React.RefAttributes<unknown>>;