linkmore-design 1.1.7 → 1.1.9

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 (73) hide show
  1. package/CHANGELOG.md +1056 -9
  2. package/dist/Form/FormItem/index.d.ts +7 -1
  3. package/dist/Form/demos/ruleTime.d.ts +2 -0
  4. package/dist/LmFilter/utils.d.ts +1 -0
  5. package/dist/LmTable/hooks/useRowSelectControllableValue.d.ts +2 -0
  6. package/dist/LmUpload/UploadList/ItemPictureCard.d.ts +2 -1
  7. package/dist/LmUpload/components/Preview.d.ts +5 -0
  8. package/dist/LmUpload/fns/index.d.ts +1 -0
  9. package/dist/LmUpload/wrapper/reducer.d.ts +4 -0
  10. package/dist/index.umd.js +582 -333
  11. package/dist/index.umd.min.js +16 -16
  12. package/dist/variables.css +10 -3
  13. package/es/Form/FormItem/index.d.ts +7 -1
  14. package/es/Form/FormItem/index.js +56 -13
  15. package/es/LmEditTable/EditTable.js +24 -21
  16. package/es/LmEditTable/style/index.css +3 -0
  17. package/es/LmEditTable/style/variables.css +3 -0
  18. package/es/LmEditTable/util.js +4 -4
  19. package/es/LmFilter/clearFilter/index.js +3 -1
  20. package/es/LmFilter/complexFilter/index.js +3 -2
  21. package/es/LmFilter/components/DropdownFIlter.js +8 -6
  22. package/es/LmFilter/style/index.css +4 -0
  23. package/es/LmFilter/style/variables.css +4 -0
  24. package/es/LmFilter/utils.js +18 -0
  25. package/es/LmFilter/wrapper/Filter.js +6 -2
  26. package/es/LmTable/Table.js +90 -84
  27. package/es/LmTable/hooks/useRowSelectControllableValue.js +67 -0
  28. package/es/LmTable/style/index.css +3 -3
  29. package/es/LmTable/style/variables.css +3 -3
  30. package/es/LmTable/util.js +9 -5
  31. package/es/LmUpload/LmUpload.js +1 -0
  32. package/es/LmUpload/UploadList/ItemPictureCard.d.ts +2 -1
  33. package/es/LmUpload/UploadList/ItemPictureCard.js +19 -5
  34. package/es/LmUpload/UploadList/index.js +13 -9
  35. package/es/LmUpload/components/Preview.d.ts +5 -0
  36. package/es/LmUpload/components/Preview.js +43 -0
  37. package/es/LmUpload/fns/index.d.ts +1 -0
  38. package/es/LmUpload/fns/index.js +22 -3
  39. package/es/LmUpload/wrapper/UploadWrapper.js +3 -0
  40. package/es/LmUpload/wrapper/reducer.d.ts +4 -0
  41. package/es/LmUpload/wrapper/reducer.js +12 -3
  42. package/es/styles/variables.css +10 -3
  43. package/lib/Form/FormItem/index.d.ts +7 -1
  44. package/lib/Form/FormItem/index.js +58 -14
  45. package/lib/LmEditTable/EditTable.js +24 -21
  46. package/lib/LmEditTable/style/index.css +3 -0
  47. package/lib/LmEditTable/style/variables.css +3 -0
  48. package/lib/LmEditTable/util.js +4 -4
  49. package/lib/LmFilter/clearFilter/index.js +3 -1
  50. package/lib/LmFilter/complexFilter/index.js +3 -2
  51. package/lib/LmFilter/components/DropdownFIlter.js +8 -6
  52. package/lib/LmFilter/style/index.css +4 -0
  53. package/lib/LmFilter/style/variables.css +4 -0
  54. package/lib/LmFilter/utils.js +18 -0
  55. package/lib/LmFilter/wrapper/Filter.js +6 -2
  56. package/lib/LmTable/Table.js +90 -84
  57. package/lib/LmTable/hooks/useRowSelectControllableValue.js +67 -0
  58. package/lib/LmTable/style/index.css +3 -3
  59. package/lib/LmTable/style/variables.css +3 -3
  60. package/lib/LmTable/util.js +9 -5
  61. package/lib/LmUpload/LmUpload.js +1 -0
  62. package/lib/LmUpload/UploadList/ItemPictureCard.d.ts +2 -1
  63. package/lib/LmUpload/UploadList/ItemPictureCard.js +19 -5
  64. package/lib/LmUpload/UploadList/index.js +15 -9
  65. package/lib/LmUpload/components/Preview.d.ts +5 -0
  66. package/lib/LmUpload/components/Preview.js +55 -0
  67. package/lib/LmUpload/fns/index.d.ts +1 -0
  68. package/lib/LmUpload/fns/index.js +22 -3
  69. package/lib/LmUpload/wrapper/UploadWrapper.js +4 -0
  70. package/lib/LmUpload/wrapper/reducer.d.ts +4 -0
  71. package/lib/LmUpload/wrapper/reducer.js +12 -3
  72. package/lib/styles/variables.css +10 -3
  73. package/package.json +15 -3
@@ -53,11 +53,15 @@
53
53
  background-color: var(--background-color-hover);
54
54
  }
55
55
  .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_search {
56
+ width: 140px;
56
57
  max-width: 140px;
57
58
  }
58
59
  .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_complex {
59
60
  display: inline-flex;
60
61
  }
62
+ .lm_filter_wrapper .lm_filter_container .lm_filter.lm_filter_small .lm_filter_custom_line {
63
+ height: 24px;
64
+ }
61
65
  .lm_filter_basic_item {
62
66
  font-size: 12px;
63
67
  display: inline-flex;
@@ -53,11 +53,15 @@
53
53
  background-color: var(--background-color-hover);
54
54
  }
55
55
  .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_search {
56
+ width: 140px;
56
57
  max-width: 140px;
57
58
  }
58
59
  .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_complex {
59
60
  display: inline-flex;
60
61
  }
62
+ .lm_filter_wrapper .lm_filter_container .lm_filter.lm_filter_small .lm_filter_custom_line {
63
+ height: 24px;
64
+ }
61
65
  .lm_filter_basic_item {
62
66
  font-size: 12px;
63
67
  display: inline-flex;
@@ -11,6 +11,7 @@ exports.getFlatItem = getFlatItem;
11
11
  exports.getIsHas = getIsHas;
12
12
  exports.getRanges = getRanges;
13
13
  exports.getValueForType = getValueForType;
14
+ exports.toStringIsEqual = toStringIsEqual;
14
15
  exports.uniqueFunc = uniqueFunc;
15
16
 
16
17
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -33,6 +34,23 @@ function getIsHas(val) {
33
34
  }
34
35
 
35
36
  return flag;
37
+ }
38
+ /*
39
+ * 数据(布尔值、数值)转字符串后对比是否相等 str, strs, type
40
+ * @params {Array | String} strs
41
+ * @params {String} type 比对类型
42
+ * @type includes 是否包含在数组内
43
+ */
44
+
45
+
46
+ function toStringIsEqual(str, strs, type) {
47
+ if (type === 'includes') {
48
+ return strs === null || strs === void 0 ? void 0 : strs.some(function (v) {
49
+ return toStringIsEqual(str, v);
50
+ });
51
+ }
52
+
53
+ return String(str) === String(strs);
36
54
  } // 根据类型返回对应的值
37
55
 
38
56
 
@@ -7,8 +7,12 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = void 0;
9
9
 
10
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
11
+
10
12
  var _react = _interopRequireDefault(require("react"));
11
13
 
14
+ var _classnames = _interopRequireDefault(require("classnames"));
15
+
12
16
  var _baseFilter = _interopRequireDefault(require("../baseFilter"));
13
17
 
14
18
  var _customFilter = _interopRequireDefault(require("../customFilter"));
@@ -22,10 +26,10 @@ var LmFilter = /*#__PURE__*/_react.default.memo(function (_ref) {
22
26
  var instance = _ref.instance;
23
27
  var enableBaisc = instance.enableBaisc,
24
28
  enableComplex = instance.enableComplex,
25
- enableCustom = instance.enableCustom,
29
+ size = instance.size,
26
30
  enableClear = instance.enableClear;
27
31
  return /*#__PURE__*/_react.default.createElement("div", {
28
- className: "lm_filter"
32
+ className: (0, _classnames.default)('lm_filter', (0, _defineProperty2.default)({}, "lm_filter_".concat(size), size))
29
33
  }, /*#__PURE__*/_react.default.createElement(_customFilter.default, {
30
34
  instance: instance
31
35
  }), enableBaisc && /*#__PURE__*/_react.default.createElement(_baseFilter.default, {
@@ -31,10 +31,14 @@ var _react = _interopRequireWildcard(require("react"));
31
31
 
32
32
  var _reactResizable = require("react-resizable");
33
33
 
34
+ var _ahooks = require("ahooks");
35
+
34
36
  var _immer = require("immer");
35
37
 
36
38
  var _reactSortableHoc = require("react-sortable-hoc");
37
39
 
40
+ var _useRowSelectControllableValue = _interopRequireDefault(require("./hooks/useRowSelectControllableValue"));
41
+
38
42
  var _ConfigProvider = _interopRequireDefault(require("../ConfigProvider"));
39
43
 
40
44
  var _IconFont = _interopRequireDefault(require("../IconFont"));
@@ -142,24 +146,31 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
142
146
  var _React$useContext = _react.default.useContext(ConfigContext),
143
147
  locale = _React$useContext.locale;
144
148
 
145
- var _useState = (0, _react.useState)({
146
- selectedRows: []
149
+ var transformRowClick = function transformRowClick(data) {
150
+ return rowClick === null || rowClick === void 0 ? void 0 : rowClick(data.selectedRows || data);
151
+ }; // const [useSelectedRows, setSelectedRows] = useState({ selectedRows: [] }) // 复选中的值
152
+
153
+
154
+ var _useControllableValue = (0, _useRowSelectControllableValue.default)({
155
+ value: {
156
+ selectedRows: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || []
157
+ },
158
+ onChange: rowClick ? transformRowClick : undefined
147
159
  }),
160
+ _useControllableValue2 = (0, _slicedToArray2.default)(_useControllableValue, 2),
161
+ useSelectedRows = _useControllableValue2[0],
162
+ setSelectedRows = _useControllableValue2[1];
163
+
164
+ var _useState = (0, _react.useState)(''),
148
165
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
149
- useSelectedRows = _useState2[0],
150
- setSelectedRows = _useState2[1]; // 复选中的值
166
+ useActiveKey = _useState2[0],
167
+ setActiveKey = _useState2[1]; // 行选中
151
168
 
152
169
 
153
- var _useState3 = (0, _react.useState)(''),
170
+ var _useState3 = (0, _react.useState)([]),
154
171
  _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
155
- useActiveKey = _useState4[0],
156
- setActiveKey = _useState4[1]; // 行选中
157
-
158
-
159
- var _useState5 = (0, _react.useState)([]),
160
- _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
161
- useColumns = _useState6[0],
162
- setColumns = _useState6[1];
172
+ useColumns = _useState4[0],
173
+ setColumns = _useState4[1];
163
174
 
164
175
  var tableWarpRef = (0, _react.useRef)(null);
165
176
  var dataSourceRef = (0, _react.useRef)(null);
@@ -169,10 +180,10 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
169
180
  var contentMenuRef = (0, _react.useRef)(null);
170
181
  /** 当前展开的列 */
171
182
 
172
- var _useState7 = (0, _react.useState)([]),
173
- _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
174
- expandedRowKeys = _useState8[0],
175
- setExpandedRowKeys = _useState8[1];
183
+ var _useState5 = (0, _react.useState)([]),
184
+ _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
185
+ expandedRowKeys = _useState6[0],
186
+ setExpandedRowKeys = _useState6[1];
176
187
 
177
188
  var deepDataSourceRef = (0, _react.useRef)([]);
178
189
  var deepColumnsRef = (0, _react.useRef)([]); //
@@ -217,7 +228,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
217
228
  }, [groupRowKeys, groupColKeys]);
218
229
  /** sheel数据的表格 */
219
230
 
220
- var _useState9 = (0, _react.useState)({
231
+ var _useState7 = (0, _react.useState)({
221
232
  // 记录框选的行列坐标信息
222
233
  start: {},
223
234
  end: {},
@@ -230,9 +241,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
230
241
  // 记录右下角小方块的拖动信息
231
242
  commiting: {}
232
243
  }),
233
- _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
234
- sheelStataus = _useState10[0],
235
- setSheelStatus = _useState10[1];
244
+ _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
245
+ sheelStataus = _useState8[0],
246
+ setSheelStatus = _useState8[1];
236
247
 
237
248
  var shellStatusRef = (0, _react.useRef)({
238
249
  start: {},
@@ -244,49 +255,49 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
244
255
  commiting: {}
245
256
  });
246
257
 
258
+ var _useState9 = (0, _react.useState)(false),
259
+ _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
260
+ selectIng = _useState10[0],
261
+ setSelectIng = _useState10[1];
262
+
247
263
  var _useState11 = (0, _react.useState)(false),
248
264
  _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
249
- selectIng = _useState12[0],
250
- setSelectIng = _useState12[1];
265
+ editIng = _useState12[0],
266
+ setEditIng = _useState12[1];
251
267
 
252
268
  var _useState13 = (0, _react.useState)(false),
253
269
  _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
254
- editIng = _useState14[0],
255
- setEditIng = _useState14[1];
256
-
257
- var _useState15 = (0, _react.useState)(false),
258
- _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
259
- commitIng = _useState16[0],
260
- setCommitIng = _useState16[1];
270
+ commitIng = _useState14[0],
271
+ setCommitIng = _useState14[1];
261
272
  /** 右键菜单是否显示 */
262
273
 
263
274
 
264
- var _useState17 = (0, _react.useState)(false),
265
- _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
266
- contextMenuStatus = _useState18[0],
267
- setContextMenuStatus = _useState18[1];
275
+ var _useState15 = (0, _react.useState)(false),
276
+ _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
277
+ contextMenuStatus = _useState16[0],
278
+ setContextMenuStatus = _useState16[1];
268
279
  /** 右键按钮的位置 */
269
280
 
270
281
 
271
- var _useState19 = (0, _react.useState)({
282
+ var _useState17 = (0, _react.useState)({
272
283
  position: 'fixed',
273
284
  left: 300,
274
285
  top: 200
275
286
  }),
276
- _useState20 = (0, _slicedToArray2.default)(_useState19, 2),
277
- style = _useState20[0],
278
- setStyle = _useState20[1];
287
+ _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
288
+ style = _useState18[0],
289
+ setStyle = _useState18[1];
279
290
 
280
- var _useState21 = (0, _react.useState)(null),
281
- _useState22 = (0, _slicedToArray2.default)(_useState21, 2),
282
- chartsModalStatus = _useState22[0],
283
- setChartsModalStatus = _useState22[1]; // 列设置
291
+ var _useState19 = (0, _react.useState)(null),
292
+ _useState20 = (0, _slicedToArray2.default)(_useState19, 2),
293
+ chartsModalStatus = _useState20[0],
294
+ setChartsModalStatus = _useState20[1]; // 列设置
284
295
 
285
296
 
286
- var _useState23 = (0, _react.useState)(false),
287
- _useState24 = (0, _slicedToArray2.default)(_useState23, 2),
288
- columnsStateMap = _useState24[0],
289
- setColumnsStateMap = _useState24[1];
297
+ var _useState21 = (0, _react.useState)(false),
298
+ _useState22 = (0, _slicedToArray2.default)(_useState21, 2),
299
+ columnsStateMap = _useState22[0],
300
+ setColumnsStateMap = _useState22[1];
290
301
 
291
302
  var SortableItem = (0, _reactSortableHoc.SortableElement)(function (props) {
292
303
  return /*#__PURE__*/_react.default.createElement("tr", props);
@@ -299,7 +310,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
299
310
  var source = [];
300
311
 
301
312
  var deepChildren = function deepChildren(arr) {
302
- arr.forEach(function (item) {
313
+ arr === null || arr === void 0 ? void 0 : arr.forEach(function (item) {
303
314
  source.push((0, _lodash.omit)(item, 'children')); // 展开
304
315
 
305
316
  if ((item === null || item === void 0 ? void 0 : item.children) && expandedRowKeys.includes(item.key)) {
@@ -316,7 +327,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
316
327
  var source = [];
317
328
 
318
329
  var deepChildren = function deepChildren(arr) {
319
- arr.forEach(function (item) {
330
+ arr === null || arr === void 0 ? void 0 : arr.forEach(function (item) {
320
331
  if (item.children && item.children.length) {
321
332
  deepChildren(item.children);
322
333
  } else {
@@ -747,6 +758,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
747
758
  var _shellStatusRef$curre11;
748
759
 
749
760
  if (isEmpty((_shellStatusRef$curre11 = shellStatusRef.current) === null || _shellStatusRef$curre11 === void 0 ? void 0 : _shellStatusRef$curre11.editing)) {
761
+ var _pasteData;
762
+
750
763
  var _shellStatusRef$curre12 = shellStatusRef.current,
751
764
  start = _shellStatusRef$curre12.start,
752
765
  end = _shellStatusRef$curre12.end;
@@ -770,8 +783,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
770
783
 
771
784
 
772
785
  var resultEnd = [];
773
- pasteData.forEach(function (row, i) {
774
- row.forEach(function (value, j) {
786
+ (_pasteData = pasteData) === null || _pasteData === void 0 ? void 0 : _pasteData.forEach(function (row, i) {
787
+ row === null || row === void 0 ? void 0 : row.forEach(function (value, j) {
775
788
  resultEnd.push({
776
789
  i: start.i + i,
777
790
  j: start.j + j,
@@ -780,7 +793,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
780
793
  });
781
794
  });
782
795
  var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
783
- resultEnd.forEach(function (item) {
796
+ resultEnd === null || resultEnd === void 0 ? void 0 : resultEnd.forEach(function (item) {
784
797
  var _isSelected2;
785
798
 
786
799
  if ((_isSelected2 = isSelected(item.i, item.j)) === null || _isSelected2 === void 0 ? void 0 : _isSelected2.isSelected) {
@@ -983,7 +996,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
983
996
  var colIndex = 0;
984
997
 
985
998
  var traverseColumns = function traverseColumns(columns) {
986
- columns.forEach(function (col) {
999
+ columns === null || columns === void 0 ? void 0 : columns.forEach(function (col) {
987
1000
  if (col.show === false) {
988
1001
  return;
989
1002
  }
@@ -1031,7 +1044,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1031
1044
  });
1032
1045
  };
1033
1046
 
1034
- var innerColumns = (0, _lodash.cloneDeep)(useColumns);
1047
+ var innerColumns = (0, _lodash.cloneDeep)(useColumns.filter(function (item) {
1048
+ return item.show !== false;
1049
+ }));
1035
1050
  traverseColumns(innerColumns, null);
1036
1051
 
1037
1052
  if (groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length) {
@@ -1064,15 +1079,13 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1064
1079
  var selectedRows = useSelectedRows.selectedRows;
1065
1080
 
1066
1081
  if (tableRowType === 'select' || tableRowType === 'default' && selectedRows.length) {
1067
- var selectedRowKeys = selectedRows.map(function (v) {
1068
- return v[rowKey];
1082
+ var selectIndex = selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.findIndex(function (v) {
1083
+ return (0, _lodash.isObject)(v) ? v[rowKey] === record[rowKey] : v === record[rowKey];
1069
1084
  });
1070
- var Idx = selectedRowKeys.indexOf(record[rowKey]);
1071
- Idx >= 0 ? selectedRows.splice(Idx, 1) : selectedRows.push(record);
1085
+ selectIndex >= 0 ? selectedRows.splice(selectIndex, 1) : selectedRows.push((0, _lodash.isObject)(selectedRows[0]) || !selectedRows.length ? record : record[rowKey]);
1072
1086
  setSelectedRows({
1073
- selectedRows: selectedRows
1074
- });
1075
- rowClick === null || rowClick === void 0 ? void 0 : rowClick(selectedRows);
1087
+ selectedRows: (0, _lodash.cloneDeep)(selectedRows)
1088
+ }); // rowClick?.(selectedRows)
1076
1089
  }
1077
1090
  } else {
1078
1091
  rowClick === null || rowClick === void 0 ? void 0 : rowClick(record);
@@ -1120,13 +1133,13 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1120
1133
  showSizeChanger: true,
1121
1134
  showQuickJumper: true,
1122
1135
  showTotal: function showTotal(total) {
1123
- return (locale === null || locale === void 0 ? void 0 : locale.locale) === 'zh-cn' ? "\u5171 ".concat(total, " \u6761") : "total ".concat(total, " Page");
1136
+ return (locale === null || locale === void 0 ? void 0 : locale.locale) === 'en' ? "total ".concat(total, " Page") : "\u5171 ".concat(total, " \u6761");
1124
1137
  },
1125
- locale: (locale === null || locale === void 0 ? void 0 : locale.locale) === 'zh-cn' ? {
1138
+ locale: (locale === null || locale === void 0 ? void 0 : locale.locale) === 'en' ? (locale === null || locale === void 0 ? void 0 : locale.Pagination) || {} : {
1126
1139
  items_per_page: '/条',
1127
1140
  jump_to: '前往',
1128
1141
  page: '页'
1129
- } : (locale === null || locale === void 0 ? void 0 : locale.Pagination) || {},
1142
+ },
1130
1143
  size: 'small'
1131
1144
  }, pagination),
1132
1145
  rowSelection: rowSelection === false ? undefined : (0, _objectSpread2.default)({
@@ -1134,7 +1147,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1134
1147
  type: 'checkbox',
1135
1148
  columnWidth: 36,
1136
1149
  selectedRowKeys: useSelectedRows.selectedRows.map(function (v) {
1137
- return v[rowKey];
1150
+ return (0, _lodash.isObject)(v) ? v[rowKey] : v;
1138
1151
  }),
1139
1152
 
1140
1153
  /** 如果开启了行分组,则需要把checkStrictly关闭,变成受控模式 */
@@ -1142,8 +1155,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1142
1155
  onChange: !(rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) ? function (selectedRowKeys, selectedRows) {
1143
1156
  setSelectedRows({
1144
1157
  selectedRows: selectedRows
1145
- });
1146
- rowClick === null || rowClick === void 0 ? void 0 : rowClick(selectedRows);
1158
+ }); // rowClick?.(selectedRows)
1147
1159
  } : undefined,
1148
1160
  onSelectAll: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) ? function (selected, selectedRows, changeRows) {
1149
1161
  var changeRowKeys = changeRows === null || changeRows === void 0 ? void 0 : changeRows.map(function (item) {
@@ -1154,8 +1166,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1154
1166
  });
1155
1167
  setSelectedRows({
1156
1168
  selectedRows: reulstSelect
1157
- });
1158
- rowClick === null || rowClick === void 0 ? void 0 : rowClick(reulstSelect);
1169
+ }); // rowClick?.(reulstSelect)
1159
1170
  } : undefined,
1160
1171
  onSelect: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) ? function (record, selected) {
1161
1172
  var reulstSelect = selected ? (0, _lodash.uniqBy)([].concat((0, _toConsumableArray2.default)(rowSelection.selectedRows), [record]), rowKey) : rowSelection.selectedRows.filter(function (item) {
@@ -1163,8 +1174,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1163
1174
  });
1164
1175
  setSelectedRows({
1165
1176
  selectedRows: reulstSelect
1166
- });
1167
- rowClick === null || rowClick === void 0 ? void 0 : rowClick(reulstSelect);
1177
+ }); // rowClick?.(reulstSelect)
1168
1178
  } : undefined
1169
1179
  }, rowSelection),
1170
1180
  onRow: function onRow(record) {
@@ -1228,14 +1238,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1228
1238
  clearSelect: function clearSelect() {
1229
1239
  setSelectedRows({
1230
1240
  selectedRows: []
1231
- });
1232
- rowClick === null || rowClick === void 0 ? void 0 : rowClick([]);
1241
+ }); // rowClick?.([])
1233
1242
  },
1234
1243
  customSetCheckboxRecords: function customSetCheckboxRecords(value) {
1235
1244
  setSelectedRows({
1236
1245
  selectedRows: value
1237
- });
1238
- rowClick === null || rowClick === void 0 ? void 0 : rowClick(value);
1246
+ }); // rowClick?.(value)
1239
1247
  },
1240
1248
  checkboxRecords: useSelectedRows.selectedRows,
1241
1249
  columns: useColumns.map(function (item) {
@@ -1243,14 +1251,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1243
1251
  })
1244
1252
  };
1245
1253
  }); // loading触发清空选中状态
1254
+ // useEffect(() => {
1255
+ // console.log(3)
1256
+ // setSelectedRows({ selectedRows: [] })
1257
+ // }, [loading])
1246
1258
 
1247
1259
 
1248
- (0, _react.useEffect)(function () {
1249
- setSelectedRows({
1250
- selectedRows: []
1251
- });
1252
- }, [loading]);
1253
-
1254
1260
  var onTableChange = function onTableChange(pagination, filters, sorter, extra) {
1255
1261
  var resultColumns = useColumns.map(function (item) {
1256
1262
  var obj = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
@@ -1450,13 +1456,13 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1450
1456
  var _props$autoSizer = props.autoSizer,
1451
1457
  autoSizer = _props$autoSizer === void 0 ? false : _props$autoSizer;
1452
1458
 
1453
- var _useState25 = (0, _react.useState)({
1459
+ var _useState23 = (0, _react.useState)({
1454
1460
  width: '100%',
1455
1461
  height: '100%'
1456
1462
  }),
1457
- _useState26 = (0, _slicedToArray2.default)(_useState25, 2),
1458
- tableSize = _useState26[0],
1459
- setTableSize = _useState26[1];
1463
+ _useState24 = (0, _slicedToArray2.default)(_useState23, 2),
1464
+ tableSize = _useState24[0],
1465
+ setTableSize = _useState24[1];
1460
1466
 
1461
1467
  var defaultRef = ref || (0, _react.useRef)(null);
1462
1468
  var tableWarpRef = (0, _react.useRef)(null);
@@ -0,0 +1,67 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.default = void 0;
7
+
8
+ var _react = require("react");
9
+
10
+ var _utils = require("ahooks/lib/utils");
11
+
12
+ var _ahooks = require("ahooks");
13
+
14
+ function useControllableValue() {
15
+ var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
16
+ var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
17
+ var defaultValue = options.defaultValue,
18
+ _options$defaultValue = options.defaultValuePropName,
19
+ defaultValuePropName = _options$defaultValue === void 0 ? 'defaultValue' : _options$defaultValue,
20
+ _options$valuePropNam = options.valuePropName,
21
+ valuePropName = _options$valuePropNam === void 0 ? 'value' : _options$valuePropNam,
22
+ _options$trigger = options.trigger,
23
+ trigger = _options$trigger === void 0 ? 'onChange' : _options$trigger;
24
+ var value = props[valuePropName];
25
+ var isControlled = props === null || props === void 0 ? void 0 : props.hasOwnProperty(valuePropName);
26
+ var isControlledOnChange = props[trigger];
27
+ var initialValue = (0, _react.useMemo)(function () {
28
+ if (isControlled) {
29
+ return value;
30
+ }
31
+
32
+ if (props === null || props === void 0 ? void 0 : props.hasOwnProperty(defaultValuePropName)) {
33
+ return props[defaultValuePropName];
34
+ }
35
+
36
+ return defaultValue;
37
+ }, []);
38
+ var stateRef = (0, _react.useRef)(initialValue);
39
+
40
+ if (isControlled && isControlledOnChange) {
41
+ stateRef.current = value;
42
+ }
43
+
44
+ var update = (0, _ahooks.useUpdate)();
45
+
46
+ function setState(v) {
47
+ var r = (0, _utils.isFunction)(v) ? v(stateRef.current) : v;
48
+
49
+ if (!isControlledOnChange) {
50
+ stateRef.current = r;
51
+ update();
52
+ }
53
+
54
+ if (props[trigger]) {
55
+ for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
56
+ args[_key - 1] = arguments[_key];
57
+ }
58
+
59
+ props[trigger].apply(props, [r].concat(args));
60
+ }
61
+ }
62
+
63
+ return [stateRef.current, (0, _ahooks.useMemoizedFn)(setState)];
64
+ }
65
+
66
+ var _default = useControllableValue;
67
+ exports.default = _default;
@@ -1237,6 +1237,9 @@ p {
1237
1237
  height: 48px;
1238
1238
  font-size: 12px;
1239
1239
  }
1240
+ #lm_protable_warp .ant-table-tbody > tr.ant-table-measure-row > td {
1241
+ padding: 0 !important;
1242
+ }
1240
1243
  .row-dragging {
1241
1244
  display: flex;
1242
1245
  align-items: center;
@@ -1589,9 +1592,6 @@ button.ant-table-row-expand-icon::before,
1589
1592
  button.ant-table-row-expand-icon::after {
1590
1593
  color: #bfbfbf;
1591
1594
  }
1592
- .ant-table-tbody > tr.ant-table-measure-row > td {
1593
- padding: 0 !important;
1594
- }
1595
1595
  .react-resizable-handle {
1596
1596
  position: absolute;
1597
1597
  right: -5px;
@@ -726,6 +726,9 @@
726
726
  height: 48px;
727
727
  font-size: 12px;
728
728
  }
729
+ #lm_protable_warp .ant-table-tbody > tr.ant-table-measure-row > td {
730
+ padding: 0 !important;
731
+ }
729
732
  .row-dragging {
730
733
  display: flex;
731
734
  align-items: center;
@@ -1078,9 +1081,6 @@ button.ant-table-row-expand-icon::before,
1078
1081
  button.ant-table-row-expand-icon::after {
1079
1082
  color: #bfbfbf;
1080
1083
  }
1081
- .ant-table-tbody > tr.ant-table-measure-row > td {
1082
- padding: 0 !important;
1083
- }
1084
1084
  .react-resizable-handle {
1085
1085
  position: absolute;
1086
1086
  right: -5px;
@@ -50,10 +50,12 @@ exports.range = range;
50
50
 
51
51
  function dataGroup(data, key) {
52
52
  var result = {};
53
- data.forEach(function (item) {
53
+ data === null || data === void 0 ? void 0 : data.forEach(function (item) {
54
54
  if (item.children) {
55
+ var _Object$keys;
56
+
55
57
  var temp = dataGroup(item.children, key);
56
- Object.keys(temp).forEach(function (k) {
58
+ (_Object$keys = Object.keys(temp)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(function (k) {
57
59
  if (!result[k]) result[k] = [];
58
60
  result[k] = result[k].concat(temp[k]);
59
61
  });
@@ -100,7 +102,7 @@ function transformWithColGroup(columns, dataSource, groupColKeys) {
100
102
  // 表头数据的生成,生成新的 dataIndex 值
101
103
  // dataIndex最后的i:筛选的值相同需要加索引
102
104
  var handledColumns = [];
103
- source.forEach(function (souItem, i) {
105
+ source === null || source === void 0 ? void 0 : source.forEach(function (souItem, i) {
104
106
  handledColumns = handledColumns.concat(columns.filter(function (c) {
105
107
  // 过滤掉(表头操作) 使用列分组作为key的项
106
108
  return groupColKeysCopy.indexOf(c.dataIndex) === -1;
@@ -143,9 +145,11 @@ function transformWithColGroup(columns, dataSource, groupColKeys) {
143
145
 
144
146
  return [].concat((0, _toConsumableArray2.default)(prev), [sItem]);
145
147
  } else {
148
+ var _Object$keys2;
149
+
146
150
  var str = ''; // 根据筛选条件生成对应的前缀key值,比如[name, age] => 'name_xiaoming_age_18'
147
151
 
148
- groupColKeysCopy.forEach(function (dataIndex, i) {
152
+ groupColKeysCopy === null || groupColKeysCopy === void 0 ? void 0 : groupColKeysCopy.forEach(function (dataIndex, i) {
149
153
  if (i !== 0) {
150
154
  str += '_';
151
155
  }
@@ -153,7 +157,7 @@ function transformWithColGroup(columns, dataSource, groupColKeys) {
153
157
  str += "".concat(dataIndex, "_").concat(sItem[dataIndex]);
154
158
  }); // 对dataSource的key值进行更改:例如:'name' => 'name_xiaoming_age_18_address'
155
159
 
156
- Object.keys(sItem).forEach(function (key) {
160
+ (_Object$keys2 = Object.keys(sItem)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.forEach(function (key) {
157
161
  if (key === '__index') {
158
162
  return;
159
163
  }
@@ -98,6 +98,7 @@ var LmUpload = function LmUpload(_a, ref) {
98
98
  maxCount: null,
99
99
  children: null,
100
100
  itemRender: null,
101
+ enabledPreview: true,
101
102
  enabledCrop: false,
102
103
  enabledOss: false,
103
104
  // oss配置
@@ -1,5 +1,6 @@
1
- declare const PictureItem: ({ file, instance }: {
1
+ declare const PictureItem: ({ file, index, instance }: {
2
2
  file: any;
3
+ index: any;
3
4
  instance: any;
4
5
  }) => JSX.Element;
5
6
  export default PictureItem;