linkmore-design 1.0.93 → 1.0.96

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 (226) hide show
  1. package/dist/Affix/demos/basic.d.ts +1 -0
  2. package/dist/Alert/demos/basic.d.ts +1 -0
  3. package/dist/Alert/demos/visible.d.ts +1 -0
  4. package/dist/Approval/demos/basic.d.ts +1 -0
  5. package/dist/AutoComplete/index.d.ts +0 -1
  6. package/dist/Avatar/demos/basic.d.ts +1 -0
  7. package/dist/Badge/SingleNumber.d.ts +1 -0
  8. package/dist/Badge/demos/basic.d.ts +1 -0
  9. package/dist/Breadcrumb/demos/basic.d.ts +1 -0
  10. package/dist/Breadcrumb/demos/basic1.d.ts +1 -0
  11. package/dist/Button/demos/basic.d.ts +1 -0
  12. package/dist/Button/demos/disabled.d.ts +1 -0
  13. package/dist/Button/demos/icon.d.ts +1 -0
  14. package/dist/Calendar/demos/basic.d.ts +1 -0
  15. package/dist/Card/demos/basic.d.ts +1 -0
  16. package/dist/Carousel/demos/basic.d.ts +1 -0
  17. package/dist/Cascader/demos/basic.d.ts +1 -0
  18. package/dist/Col/demos/basic.d.ts +1 -0
  19. package/dist/Collapse/demos/basic.d.ts +1 -0
  20. package/dist/Comment/demos/basic.d.ts +1 -0
  21. package/dist/ConfigProvider/demos/componentSize.d.ts +1 -0
  22. package/dist/ConfigProvider/demos/table.d.ts +2 -0
  23. package/dist/ConfigProvider/index.d.ts +1 -1
  24. package/dist/CustomTableOption/demos/basic.d.ts +1 -0
  25. package/dist/DatePicker/PickerButton.d.ts +1 -0
  26. package/dist/DatePicker/PickerTag.d.ts +1 -0
  27. package/dist/DatePicker/demos/basic.d.ts +1 -0
  28. package/dist/Descriptions/demos/basic.d.ts +1 -0
  29. package/dist/Drawer/demos/basic.d.ts +1 -0
  30. package/dist/Drawer/demos/button.d.ts +1 -0
  31. package/dist/Drawer/demos/nested.d.ts +1 -0
  32. package/dist/Dropdown/demos/basic.d.ts +1 -0
  33. package/dist/Dropdown/demos/button.d.ts +1 -0
  34. package/dist/Dropdown/demos/icon.d.ts +1 -0
  35. package/dist/Dropdown/demos/local.d.ts +1 -0
  36. package/dist/Dropdown/demos/target.d.ts +1 -0
  37. package/dist/Empty/demos/basic.d.ts +1 -0
  38. package/dist/Empty/demos/custom.d.ts +1 -0
  39. package/dist/Empty/empty.d.ts +1 -0
  40. package/dist/Empty/simple.d.ts +1 -0
  41. package/dist/Form/demos/drawer1152-triple.d.ts +1 -0
  42. package/dist/Form/demos/drawer440-double.d.ts +1 -0
  43. package/dist/Form/demos/drawer440.d.ts +1 -0
  44. package/dist/Form/demos/drawer720-double.d.ts +1 -0
  45. package/dist/Form/demos/error-tip.d.ts +1 -0
  46. package/dist/Form/demos/formlist.d.ts +1 -0
  47. package/dist/Form/demos/horizontal.d.ts +1 -0
  48. package/dist/Form/demos/inline.d.ts +1 -0
  49. package/dist/Form/demos/modal416.d.ts +1 -0
  50. package/dist/Form/demos/modal552-double.d.ts +1 -0
  51. package/dist/Form/demos/responsive.d.ts +1 -0
  52. package/dist/Form/demos/responsiveAll.d.ts +1 -0
  53. package/dist/Form/demos/vertical.d.ts +1 -0
  54. package/dist/FullScreen/demos/basic.d.ts +1 -0
  55. package/dist/FullScreen/demos/useInModal.d.ts +1 -0
  56. package/dist/Grid/demos/basic.d.ts +1 -0
  57. package/dist/Image/demos/basic.d.ts +1 -0
  58. package/dist/ImageViewer/components/Arrows.d.ts +1 -0
  59. package/dist/ImageViewer/components/Carousel.d.ts +1 -0
  60. package/dist/ImageViewer/components/Operate.d.ts +1 -0
  61. package/dist/ImageViewer/components/Thumb.d.ts +1 -0
  62. package/dist/ImageViewer/wrapeer/Container.d.ts +1 -0
  63. package/dist/ImageViewer/wrapeer/Wrapper.d.ts +1 -0
  64. package/dist/Input/demos/after.d.ts +1 -0
  65. package/dist/Input/demos/base.d.ts +1 -0
  66. package/dist/Input/demos/basic.d.ts +1 -0
  67. package/dist/Input/demos/color.d.ts +1 -0
  68. package/dist/Input/demos/combination.d.ts +1 -0
  69. package/dist/Input/demos/import.d.ts +1 -0
  70. package/dist/Input/demos/line.d.ts +1 -0
  71. package/dist/Input/demos/password.d.ts +1 -0
  72. package/dist/Input/demos/size.d.ts +1 -0
  73. package/dist/InputNumber/demos/basic.d.ts +1 -0
  74. package/dist/InputNumber/demos/format.d.ts +1 -0
  75. package/dist/InputNumber/demos/price.d.ts +1 -0
  76. package/dist/InputNumber/demos/status.d.ts +1 -0
  77. package/dist/InputNumber/demos/suffix.d.ts +1 -0
  78. package/dist/Layout/demos/basic.d.ts +1 -0
  79. package/dist/LeftTable/index.d.ts +1 -10
  80. package/dist/List/demos/basic.d.ts +1 -0
  81. package/dist/LmEditTable/DndContainer.d.ts +1 -0
  82. package/dist/LmEditTable/DragHandle.d.ts +1 -0
  83. package/dist/LmEditTable/demos/basic.d.ts +1 -0
  84. package/dist/LmEditTable/demos/colsort.d.ts +1 -0
  85. package/dist/LmEditTable/demos/sinleEdit.d.ts +1 -0
  86. package/dist/LmEditTable/demos/size.d.ts +1 -0
  87. package/dist/LmEditTable/sortableBox.d.ts +1 -0
  88. package/dist/LmEditTable/sortableBoxCol.d.ts +1 -0
  89. package/dist/LmEditTable/sortableItem.d.ts +1 -0
  90. package/dist/LmEditTable/sortableItemCol.d.ts +1 -0
  91. package/dist/LmSelect/GhostSelect.d.ts +1 -0
  92. package/dist/LmSelect/demos/basic.d.ts +1 -0
  93. package/dist/LmSelect/demos/checkbox.d.ts +1 -0
  94. package/dist/LmSelect/demos/ghost.d.ts +1 -0
  95. package/dist/LmSelect/useCheckboxOptions.d.ts +1 -0
  96. package/dist/LmTable/components/DndContainer.d.ts +1 -0
  97. package/dist/LmTable/components/customRenderEmpty.d.ts +1 -0
  98. package/dist/LmTable/components/inputDataEdit.d.ts +1 -0
  99. package/dist/LmTable/components/tableChartsModal.d.ts +1 -0
  100. package/dist/LmTable/test/index.d.ts +100 -0
  101. package/dist/LmUpload/UploadList/ItemPicture.d.ts +1 -0
  102. package/dist/LmUpload/UploadList/ItemPictureCard.d.ts +1 -0
  103. package/dist/LmUpload/UploadList/ItemText.d.ts +1 -0
  104. package/dist/LmUpload/components/card.d.ts +1 -0
  105. package/dist/LmUpload/view/index.d.ts +1 -0
  106. package/dist/LmUpload/wrapper/Upload.d.ts +1 -0
  107. package/dist/Mentions/demos/basic.d.ts +1 -0
  108. package/dist/Menu/demos/basic.d.ts +1 -0
  109. package/dist/Modal/demos/basic.d.ts +1 -0
  110. package/dist/Modal/demos/info.d.ts +1 -0
  111. package/dist/PageHeader/demos/basic.d.ts +1 -0
  112. package/dist/Pagination/demos/basic.d.ts +1 -0
  113. package/dist/Popconfirm/demos/basic.d.ts +1 -0
  114. package/dist/Popover/demos/basic.d.ts +1 -0
  115. package/dist/Popover/demos/basic1.d.ts +1 -0
  116. package/dist/Progress/demos/basic.d.ts +1 -0
  117. package/dist/Progress/demos/circle.d.ts +1 -0
  118. package/dist/Progress/demos/dynamic.d.ts +1 -0
  119. package/dist/Progress/demos/small.d.ts +1 -0
  120. package/dist/QuickMenu/demos/basic.d.ts +1 -0
  121. package/dist/Rate/demos/basic.d.ts +1 -0
  122. package/dist/Result/demos/403.d.ts +1 -0
  123. package/dist/Result/demos/404.d.ts +1 -0
  124. package/dist/Result/demos/500.d.ts +1 -0
  125. package/dist/Result/demos/basic.d.ts +1 -0
  126. package/dist/Result/demos/customicon.d.ts +1 -0
  127. package/dist/Result/demos/error.d.ts +1 -0
  128. package/dist/Result/demos/info.d.ts +1 -0
  129. package/dist/Result/demos/success.d.ts +1 -0
  130. package/dist/Result/demos/warning.d.ts +1 -0
  131. package/dist/Result/noFound.d.ts +1 -0
  132. package/dist/Result/serverError.d.ts +1 -0
  133. package/dist/Result/unauthorized.d.ts +1 -0
  134. package/dist/Row/demos/basic.d.ts +1 -0
  135. package/dist/Segmented/demos/basic.d.ts +1 -0
  136. package/dist/Select/demos/basic.d.ts +1 -0
  137. package/dist/Select/demos/bordered.d.ts +1 -0
  138. package/dist/Skeleton/demos/basic.d.ts +1 -0
  139. package/dist/Slider/demos/basic.d.ts +1 -0
  140. package/dist/Space/demos/auto.d.ts +1 -0
  141. package/dist/Space/demos/basic.d.ts +1 -0
  142. package/dist/Space/demos/vertical.d.ts +1 -0
  143. package/dist/Spin/demos/basic.d.ts +1 -0
  144. package/dist/Spin/demos/size.d.ts +1 -0
  145. package/dist/Statistic/demos/basic.d.ts +1 -0
  146. package/dist/Steps/demos/basic.d.ts +1 -0
  147. package/dist/Switch/demos/basic.d.ts +1 -0
  148. package/dist/Switch/demos/table.d.ts +1 -0
  149. package/dist/Table/demos/basic.d.ts +1 -0
  150. package/dist/Tabs/demos/basic.d.ts +1 -0
  151. package/dist/Tabs/demos/nobroder.d.ts +1 -0
  152. package/dist/Tag/demos/CheckableTag.d.ts +1 -0
  153. package/dist/Tag/demos/ExigencyTag.d.ts +1 -0
  154. package/dist/Tag/demos/add.d.ts +1 -0
  155. package/dist/Tag/demos/basic.d.ts +1 -0
  156. package/dist/Tag/demos/border.d.ts +1 -0
  157. package/dist/Tag/demos/colors.d.ts +1 -0
  158. package/dist/Timeline/demos/basic.d.ts +1 -0
  159. package/dist/Tooltip/demos/basic.d.ts +1 -0
  160. package/dist/Transfer/demos/basic.d.ts +1 -0
  161. package/dist/Tree/demos/basic.d.ts +1 -0
  162. package/dist/Tree/demos/controlled.d.ts +1 -0
  163. package/dist/Tree/demos/search.d.ts +1 -0
  164. package/dist/Tree/demos/sort.d.ts +1 -0
  165. package/dist/Tree/utils/dropIndicator.d.ts +1 -0
  166. package/dist/TreeSelect/demos/basic.d.ts +1 -0
  167. package/dist/Typography/demos/basic.d.ts +1 -0
  168. package/dist/hooks/useFullscreen/demos/basic.d.ts +1 -0
  169. package/dist/hooks/useFullscreen/demos/useInModal.d.ts +1 -0
  170. package/dist/index.umd.css +1979 -3858
  171. package/dist/index.umd.js +275002 -257850
  172. package/dist/index.umd.min.css +2 -2
  173. package/dist/index.umd.min.js +38 -23
  174. package/dist/message/demos/basic.d.ts +1 -0
  175. package/dist/message/demos/other.d.ts +1 -0
  176. package/dist/notification/demos/basic.d.ts +1 -0
  177. package/dist/notification/demos/button.d.ts +1 -0
  178. package/dist/notification/demos/icon.d.ts +1 -0
  179. package/es/Alert/ErrorBoundary.d.ts +1 -1
  180. package/es/AutoComplete/index.d.ts +0 -1
  181. package/es/AutoComplete/index.js +4 -5
  182. package/es/Badge/SingleNumber.d.ts +1 -0
  183. package/es/ConfigProvider/index.d.ts +1 -1
  184. package/es/ConfigProvider/index.js +3 -3
  185. package/es/DatePicker/PickerButton.d.ts +1 -0
  186. package/es/DatePicker/PickerTag.d.ts +1 -0
  187. package/es/DatePicker/generatePicker/generateSinglePicker.js +0 -1
  188. package/es/DatePicker/generatePicker/index.d.ts +1 -1
  189. package/es/DatePicker/index.d.ts +1 -1
  190. package/es/LeftTable/index.js +27 -20
  191. package/es/LmEditTable/EditTable.js +75 -35
  192. package/es/LmEditTable/sortableItemCol.d.ts +1 -0
  193. package/es/LmTable/Table.js +126 -69
  194. package/es/LmTable/components/sheelTableCell.js +1 -1
  195. package/es/LmTable/test/index.js +254 -0
  196. package/es/LmTable/util.js +1 -1
  197. package/es/Result/index.d.ts +4 -4
  198. package/es/Tree/utils/dropIndicator.d.ts +1 -0
  199. package/es/_util/statusUtils.d.ts +1 -1
  200. package/es/locale-provider/index.js +1 -1
  201. package/es/message/index.d.ts +6 -6
  202. package/lib/Alert/ErrorBoundary.d.ts +1 -1
  203. package/lib/AutoComplete/index.d.ts +0 -1
  204. package/lib/AutoComplete/index.js +6 -8
  205. package/lib/Badge/SingleNumber.d.ts +1 -0
  206. package/lib/ConfigProvider/index.d.ts +1 -1
  207. package/lib/ConfigProvider/index.js +3 -3
  208. package/lib/DatePicker/PickerButton.d.ts +1 -0
  209. package/lib/DatePicker/PickerTag.d.ts +1 -0
  210. package/lib/DatePicker/generatePicker/generateSinglePicker.js +0 -1
  211. package/lib/DatePicker/generatePicker/index.d.ts +1 -1
  212. package/lib/DatePicker/index.d.ts +1 -1
  213. package/lib/LeftTable/index.js +27 -20
  214. package/lib/LmEditTable/EditTable.js +77 -36
  215. package/lib/LmEditTable/sortableItemCol.d.ts +1 -0
  216. package/lib/LmTable/Table.js +126 -69
  217. package/lib/LmTable/components/sheelTableCell.js +1 -1
  218. package/lib/LmTable/test/index.js +254 -0
  219. package/lib/LmTable/util.js +1 -1
  220. package/lib/Result/index.d.ts +4 -4
  221. package/lib/Tree/utils/dropIndicator.d.ts +1 -0
  222. package/lib/_util/statusUtils.d.ts +1 -1
  223. package/lib/locale-provider/index.js +2 -2
  224. package/lib/message/index.d.ts +6 -6
  225. package/package.json +5 -4
  226. package/dist/base.css +0 -511
@@ -9,10 +9,6 @@ Object.defineProperty(exports, "__esModule", {
9
9
  });
10
10
  exports.default = exports.Summary = void 0;
11
11
 
12
- require("antd/es/config-provider/style");
13
-
14
- var _configProvider = _interopRequireDefault(require("antd/es/config-provider"));
15
-
16
12
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
17
13
 
18
14
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
@@ -23,7 +19,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm
23
19
 
24
20
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
25
21
 
26
- var _proTable = _interopRequireDefault(require("@ant-design/pro-table"));
22
+ var _proComponents = require("@ant-design/pro-components");
27
23
 
28
24
  var _sortable = require("@dnd-kit/sortable");
29
25
 
@@ -39,6 +35,8 @@ var _immer = require("immer");
39
35
 
40
36
  var _reactSortableHoc = require("react-sortable-hoc");
41
37
 
38
+ var _ConfigProvider = _interopRequireDefault(require("../ConfigProvider"));
39
+
42
40
  var _IconFont = _interopRequireDefault(require("../IconFont"));
43
41
 
44
42
  var _Empty = _interopRequireDefault(require("../Empty"));
@@ -64,7 +62,7 @@ var _virTual = require("./virTual");
64
62
  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", "groupInfo", "emptyProps", "columnKeys"],
65
63
  _excluded2 = ["className", "style"],
66
64
  _excluded3 = ["onResize", "width", "onResizeStop"];
67
- var Summary = _proTable.default.Summary;
65
+ var Summary = _proComponents.ProTable.Summary;
68
66
  exports.Summary = Summary;
69
67
 
70
68
  var isEmpty = function isEmpty(obj) {
@@ -78,12 +76,19 @@ var defaultParsePaste = function defaultParsePaste(str) {
78
76
  return row.split('\t');
79
77
  });
80
78
  };
79
+ /**
80
+ * 生成 start 到 end 数字组成的数组
81
+ * @param {number} start
82
+ * @param {number} end
83
+ * @returns {Array<number>}
84
+ */
85
+
81
86
 
82
87
  var range = function range(start, end) {
83
88
  var array = [];
84
89
  var inc = end - start > 0;
85
90
 
86
- for (var i = start; inc ? i <= end : i >= end; inc ? i++ : i--) {
91
+ for (var i = start; inc ? i <= end : i >= end; inc ? i += 1 : i -= 1) {
87
92
  inc ? array.push(i) : array.unshift(i);
88
93
  }
89
94
 
@@ -183,6 +188,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
183
188
  setExpandedRowKeys = _useState8[1];
184
189
 
185
190
  var deepDataSourceRef = (0, _react.useRef)([]);
191
+ /** */
192
+
193
+ var deepColumnsRef = (0, _react.useRef)([]);
186
194
  /** 行分组 */
187
195
 
188
196
  var groupDataSource = (0, _react.useMemo)(function () {
@@ -224,6 +232,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
224
232
  _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
225
233
  sheelStataus = _useState10[0],
226
234
  setSheelStatus = _useState10[1];
235
+ /**
236
+ * start: {i, j} 框选的坐标开始位置
237
+ * end: {i, j} 框选的坐标结束位置
238
+ * commiting: { start: {i, j}, end: {i, j}} 提交
239
+ */
240
+
227
241
 
228
242
  var shellStatusRef = (0, _react.useRef)({
229
243
  start: {},
@@ -287,7 +301,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
287
301
  });
288
302
  (0, _react.useEffect)(function () {
289
303
  dataSourceRef.current = dataSource;
290
- }, [dataSource]);
304
+ }, [dataSource]); // 行分组数据铺平, 在框选时获取数据使用
305
+
291
306
  (0, _react.useEffect)(function () {
292
307
  var source = [];
293
308
 
@@ -303,7 +318,24 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
303
318
 
304
319
  deepChildren(dataSource);
305
320
  deepDataSourceRef.current = source;
306
- }, [dataSource, expandedRowKeys]);
321
+ }, [dataSource, expandedRowKeys]); // 列分组数据铺平,在框选时获取数据使用
322
+
323
+ (0, _react.useEffect)(function () {
324
+ var source = [];
325
+
326
+ var deepChildren = function deepChildren(arr) {
327
+ arr.forEach(function (item) {
328
+ if (item.children && item.children.length) {
329
+ deepChildren(item.children);
330
+ } else {
331
+ source.push(item);
332
+ }
333
+ });
334
+ };
335
+
336
+ deepChildren(columns);
337
+ deepColumnsRef.current = source;
338
+ }, [columns, columnKeys]);
307
339
 
308
340
  var onSortEnd = function onSortEnd(_ref) {
309
341
  var oldIndex = _ref.oldIndex,
@@ -364,7 +396,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
364
396
  };
365
397
  };
366
398
 
367
- var endResize = function endResize(e, data) {
399
+ var endResize = function endResize() {
368
400
  setTimeout(function () {
369
401
  filterChange === null || filterChange === void 0 ? void 0 : filterChange(useColumns);
370
402
  });
@@ -398,13 +430,15 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
398
430
  isVaildCommit: isEmpty(commiting) ? false : isSelected && !(0, _util.checkIsSelectd)(i, j, commiting === null || commiting === void 0 ? void 0 : commiting.start, commiting === null || commiting === void 0 ? void 0 : commiting.end)
399
431
  };
400
432
  };
433
+ /** 获取框选的数据 */
434
+
401
435
 
402
436
  var getSelectDatas = function getSelectDatas(start, end) {
403
437
  return range(start.i, end.i).map(function (i) {
404
438
  return range(start.j, end.j).map(function (j) {
405
439
  var _columns$j, _columns$j2;
406
440
 
407
- var columnKey = (_columns$j = columns[j]) === null || _columns$j === void 0 ? void 0 : _columns$j.dataIndex;
441
+ var columnKey = (columnKeys === null || columnKeys === void 0 ? void 0 : columnKeys.length) ? deepColumnsRef.current[j].dataIndex : (_columns$j = columns[j]) === null || _columns$j === void 0 ? void 0 : _columns$j.dataIndex;
408
442
  var dataItem = (groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length) ? deepDataSourceRef.current[i] : dataSource[i];
409
443
  var cell = dataItem === null || dataItem === void 0 ? void 0 : dataItem[columnKey];
410
444
 
@@ -497,7 +531,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
497
531
  start = _shellStatusRef$curre10.start,
498
532
  end = _shellStatusRef$curre10.end,
499
533
  commiting = _shellStatusRef$curre10.commiting;
500
- var columnsKeysList = columns.map(function (item) {
534
+ var innerColumns = (columnKeys === null || columnKeys === void 0 ? void 0 : columnKeys.length) ? deepColumnsRef.current : columns;
535
+ var columnsKeysList = innerColumns.map(function (item) {
501
536
  return item.dataIndex;
502
537
  });
503
538
  var rowtext = range(commiting === null || commiting === void 0 ? void 0 : commiting.start.i, commiting === null || commiting === void 0 ? void 0 : commiting.end.i).map(function (i) {
@@ -510,25 +545,29 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
510
545
  });
511
546
  var coltext = range(commiting === null || commiting === void 0 ? void 0 : commiting.start.i, commiting === null || commiting === void 0 ? void 0 : commiting.end.i).map(function (i) {
512
547
  return range(commiting === null || commiting === void 0 ? void 0 : commiting.start.j, commiting === null || commiting === void 0 ? void 0 : commiting.end.j).map(function (j) {
513
- var _columns$j4, _columns$j5;
548
+ var _innerColumns$j, _innerColumns$j2;
514
549
 
515
- var columnKey = (_columns$j4 = columns[j]) === null || _columns$j4 === void 0 ? void 0 : _columns$j4.dataIndex;
550
+ var columnKey = (_innerColumns$j = innerColumns[j]) === null || _innerColumns$j === void 0 ? void 0 : _innerColumns$j.dataIndex;
516
551
  var dataItem = (groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length) ? deepDataSourceRef.current[i] : dataSource[i];
517
552
  var cell = dataItem === null || dataItem === void 0 ? void 0 : dataItem[columnKey];
518
553
 
519
- if ((_columns$j5 = columns[j]) === null || _columns$j5 === void 0 ? void 0 : _columns$j5.render) {
520
- var _columns$j6, _columns$j6$render;
554
+ if ((_innerColumns$j2 = innerColumns[j]) === null || _innerColumns$j2 === void 0 ? void 0 : _innerColumns$j2.render) {
555
+ var _innerColumns$j3, _innerColumns$j3$rend;
521
556
 
522
- return (_columns$j6 = columns[j]) === null || _columns$j6 === void 0 ? void 0 : (_columns$j6$render = _columns$j6.render) === null || _columns$j6$render === void 0 ? void 0 : _columns$j6$render.call(_columns$j6, cell, dataItem, i);
557
+ return (_innerColumns$j3 = innerColumns[j]) === null || _innerColumns$j3 === void 0 ? void 0 : (_innerColumns$j3$rend = _innerColumns$j3.render) === null || _innerColumns$j3$rend === void 0 ? void 0 : _innerColumns$j3$rend.call(_innerColumns$j3, cell, dataItem, i);
523
558
  }
524
559
 
525
560
  return cell;
526
561
  });
527
562
  });
563
+ /** 选择范围 例如:i:[0,1], j:[1,2] */
564
+
528
565
  var selectedRange = {
529
566
  i: range(start.i, end.i),
530
567
  j: range(start.j, end.j)
531
568
  };
569
+ /** 提交范围 */
570
+
532
571
  var commitRange = {
533
572
  i: range(commiting === null || commiting === void 0 ? void 0 : (_commiting$start = commiting.start) === null || _commiting$start === void 0 ? void 0 : _commiting$start.i, commiting === null || commiting === void 0 ? void 0 : (_commiting$end = commiting.end) === null || _commiting$end === void 0 ? void 0 : _commiting$end.i),
534
573
  j: range(commiting === null || commiting === void 0 ? void 0 : (_commiting$start2 = commiting.start) === null || _commiting$start2 === void 0 ? void 0 : _commiting$start2.j, commiting === null || commiting === void 0 ? void 0 : (_commiting$end2 = commiting.end) === null || _commiting$end2 === void 0 ? void 0 : _commiting$end2.j)
@@ -835,54 +874,67 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
835
874
  };
836
875
  }, []);
837
876
  var resetColumns = (0, _react.useCallback)(function () {
838
- var result = useColumns.filter(function (item) {
839
- return item.show !== false;
840
- }).map(function (col, index) {
841
- var obj = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, col), {}, {
842
- width: col.width,
843
- onHeaderCell: function onHeaderCell(column) {
844
- return {
845
- width: column.width,
846
- // onResize: (e, size) => handleResize(e, size, index),
847
- onResize: handleResize(index),
848
- onResizeStop: endResize
849
- };
877
+ var colIndex = 0;
878
+
879
+ var traverseColumns = function traverseColumns(columns) {
880
+ columns.forEach(function (col) {
881
+ if (col.show === false) {
882
+ return;
850
883
  }
851
- });
852
884
 
853
- if (openSheet) {
854
- obj.onCell = function (record, rowIndex) {
855
- return {
856
- record: record,
857
- rowKey: rowKey,
858
- col: col,
859
- colIndex: index,
860
- selectIng: selectIng,
861
- editIng: editIng,
862
- commitIng: commitIng,
863
- rowIndex: rowIndex,
864
- onMouseDown: sheelMouseDown,
865
- onMouseOver: onMouseOver,
866
- onContextMenu: onContextMenu,
867
- isSelected: isSelected,
868
- onDoubleClick: onSheelDoubleClick,
869
- dataSourceChange: dataSourceChange
885
+ if (col.children && col.children.length) {
886
+ traverseColumns(col.children);
887
+ } else {
888
+ // $_ 开头表示私有属性
889
+ col.$_colIndex = colIndex;
890
+
891
+ col.onHeaderCell = function (column) {
892
+ return {
893
+ width: column.width,
894
+ onResize: handleResize(col.$_colIndex),
895
+ onResizeStop: endResize
896
+ };
870
897
  };
871
- };
872
- }
873
898
 
874
- return obj;
875
- });
899
+ if (openSheet) {
900
+ col.onCell = function (record, rowIndex) {
901
+ return {
902
+ record: record,
903
+ rowKey: rowKey,
904
+ col: col,
905
+ colIndex: col.$_colIndex,
906
+ selectIng: selectIng,
907
+ editIng: editIng,
908
+ commitIng: commitIng,
909
+ rowIndex: rowIndex,
910
+ onMouseDown: sheelMouseDown,
911
+ onMouseOver: onMouseOver,
912
+ onContextMenu: onContextMenu,
913
+ isSelected: isSelected,
914
+ onDoubleClick: onSheelDoubleClick,
915
+ dataSourceChange: dataSourceChange
916
+ };
917
+ };
918
+ }
919
+ }
920
+
921
+ colIndex += 1;
922
+ });
923
+ };
924
+
925
+ var innerColumns = (0, _lodash.cloneDeep)(useColumns);
926
+ traverseColumns(innerColumns, null);
876
927
 
877
928
  if (groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length) {
878
- result = [{
879
- dataIndex: 'group',
929
+ innerColumns = [{
930
+ type: 'name',
880
931
  title: '分组',
881
- key: 'group'
882
- }].concat((0, _toConsumableArray2.default)(result));
932
+ key: 'group',
933
+ width: 100
934
+ }].concat((0, _toConsumableArray2.default)(innerColumns));
883
935
  }
884
936
 
885
- return sortOpen ? [sortDefaultColumnItem].concat((0, _toConsumableArray2.default)(result)) : result;
937
+ return sortOpen ? [sortDefaultColumnItem].concat((0, _toConsumableArray2.default)(innerColumns)) : innerColumns;
886
938
  }, [useColumns, sortOpen, selectIng, dataSource, groupInfo, commitIng]);
887
939
  (0, _react.useEffect)(function () {
888
940
  setColumns(columns);
@@ -926,7 +978,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
926
978
  var config = (0, _react.useMemo)(function () {
927
979
  return (0, _objectSpread2.default)({
928
980
  defaultSize: 'small',
929
- tableLayout: columnKeys ? 'auto' : 'fixed',
981
+ tableLayout: 'fixed',
930
982
  rowKey: rowKey,
931
983
  debounceTime: 300,
932
984
  revalidateOnFocus: false,
@@ -1093,7 +1145,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1093
1145
 
1094
1146
 
1095
1147
  var ResizableTitle = function ResizableTitle(props) {
1096
- var onResize = props.onResize,
1148
+ var _props$onResize = props.onResize,
1149
+ onResize = _props$onResize === void 0 ? function () {} : _props$onResize,
1097
1150
  width = props.width,
1098
1151
  onResizeStop = props.onResizeStop,
1099
1152
  restProps = (0, _objectWithoutProperties2.default)(props, _excluded3);
@@ -1163,7 +1216,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1163
1216
  width: '100%'
1164
1217
  },
1165
1218
  ref: tableWarpRef
1166
- }, /*#__PURE__*/_react.default.createElement(_configProvider.default, {
1219
+ }, /*#__PURE__*/_react.default.createElement(_ConfigProvider.default, {
1167
1220
  renderEmpty: loading ? function () {
1168
1221
  return null;
1169
1222
  } : emptyProps ? function () {
@@ -1175,7 +1228,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1175
1228
  items: columns.reduce(function (acc, item) {
1176
1229
  return [].concat((0, _toConsumableArray2.default)(acc), [item.dataIndex]);
1177
1230
  }, [])
1178
- }, /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
1231
+ }, /*#__PURE__*/_react.default.createElement(_proComponents.ProTable, (0, _extends2.default)({}, config, {
1179
1232
  loading: loading,
1180
1233
  dataSource: dataSource,
1181
1234
  components: tableComponents,
@@ -1201,7 +1254,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1201
1254
  summary: function summary(pageData) {
1202
1255
  return _summary && _summary(pageData, resultColumns);
1203
1256
  }
1204
- })))) : /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
1257
+ })))) : /*#__PURE__*/_react.default.createElement(_proComponents.ProTable, (0, _extends2.default)({}, config, {
1205
1258
  loading: loading,
1206
1259
  dataSource: dataSource,
1207
1260
  components: tableComponents,
@@ -1331,11 +1384,13 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1331
1384
  }, [tableSize, props]);
1332
1385
 
1333
1386
  var changeSize = function changeSize() {
1334
- var _tableWarpRef$current;
1387
+ if (!tableWarpRef.current) {
1388
+ return;
1389
+ }
1335
1390
 
1336
1391
  var value = props.summary ? 48 : 0;
1337
1392
 
1338
- var _ref6 = ((_tableWarpRef$current = tableWarpRef.current) === null || _tableWarpRef$current === void 0 ? void 0 : _tableWarpRef$current.getBoundingClientRect()) || {},
1393
+ var _ref6 = tableWarpRef.current.getBoundingClientRect() || {},
1339
1394
  _ref6$width = _ref6.width,
1340
1395
  width = _ref6$width === void 0 ? '100%' : _ref6$width,
1341
1396
  _ref6$height = _ref6.height,
@@ -1351,13 +1406,15 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1351
1406
  (0, _react.useEffect)(function () {
1352
1407
  var summary = props.summary;
1353
1408
  setTimeout(function () {
1354
- var _tableWarpRef$current5;
1409
+ if (!tableWarpRef.current) {
1410
+ return;
1411
+ }
1355
1412
 
1356
- var _tableWarpRef$current2 = (_tableWarpRef$current5 = tableWarpRef.current) === null || _tableWarpRef$current5 === void 0 ? void 0 : _tableWarpRef$current5.getBoundingClientRect(),
1357
- _tableWarpRef$current3 = _tableWarpRef$current2.width,
1358
- width = _tableWarpRef$current3 === void 0 ? '100%' : _tableWarpRef$current3,
1359
- _tableWarpRef$current4 = _tableWarpRef$current2.height,
1360
- height = _tableWarpRef$current4 === void 0 ? '100%' : _tableWarpRef$current4;
1413
+ var _tableWarpRef$current = tableWarpRef.current.getBoundingClientRect(),
1414
+ _tableWarpRef$current2 = _tableWarpRef$current.width,
1415
+ width = _tableWarpRef$current2 === void 0 ? '100%' : _tableWarpRef$current2,
1416
+ _tableWarpRef$current3 = _tableWarpRef$current.height,
1417
+ height = _tableWarpRef$current3 === void 0 ? '100%' : _tableWarpRef$current3;
1361
1418
 
1362
1419
  var value = summary ? 48 : 0;
1363
1420
  setTableSize({
@@ -82,7 +82,7 @@ var SheelTabelCell = function SheelTabelCell(props) {
82
82
 
83
83
 
84
84
  var handleContextMenu = function handleContextMenu(e) {
85
- if (!col.disableEvents) {
85
+ if (col && !col.disableEvents) {
86
86
  onContextMenu === null || onContextMenu === void 0 ? void 0 : onContextMenu(e, rowIndex, colIndex);
87
87
  }
88
88
  };
@@ -0,0 +1,254 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.myDataSource = exports.myColumns = void 0;
7
+ var myDataSource = [{
8
+ dataIndex: '13',
9
+ name: '胡彦祖13',
10
+ id: 2,
11
+ age: 42,
12
+ address: '西湖区湖底公园13号',
13
+ name_小黄_key_0: '1',
14
+ name_小黄_name_0: '小黄',
15
+ name_小黄_id_0: 2,
16
+ name_小黄_age_0: 87,
17
+ name_小黄_address_0: '天堂',
18
+ name_小黄_key_1: '2',
19
+ name_小黄_name_1: '小黄',
20
+ name_小黄_id_1: 2,
21
+ name_小黄_age_1: 42,
22
+ name_小黄_address_1: '西湖区湖底公园2号',
23
+ name_小黄_key_2: '3',
24
+ name_小黄_name_2: '小黄',
25
+ name_小黄_id_2: 1,
26
+ name_小黄_age_2: 32,
27
+ name_小黄_address_2: '西湖区湖底公园3号',
28
+ name_小红_key_0: '4',
29
+ name_小红_name_0: '小红',
30
+ name_小红_id_0: 2,
31
+ name_小红_age_0: 42,
32
+ name_小红_address_0: '西湖区湖底公园4号',
33
+ name_达铭_key_0: '5',
34
+ name_达铭_name_0: '达铭',
35
+ name_达铭_id_0: 1,
36
+ name_达铭_age_0: 32,
37
+ name_达铭_address_0: '西湖区湖底公园5号',
38
+ name_乔克_key_0: '6',
39
+ name_乔克_name_0: '乔克',
40
+ name_乔克_id_0: 2,
41
+ name_乔克_age_0: 42,
42
+ name_乔克_address_0: '西湖区湖底公园6号',
43
+ name_零榆_key_0: '7',
44
+ name_零榆_name_0: '零榆',
45
+ name_零榆_id_0: 1,
46
+ name_零榆_age_0: 32,
47
+ name_零榆_address_0: '西湖区湖底公园7号',
48
+ name_小迪_key_0: '8',
49
+ name_小迪_name_0: '小迪',
50
+ name_小迪_id_0: 2,
51
+ name_小迪_age_0: 42,
52
+ name_小迪_address_0: '西湖区湖底公园8号',
53
+ name_小白_key_0: '9',
54
+ name_小白_name_0: '小白',
55
+ name_小白_id_0: 2,
56
+ name_小白_age_0: 42,
57
+ name_小白_address_0: '西湖区湖底公园9号',
58
+ name_小黑_key_0: '10',
59
+ name_小黑_name_0: '小黑',
60
+ name_小黑_id_0: 1,
61
+ name_小黑_age_0: 32,
62
+ name_小黑_address_0: '西湖区湖底公园10号',
63
+ name_胡彦祖11_key_0: '11',
64
+ name_胡彦祖11_name_0: '胡彦祖11',
65
+ name_胡彦祖11_id_0: 2,
66
+ name_胡彦祖11_age_0: 42,
67
+ name_胡彦祖11_address_0: '西湖区湖底公园11号',
68
+ name_胡彦斌12_key_0: '12',
69
+ name_胡彦斌12_name_0: '胡彦斌12',
70
+ name_胡彦斌12_id_0: 1,
71
+ name_胡彦斌12_age_0: 32,
72
+ name_胡彦斌12_address_0: '西湖区湖底公园12号'
73
+ }];
74
+ exports.myDataSource = myDataSource;
75
+ var myColumns = [{
76
+ type: 'name',
77
+ title: '小黄',
78
+ dataIndex: '小黄_name',
79
+ children: [{
80
+ title: '年龄',
81
+ dataIndex: 'name_小黄_age_0',
82
+ etype: 'number',
83
+ width: 100,
84
+ key: 0
85
+ }, {
86
+ title: '住址',
87
+ dataIndex: 'name_小黄_address_0',
88
+ width: 100,
89
+ key: 1
90
+ }, {
91
+ title: '年龄',
92
+ dataIndex: 'name_小黄_age_1',
93
+ etype: 'number',
94
+ width: 100,
95
+ key: 2
96
+ }, {
97
+ title: '住址',
98
+ dataIndex: 'name_小黄_address_1',
99
+ width: 100,
100
+ key: 9
101
+ }, {
102
+ title: '年龄',
103
+ dataIndex: 'name_小黄_age_2',
104
+ etype: 'number',
105
+ width: 100,
106
+ key: 3
107
+ }, {
108
+ title: '住址',
109
+ dataIndex: 'name_小黄_address_2',
110
+ width: 100,
111
+ key: 4
112
+ }]
113
+ }, {
114
+ type: 'name',
115
+ title: '小红',
116
+ dataIndex: '小红_name',
117
+ children: [{
118
+ title: '年龄',
119
+ dataIndex: 'name_小红_age_0',
120
+ etype: 'number',
121
+ width: 100
122
+ }, {
123
+ title: '住址',
124
+ dataIndex: 'name_小红_address_0',
125
+ width: 100
126
+ }]
127
+ }, {
128
+ type: 'name',
129
+ title: '达铭',
130
+ dataIndex: '达铭_name',
131
+ children: [{
132
+ title: '年龄',
133
+ dataIndex: 'name_达铭_age_0',
134
+ etype: 'number',
135
+ width: 100
136
+ }, {
137
+ title: '住址',
138
+ dataIndex: 'name_达铭_address_0',
139
+ width: 100
140
+ }]
141
+ }, {
142
+ type: 'name',
143
+ title: '乔克',
144
+ dataIndex: '乔克_name',
145
+ children: [{
146
+ title: '年龄',
147
+ dataIndex: 'name_乔克_age_0',
148
+ etype: 'number',
149
+ width: 100
150
+ }, {
151
+ title: '住址',
152
+ dataIndex: 'name_乔克_address_0',
153
+ width: 100
154
+ }]
155
+ }, {
156
+ type: 'name',
157
+ title: '零榆',
158
+ dataIndex: '零榆_name',
159
+ children: [{
160
+ title: '年龄',
161
+ dataIndex: 'name_零榆_age_0',
162
+ etype: 'number',
163
+ width: 100
164
+ }, {
165
+ title: '住址',
166
+ dataIndex: 'name_零榆_address_0',
167
+ width: 100
168
+ }]
169
+ }, {
170
+ type: 'name',
171
+ title: '小迪',
172
+ dataIndex: '小迪_name',
173
+ children: [{
174
+ title: '年龄',
175
+ dataIndex: 'name_小迪_age_0',
176
+ etype: 'number',
177
+ width: 100
178
+ }, {
179
+ title: '住址',
180
+ dataIndex: 'name_小迪_address_0',
181
+ width: 100
182
+ }]
183
+ }, {
184
+ type: 'name',
185
+ title: '小白',
186
+ dataIndex: '小白_name',
187
+ children: [{
188
+ title: '年龄',
189
+ dataIndex: 'name_小白_age_0',
190
+ etype: 'number',
191
+ width: 100
192
+ }, {
193
+ title: '住址',
194
+ dataIndex: 'name_小白_address_0',
195
+ width: 100
196
+ }]
197
+ }, {
198
+ type: 'name',
199
+ title: '小黑',
200
+ dataIndex: '小黑_name',
201
+ children: [{
202
+ title: '年龄',
203
+ dataIndex: 'name_小黑_age_0',
204
+ etype: 'number',
205
+ width: 100
206
+ }, {
207
+ title: '住址',
208
+ dataIndex: 'name_小黑_address_0',
209
+ width: 100
210
+ }]
211
+ }, {
212
+ type: 'name',
213
+ title: '胡彦祖11',
214
+ dataIndex: '胡彦祖11_name',
215
+ children: [{
216
+ title: '年龄',
217
+ dataIndex: 'name_胡彦祖11_age_0',
218
+ etype: 'number',
219
+ width: 100
220
+ }, {
221
+ title: '住址',
222
+ dataIndex: 'name_胡彦祖11_address_0',
223
+ width: 100
224
+ }]
225
+ }, {
226
+ type: 'name',
227
+ title: '胡彦斌12',
228
+ dataIndex: '胡彦斌12_name',
229
+ children: [{
230
+ title: '年龄',
231
+ dataIndex: 'name_胡彦斌12_age_0',
232
+ etype: 'number',
233
+ width: 100
234
+ }, {
235
+ title: '住址',
236
+ dataIndex: 'name_胡彦斌12_address_0',
237
+ width: 100
238
+ }]
239
+ }, {
240
+ type: 'name',
241
+ title: '胡彦祖13',
242
+ dataIndex: '胡彦祖13_name',
243
+ children: [{
244
+ title: '年龄',
245
+ dataIndex: 'name_胡彦祖13_age_0',
246
+ etype: 'number',
247
+ width: 100
248
+ }, {
249
+ title: '住址',
250
+ dataIndex: 'name_胡彦祖13_address_0',
251
+ width: 100
252
+ }]
253
+ }];
254
+ exports.myColumns = myColumns;
@@ -108,7 +108,7 @@ function transformWithColGroup(columns, dataSource, columnKeys) {
108
108
  var dataSourceBy = function dataSourceBy(source) {
109
109
  return [source.reduce(function (prev, sItem) {
110
110
  if (sItem.children && sItem.children.length) {
111
- sItem.children = dataSourceBy(sItem.children);
111
+ sItem.children = dataSourceBy(sItem.children).flat();
112
112
 
113
113
  if (!prev) {
114
114
  prev = [];