linkmore-design 1.0.66 → 1.0.67

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 (139) hide show
  1. package/dist/Approval/index.d.ts +1 -21
  2. package/dist/Approval/type.d.ts +24 -0
  3. package/dist/LmTable/demos/musort.d.ts +2 -0
  4. package/dist/LmUpload/LmUpload.d.ts +3 -0
  5. package/dist/LmUpload/UploadList/ItemPicture.d.ts +4 -0
  6. package/dist/LmUpload/UploadList/ItemPictureCard.d.ts +5 -0
  7. package/dist/LmUpload/UploadList/ItemText.d.ts +4 -0
  8. package/dist/LmUpload/UploadList/RenderItem.d.ts +6 -0
  9. package/dist/LmUpload/UploadList/index.d.ts +4 -0
  10. package/dist/LmUpload/body/UploadCore.d.ts +4 -0
  11. package/dist/LmUpload/body/UploadDrag.d.ts +4 -0
  12. package/dist/LmUpload/body/UploadPicture.d.ts +4 -0
  13. package/dist/LmUpload/components/card.d.ts +2 -0
  14. package/dist/LmUpload/demos/basic.d.ts +2 -0
  15. package/dist/LmUpload/fns/index.d.ts +13 -0
  16. package/dist/LmUpload/index.d.ts +2 -0
  17. package/dist/LmUpload/style/index.d.ts +1 -0
  18. package/dist/LmUpload/utils.d.ts +4 -0
  19. package/dist/LmUpload/view/index.d.ts +4 -0
  20. package/dist/LmUpload/wrapper/Upload.d.ts +4 -0
  21. package/dist/LmUpload/wrapper/UploadContainer.d.ts +4 -0
  22. package/dist/LmUpload/wrapper/UploadRoot.d.ts +3 -0
  23. package/dist/LmUpload/wrapper/UploadWrapper.d.ts +4 -0
  24. package/dist/LmUpload/wrapper/reducer.d.ts +8 -0
  25. package/dist/index.umd.js +115 -53
  26. package/dist/index.umd.min.js +1 -1
  27. package/es/Approval/index.d.ts +1 -21
  28. package/es/Approval/index.js +127 -34
  29. package/es/Approval/style/index.css +75 -9
  30. package/es/Approval/type.d.ts +24 -0
  31. package/es/Approval/type.js +1 -0
  32. package/es/CustomTableOption/index.js +6 -6
  33. package/es/LmEditTable/DragHandle.js +2 -1
  34. package/es/LmEditTable/EditTable.js +85 -40
  35. package/es/LmEditTable/style/index.css +6 -0
  36. package/es/LmFilter/LmFilter.js +2 -0
  37. package/es/LmFilter/filterFns/index.js +2 -1
  38. package/es/LmFilter/wrapper/Filter.js +3 -2
  39. package/es/LmSelect/NormalSelect.js +5 -1
  40. package/es/LmSelect/style/index.css +2 -1
  41. package/es/LmSelect/useCheckboxOptions.js +2 -1
  42. package/es/LmTable/Table.js +16 -7
  43. package/es/LmUpload/LmUpload.d.ts +3 -0
  44. package/es/LmUpload/LmUpload.js +34 -0
  45. package/es/LmUpload/UploadList/ItemPicture.d.ts +4 -0
  46. package/es/LmUpload/UploadList/ItemPicture.js +25 -0
  47. package/es/LmUpload/UploadList/ItemPictureCard.d.ts +5 -0
  48. package/es/LmUpload/UploadList/ItemPictureCard.js +69 -0
  49. package/es/LmUpload/UploadList/ItemText.d.ts +4 -0
  50. package/es/LmUpload/UploadList/ItemText.js +25 -0
  51. package/es/LmUpload/UploadList/RenderItem.d.ts +6 -0
  52. package/es/LmUpload/UploadList/RenderItem.js +31 -0
  53. package/es/LmUpload/UploadList/index.d.ts +4 -0
  54. package/es/LmUpload/UploadList/index.js +21 -0
  55. package/es/LmUpload/body/UploadCore.d.ts +4 -0
  56. package/es/LmUpload/body/UploadCore.js +46 -0
  57. package/es/LmUpload/body/UploadDrag.d.ts +4 -0
  58. package/es/LmUpload/body/UploadDrag.js +10 -0
  59. package/es/LmUpload/body/UploadPicture.d.ts +4 -0
  60. package/es/LmUpload/body/UploadPicture.js +27 -0
  61. package/es/LmUpload/components/card.d.ts +2 -0
  62. package/es/LmUpload/components/card.js +9 -0
  63. package/es/LmUpload/fns/index.d.ts +13 -0
  64. package/es/LmUpload/fns/index.js +74 -0
  65. package/es/LmUpload/index.d.ts +2 -0
  66. package/es/LmUpload/index.js +2 -0
  67. package/es/LmUpload/style/index.css +188 -0
  68. package/es/LmUpload/style/index.js +3 -0
  69. package/es/LmUpload/utils.d.ts +4 -0
  70. package/es/LmUpload/utils.js +20 -0
  71. package/es/LmUpload/view/index.d.ts +4 -0
  72. package/es/LmUpload/view/index.js +10 -0
  73. package/es/LmUpload/wrapper/Upload.d.ts +4 -0
  74. package/es/LmUpload/wrapper/Upload.js +12 -0
  75. package/es/LmUpload/wrapper/UploadContainer.d.ts +4 -0
  76. package/es/LmUpload/wrapper/UploadContainer.js +12 -0
  77. package/es/LmUpload/wrapper/UploadRoot.d.ts +3 -0
  78. package/es/LmUpload/wrapper/UploadRoot.js +41 -0
  79. package/es/LmUpload/wrapper/UploadWrapper.d.ts +4 -0
  80. package/es/LmUpload/wrapper/UploadWrapper.js +21 -0
  81. package/es/LmUpload/wrapper/reducer.d.ts +8 -0
  82. package/es/LmUpload/wrapper/reducer.js +26 -0
  83. package/lib/Approval/index.d.ts +1 -21
  84. package/lib/Approval/index.js +126 -33
  85. package/lib/Approval/style/index.css +75 -9
  86. package/lib/Approval/type.d.ts +24 -0
  87. package/lib/Approval/type.js +5 -0
  88. package/lib/CustomTableOption/index.js +6 -6
  89. package/lib/LmEditTable/DragHandle.js +2 -1
  90. package/lib/LmEditTable/EditTable.js +85 -40
  91. package/lib/LmEditTable/style/index.css +6 -0
  92. package/lib/LmFilter/LmFilter.js +2 -0
  93. package/lib/LmFilter/filterFns/index.js +2 -1
  94. package/lib/LmFilter/wrapper/Filter.js +3 -2
  95. package/lib/LmSelect/NormalSelect.js +5 -1
  96. package/lib/LmSelect/style/index.css +2 -1
  97. package/lib/LmSelect/useCheckboxOptions.js +2 -1
  98. package/lib/LmTable/Table.js +16 -7
  99. package/lib/LmUpload/LmUpload.d.ts +3 -0
  100. package/lib/LmUpload/LmUpload.js +48 -0
  101. package/lib/LmUpload/UploadList/ItemPicture.d.ts +4 -0
  102. package/lib/LmUpload/UploadList/ItemPicture.js +37 -0
  103. package/lib/LmUpload/UploadList/ItemPictureCard.d.ts +5 -0
  104. package/lib/LmUpload/UploadList/ItemPictureCard.js +85 -0
  105. package/lib/LmUpload/UploadList/ItemText.d.ts +4 -0
  106. package/lib/LmUpload/UploadList/ItemText.js +36 -0
  107. package/lib/LmUpload/UploadList/RenderItem.d.ts +6 -0
  108. package/lib/LmUpload/UploadList/RenderItem.js +44 -0
  109. package/lib/LmUpload/UploadList/index.d.ts +4 -0
  110. package/lib/LmUpload/UploadList/index.js +32 -0
  111. package/lib/LmUpload/body/UploadCore.d.ts +4 -0
  112. package/lib/LmUpload/body/UploadCore.js +60 -0
  113. package/lib/LmUpload/body/UploadDrag.d.ts +4 -0
  114. package/lib/LmUpload/body/UploadDrag.js +21 -0
  115. package/lib/LmUpload/body/UploadPicture.d.ts +4 -0
  116. package/lib/LmUpload/body/UploadPicture.js +39 -0
  117. package/lib/LmUpload/components/card.d.ts +2 -0
  118. package/lib/LmUpload/components/card.js +19 -0
  119. package/lib/LmUpload/fns/index.d.ts +13 -0
  120. package/lib/LmUpload/fns/index.js +85 -0
  121. package/lib/LmUpload/index.d.ts +2 -0
  122. package/lib/LmUpload/index.js +13 -0
  123. package/lib/LmUpload/style/index.css +188 -0
  124. package/lib/LmUpload/style/index.js +3 -0
  125. package/lib/LmUpload/utils.d.ts +4 -0
  126. package/lib/LmUpload/utils.js +39 -0
  127. package/lib/LmUpload/view/index.d.ts +4 -0
  128. package/lib/LmUpload/view/index.js +20 -0
  129. package/lib/LmUpload/wrapper/Upload.d.ts +4 -0
  130. package/lib/LmUpload/wrapper/Upload.js +25 -0
  131. package/lib/LmUpload/wrapper/UploadContainer.d.ts +4 -0
  132. package/lib/LmUpload/wrapper/UploadContainer.js +25 -0
  133. package/lib/LmUpload/wrapper/UploadRoot.d.ts +3 -0
  134. package/lib/LmUpload/wrapper/UploadRoot.js +58 -0
  135. package/lib/LmUpload/wrapper/UploadWrapper.d.ts +4 -0
  136. package/lib/LmUpload/wrapper/UploadWrapper.js +36 -0
  137. package/lib/LmUpload/wrapper/reducer.d.ts +8 -0
  138. package/lib/LmUpload/wrapper/reducer.js +39 -0
  139. package/package.json +1 -1
@@ -289,7 +289,25 @@ var EditableCell = function EditableCell(props) {
289
289
 
290
290
  var _col$componentProps = col.componentProps,
291
291
  componentProps = _col$componentProps === void 0 ? {} : _col$componentProps,
292
- dataIndex = col.dataIndex; // const checkCellRef = useRef(null)
292
+ dataIndex = col.dataIndex;
293
+ /** 是否正在编辑中 */
294
+
295
+ var _useState = (0, _react.useState)(false),
296
+ _useState2 = (0, _slicedToArray2.default)(_useState, 2),
297
+ editing = _useState2[0],
298
+ setEditing = _useState2[1];
299
+
300
+ var inputRef = (0, _react.useRef)(null);
301
+ var form = (0, _react.useContext)(EditableContext);
302
+ (0, _react.useEffect)(function () {
303
+ if (editing) {
304
+ inputRef.current.focus();
305
+ }
306
+ }, [editing]);
307
+
308
+ var toggleEdit = function toggleEdit() {
309
+ setEditing(!editing); // form.setFieldsValue({ [dataIndex]: record[dataIndex] });
310
+ }; // const checkCellRef = useRef(null)
293
311
  // const focusCapturedRef = useRef(false);
294
312
  // const curValue = useMemo(() => {
295
313
  // return record?.dataIndex
@@ -297,6 +315,7 @@ var EditableCell = function EditableCell(props) {
297
315
  // const curValueIsValid = isValidValue(curValue);
298
316
  // 校验保存
299
317
 
318
+
300
319
  var save = function save(row) {
301
320
  return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regenerator.default.mark(function _callee() {
302
321
  var values;
@@ -340,19 +359,29 @@ var EditableCell = function EditableCell(props) {
340
359
  return form.validateFields();
341
360
 
342
361
  case 10:
343
- _context.next = 14;
362
+ if (col === null || col === void 0 ? void 0 : col.hoverEdit) {
363
+ toggleEdit();
364
+ } // // 清空异常校验
365
+ // setValid((old) => {
366
+ // const obj = { ...old }
367
+ // delete obj[record[rowKey]]
368
+ // return obj
369
+ // })
370
+
371
+
372
+ _context.next = 15;
344
373
  break;
345
374
 
346
- case 12:
347
- _context.prev = 12;
375
+ case 13:
376
+ _context.prev = 13;
348
377
  _context.t1 = _context["catch"](0);
349
378
 
350
- case 14:
379
+ case 15:
351
380
  case "end":
352
381
  return _context.stop();
353
382
  }
354
383
  }
355
- }, _callee, null, [[0, 12]]);
384
+ }, _callee, null, [[0, 13]]);
356
385
  }));
357
386
  }; // 触发保存
358
387
 
@@ -371,7 +400,6 @@ var EditableCell = function EditableCell(props) {
371
400
 
372
401
  var copyKey = function copyKey(e) {
373
402
  e === null || e === void 0 ? void 0 : e.stopPropagation();
374
- console.log(rowKey, record[rowKey], 'fff');
375
403
  var dataIndex = col.dataIndex;
376
404
  handleCopy === null || handleCopy === void 0 ? void 0 : handleCopy(dataIndex, record[dataIndex]);
377
405
  };
@@ -382,7 +410,7 @@ var EditableCell = function EditableCell(props) {
382
410
  return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Input, Object.assign({
383
411
  onPressEnter: handleFormItemChange,
384
412
  onBlur: handleFormItemChange,
385
- // ref={checkCellRef}
413
+ ref: inputRef,
386
414
  placeholder: "\u8BF7\u8F93\u5165"
387
415
  }, componentProps, {
388
416
  addonBefore: componentProps.addonBefore ? /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, {
@@ -397,7 +425,9 @@ var EditableCell = function EditableCell(props) {
397
425
  }, /*#__PURE__*/_react.default.cloneElement(componentProps.addonAfter, {
398
426
  onChange: handleFormItemChange
399
427
  })) : null,
400
- suffix: componentProps.quickcopy ? /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
428
+ suffix: componentProps.quickcopy ? /*#__PURE__*/_react.default.createElement("span", {
429
+ className: 'lm_table_quickcopy'
430
+ }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
401
431
  onClick: copyKey,
402
432
  type: 'lmweb-icon_m_brush'
403
433
  })) : null
@@ -405,7 +435,8 @@ var EditableCell = function EditableCell(props) {
405
435
 
406
436
  case 'inputRange':
407
437
  return /*#__PURE__*/_react.default.createElement(InputRange, Object.assign({
408
- onChange: handleFormItemChange
438
+ onChange: handleFormItemChange,
439
+ ref: inputRef
409
440
  }, componentProps));
410
441
 
411
442
  case 'number':
@@ -415,7 +446,8 @@ var EditableCell = function EditableCell(props) {
415
446
  style: {
416
447
  width: (editEnum === null || editEnum === void 0 ? void 0 : editEnum.width) || '100%'
417
448
  },
418
- placeholder: "\u8BF7\u8F93\u5165"
449
+ placeholder: "\u8BF7\u8F93\u5165",
450
+ ref: inputRef
419
451
  }, componentProps));
420
452
 
421
453
  case 'date':
@@ -429,7 +461,7 @@ var EditableCell = function EditableCell(props) {
429
461
  showSearch: true,
430
462
  allowClear: true,
431
463
  placeholder: "\u8BF7\u9009\u62E9",
432
- // ref={checkCellRef}
464
+ ref: inputRef,
433
465
  filterOption: function filterOption(input, option) {
434
466
  var _a, _b;
435
467
 
@@ -446,7 +478,7 @@ var EditableCell = function EditableCell(props) {
446
478
  showSearch: true,
447
479
  allowClear: true,
448
480
  placeholder: "\u8BF7\u9009\u62E9",
449
- // ref={checkCellRef}
481
+ ref: inputRef,
450
482
  filterOption: function filterOption(input, option) {
451
483
  var _a;
452
484
 
@@ -458,12 +490,14 @@ var EditableCell = function EditableCell(props) {
458
490
 
459
491
  case 'checkbox':
460
492
  return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox.Group, Object.assign({
461
- onChange: handleFormItemChange
493
+ onChange: handleFormItemChange,
494
+ ref: inputRef
462
495
  }, componentProps));
463
496
 
464
497
  case 'radio':
465
498
  return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group, Object.assign({
466
- onChange: handleFormItemChange
499
+ onChange: handleFormItemChange,
500
+ ref: inputRef
467
501
  }, componentProps));
468
502
 
469
503
  case 'switch':
@@ -474,7 +508,7 @@ var EditableCell = function EditableCell(props) {
474
508
  case 'upload':
475
509
  return /*#__PURE__*/_react.default.createElement(UploadSingle, {
476
510
  editEnum: componentProps,
477
- // ref={checkCellRef}
511
+ ref: inputRef,
478
512
  onChange: handleFormItemChange
479
513
  });
480
514
 
@@ -483,7 +517,7 @@ var EditableCell = function EditableCell(props) {
483
517
  return /*#__PURE__*/_react.default.createElement(Opetate, Object.assign({
484
518
  record: record,
485
519
  rowKey: rowKey,
486
- // ref={checkCellRef}
520
+ ref: inputRef,
487
521
  handleAdd: handleTableRowAdd,
488
522
  handleDelete: handleTableRowDelete,
489
523
  getLength: getLength
@@ -500,7 +534,8 @@ var EditableCell = function EditableCell(props) {
500
534
  default:
501
535
  return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Input, Object.assign({
502
536
  onPressEnter: handleFormItemChange,
503
- onBlur: handleFormItemChange
537
+ onBlur: handleFormItemChange,
538
+ ref: inputRef
504
539
  }, componentProps));
505
540
  }
506
541
  };
@@ -509,10 +544,19 @@ var EditableCell = function EditableCell(props) {
509
544
  var editable = col.editable,
510
545
  dataIndex = col.dataIndex,
511
546
  formProps = col.formProps,
512
- componentProps = col.componentProps;
547
+ componentProps = col.componentProps,
548
+ hoverEdit = col.hoverEdit;
513
549
  var childNode = children;
514
550
 
515
- if (isEdit && editable) {
551
+ if (hoverEdit && !editing) {
552
+ childNode = /*#__PURE__*/_react.default.createElement("div", {
553
+ className: "editable-cell-value-wrap",
554
+ style: {
555
+ minHeight: '22px'
556
+ },
557
+ onClick: toggleEdit
558
+ }, childNode);
559
+ } else if (isEdit && editable) {
516
560
  childNode = /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
517
561
  errorPlacement: "right",
518
562
  valuePropName: editable === 'switch' ? 'checked' : 'value',
@@ -536,9 +580,8 @@ var EditableCell = function EditableCell(props) {
536
580
  }
537
581
 
538
582
  return childNode;
539
- }, [col, isEdit]); // const [childNode, setChildNode] = useState(getMemoChildNode);
540
-
541
- var form = (0, _react.useContext)(EditableContext); // 出现死循环找我
583
+ }, [col, isEdit, editing]); // const [childNode, setChildNode] = useState(getMemoChildNode);
584
+ // 出现死循环找我
542
585
 
543
586
  (0, _react.useEffect)(function () {
544
587
  var editable = col.editable,
@@ -611,26 +654,26 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
611
654
  size = _props$size === void 0 ? 'small' : _props$size,
612
655
  resetProps = __rest(props, ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "rowSelection", "sortOpen", "colSortOpen", "filterChange", "size"]);
613
656
 
614
- var _useState = (0, _react.useState)([]),
615
- _useState2 = (0, _slicedToArray2.default)(_useState, 2),
616
- dataSource = _useState2[0],
617
- setDataSource = _useState2[1]; // const [count, setCount] = useState(0);
618
-
619
-
620
- var _useState3 = (0, _react.useState)({}),
657
+ var _useState3 = (0, _react.useState)([]),
621
658
  _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
622
- _valid = _useState4[0],
623
- setValid = _useState4[1];
659
+ dataSource = _useState4[0],
660
+ setDataSource = _useState4[1]; // const [count, setCount] = useState(0);
624
661
 
625
- var _useState5 = (0, _react.useState)([]),
662
+
663
+ var _useState5 = (0, _react.useState)({}),
626
664
  _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
627
- localRowSelectList = _useState6[0],
628
- setLocalRowSelectList = _useState6[1];
665
+ _valid = _useState6[0],
666
+ setValid = _useState6[1];
629
667
 
630
668
  var _useState7 = (0, _react.useState)([]),
631
669
  _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
632
- sortEditTable = _useState8[0],
633
- setCallBackFalg = _useState8[1];
670
+ localRowSelectList = _useState8[0],
671
+ setLocalRowSelectList = _useState8[1];
672
+
673
+ var _useState9 = (0, _react.useState)([]),
674
+ _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
675
+ sortEditTable = _useState10[0],
676
+ setCallBackFalg = _useState10[1];
634
677
 
635
678
  var dataSourceRef = (0, _react.useRef)([]);
636
679
  var sortDataSorceRef = (0, _react.useRef)([]);
@@ -938,9 +981,11 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
938
981
 
939
982
  return Object.assign(Object.assign({}, col), {
940
983
  shouldCellUpdate: function shouldCellUpdate(record, prevRecord) {
984
+ var _a;
985
+
941
986
  var dataIndex = col.dataIndex;
942
987
 
943
- if ((col === null || col === void 0 ? void 0 : col.fixed) || hasDisableOptions && hasDisableOptions.includes(dataIndex)) {
988
+ if ((col === null || col === void 0 ? void 0 : col.fixed) || hasDisableOptions && hasDisableOptions.includes(dataIndex) || ((_a = col.componentProps) === null || _a === void 0 ? void 0 : _a.options)) {
944
989
  return true;
945
990
  }
946
991
 
@@ -1117,8 +1162,8 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1117
1162
  style: {
1118
1163
  marginTop: 8
1119
1164
  }
1120
- }, /*#__PURE__*/_react.default.createElement(_icons.PlusCircleOutlined, {
1121
- className: "lmweb-plus"
1165
+ }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
1166
+ type: "lmweb-plus"
1122
1167
  }), "\u65B0\u589E"));
1123
1168
  });
1124
1169
 
@@ -512,6 +512,9 @@ html {
512
512
  line-height: 1;
513
513
  gap: 8px;
514
514
  }
515
+ .lm_editTable_warpper .ant-table-cell {
516
+ border-right: 0px !important;
517
+ }
515
518
  .lm_editTable_warpper .ant-table-cell:empty::before {
516
519
  content: '-';
517
520
  }
@@ -547,6 +550,9 @@ html {
547
550
  .lm_editTable_warpper .ant-form-item-explain-error {
548
551
  font-size: 12px;
549
552
  }
553
+ .lm_editTable_warpper .lm_table_quickcopy .anticon {
554
+ color: var(--text-color);
555
+ }
550
556
  .lm_editTable_warpper .ant-picker {
551
557
  height: 24px !important;
552
558
  padding: 2px 8px;
@@ -39,6 +39,8 @@ var LmFilter = function LmFilter(_ref, ref) {
39
39
  // 是否启用高级筛选
40
40
  enableCustom: false,
41
41
  // 是否启用自定义筛选
42
+ enableClear: true,
43
+ // 是否展示一件清空
42
44
  size: 'middle',
43
45
  // 尺寸
44
46
  searchKey: 'search',
@@ -379,10 +379,11 @@ var useCoreOptions = function useCoreOptions(_ref) {
379
379
  type: item.type,
380
380
  value: Array.isArray(itemValue) ? itemValue : [itemValue],
381
381
  operator: item.operator || 'equal'
382
- }));
382
+ })); // 数据清楚时不返回结构体
383
383
 
384
384
  if (!(0, _utils.getIsHas)(itemValue)) {
385
385
  delete basicFilter[field];
386
+ delete basicQuery[field];
386
387
  }
387
388
 
388
389
  ; // 触发外部事件
@@ -22,7 +22,8 @@ var LmFilter = /*#__PURE__*/_react.default.memo(function (_ref) {
22
22
  var instance = _ref.instance;
23
23
  var enableBaisc = instance.enableBaisc,
24
24
  enableComplex = instance.enableComplex,
25
- enableCustom = instance.enableCustom;
25
+ enableCustom = instance.enableCustom,
26
+ enableClear = instance.enableClear;
26
27
  return /*#__PURE__*/_react.default.createElement("div", {
27
28
  className: "lm_filter"
28
29
  }, enableCustom && /*#__PURE__*/_react.default.createElement(_customFilter.default, {
@@ -31,7 +32,7 @@ var LmFilter = /*#__PURE__*/_react.default.memo(function (_ref) {
31
32
  instance: instance
32
33
  }), enableComplex && /*#__PURE__*/_react.default.createElement(_complexFilter.default, {
33
34
  instance: instance
34
- }), /*#__PURE__*/_react.default.createElement(_clearFilter.default, {
35
+ }), enableClear && /*#__PURE__*/_react.default.createElement(_clearFilter.default, {
35
36
  instance: instance
36
37
  }));
37
38
  });
@@ -63,7 +63,7 @@ var NormalSelect = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
63
63
  showSearch = props.showSearch,
64
64
  others = __rest(props, ["children", "className", "dropdownClassName", "type", "options", "showSearch"]);
65
65
 
66
- var _React$useState = _react.default.useState([]),
66
+ var _React$useState = _react.default.useState(others.defaultValue || []),
67
67
  _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
68
68
  checkedValues = _React$useState2[0],
69
69
  setCheckedValues = _React$useState2[1];
@@ -82,6 +82,10 @@ var NormalSelect = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
82
82
 
83
83
  setCheckedValues(v);
84
84
  (_a = props === null || props === void 0 ? void 0 : props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, v, renderOptions === null || renderOptions === void 0 ? void 0 : renderOptions.filter(function (item) {
85
+ if (typeof v === 'boolean') {
86
+ return v === item.value;
87
+ }
88
+
85
89
  return v === null || v === void 0 ? void 0 : v.includes(item.value);
86
90
  }));
87
91
  });
@@ -704,7 +704,8 @@ html {
704
704
  transition: 0.3s;
705
705
  opacity: 0;
706
706
  }
707
- .select_dropdown .filter_body .filter_item[disabled] {
707
+ .select_dropdown .filter_body .filter_item[disabled],
708
+ .select_dropdown .filter_body .filter_item.disabled {
708
709
  display: none;
709
710
  }
710
711
  .select_dropdown .filter_body .filter_item.checked {
@@ -130,7 +130,8 @@ var useCheckboxOptions = function useCheckboxOptions(options, _ref) {
130
130
 
131
131
  return /*#__PURE__*/_react.default.createElement("div", Object.assign({}, resetProps, {
132
132
  className: (0, _classnames.default)('filter_item', {
133
- checked: checkedValues.includes(item.value)
133
+ checked: checkedValues.includes(item.value),
134
+ disabled: item.disabled
134
135
  }),
135
136
  onClick: function onClick(e) {
136
137
  return onChange(e, item);
@@ -39,8 +39,6 @@ var _reactResizable = require("react-resizable");
39
39
 
40
40
  var _reactSortableHoc = require("react-sortable-hoc");
41
41
 
42
- var _empty = _interopRequireDefault(require("./assets/empty.png"));
43
-
44
42
  var _resetConfig = _interopRequireDefault(require("./resetConfig"));
45
43
 
46
44
  var _excluded = ["dataSource", "autoSize", "columns", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "emptyProps"],
@@ -53,7 +51,7 @@ var DragHandle = (0, _reactSortableHoc.SortableHandle)(function () {
53
51
  return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
54
52
  type: "lmweb-icon-m-receipt1",
55
53
  style: {
56
- cursor: 'grab',
54
+ cursor: 'move',
57
55
  fontSize: '16px'
58
56
  }
59
57
  });
@@ -97,7 +95,6 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
97
95
  size = _props$size === void 0 ? 'default' : _props$size,
98
96
  emptyProps = props.emptyProps,
99
97
  resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
100
- console.log(emptyProps, '--emptyProps');
101
98
  var _resetProps$rowKey = resetProps.rowKey,
102
99
  rowKey = _resetProps$rowKey === void 0 ? 'id' : _resetProps$rowKey;
103
100
 
@@ -439,13 +436,25 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
439
436
 
440
437
  var onTableChange = function onTableChange(pagination, filters, sorter, extra) {
441
438
  var resultColumns = useColumns.map(function (item) {
442
- var obj = (0, _objectSpread2.default)({}, item);
439
+ var obj = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
440
+ sortOrder: false
441
+ });
443
442
  obj['filteredValue'] = filters[obj.dataIndex] || []; // if (filters[obj.dataIndex]) {
444
443
  // obj['filteredValue'] = filters[obj.dataIndex]
445
444
  // }
446
445
 
447
- if ((sorter === null || sorter === void 0 ? void 0 : sorter.field) === obj.dataIndex) {
448
- obj['sortOrder'] = sorter.order;
446
+ if (Array.isArray(sorter)) {
447
+ var checkSort = sorter.find(function (s) {
448
+ return s.field === obj.dataIndex;
449
+ });
450
+
451
+ if (checkSort) {
452
+ obj['sortOrder'] = checkSort.order;
453
+ }
454
+ } else {
455
+ if ((sorter === null || sorter === void 0 ? void 0 : sorter.field) === obj.dataIndex) {
456
+ obj['sortOrder'] = sorter.order;
457
+ }
449
458
  }
450
459
 
451
460
  return obj;
@@ -0,0 +1,3 @@
1
+ import React from 'react';
2
+ declare const _default: React.ForwardRefExoticComponent<Pick<any, string | number | symbol> & React.RefAttributes<unknown>>;
3
+ export default _default;
@@ -0,0 +1,48 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
4
+
5
+ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
6
+
7
+ Object.defineProperty(exports, "__esModule", {
8
+ value: true
9
+ });
10
+ exports.default = void 0;
11
+
12
+ var _react = _interopRequireWildcard(require("react"));
13
+
14
+ var _UploadRoot = _interopRequireDefault(require("./wrapper/UploadRoot"));
15
+
16
+ var LmUpload = function LmUpload(props, ref) {
17
+ var defaultRef = (0, _react.useRef)(null);
18
+ var defaultProps = {
19
+ value: [],
20
+ type: ['jpg', 'jpeg', 'png'],
21
+ accept: '',
22
+ fileSize: 10,
23
+ listType: 'card',
24
+ size: 100,
25
+ disabled: false,
26
+ maxCount: null,
27
+ children: null,
28
+ defaultFileList: [],
29
+ itemRender: null,
30
+ components: {
31
+ // 包装结构体: 上传, 列表
32
+ wrapper: function wrapper(upload, fileList) {
33
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, upload, fileList);
34
+ }
35
+ },
36
+ ossConfig: {} // defaultConfig: {
37
+ // label: '上传',
38
+ // },
39
+
40
+ };
41
+ return /*#__PURE__*/_react.default.createElement(_UploadRoot.default, Object.assign({
42
+ ref: ref || defaultRef
43
+ }, defaultProps, props));
44
+ };
45
+
46
+ var _default = /*#__PURE__*/(0, _react.forwardRef)(LmUpload);
47
+
48
+ exports.default = _default;
@@ -0,0 +1,4 @@
1
+ declare const PictureItem: ({ file }: {
2
+ file: any;
3
+ }) => JSX.Element;
4
+ export default PictureItem;
@@ -0,0 +1,37 @@
1
+ "use strict";
2
+
3
+ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
4
+
5
+ Object.defineProperty(exports, "__esModule", {
6
+ value: true
7
+ });
8
+ exports.default = void 0;
9
+
10
+ var React = _interopRequireWildcard(require("react"));
11
+
12
+ var _linkmoreDesign = require("linkmore-design");
13
+
14
+ // 图片列表项
15
+ var PictureItem = function PictureItem(_ref) {
16
+ var file = _ref.file;
17
+ return /*#__PURE__*/React.createElement("div", {
18
+ className: 'lm_upload_item lm_upload_item_picture'
19
+ }, /*#__PURE__*/React.createElement("div", {
20
+ className: 'picture_left'
21
+ }, /*#__PURE__*/React.createElement("div", {
22
+ className: 'lm_upload_item_thumb'
23
+ }, /*#__PURE__*/React.createElement("img", {
24
+ src: file.url
25
+ })), /*#__PURE__*/React.createElement("div", {
26
+ className: 'lm_upload_item_name'
27
+ }, file.fileName)), /*#__PURE__*/React.createElement("div", {
28
+ className: 'picture_right lm_upload_item_action'
29
+ }, /*#__PURE__*/React.createElement("div", {
30
+ className: 'action_delete'
31
+ }, /*#__PURE__*/React.createElement(_linkmoreDesign.IconFont, {
32
+ type: "lmweb-delete"
33
+ }))));
34
+ };
35
+
36
+ var _default = PictureItem;
37
+ exports.default = _default;
@@ -0,0 +1,5 @@
1
+ declare const PictureItem: ({ file, instance }: {
2
+ file: any;
3
+ instance: any;
4
+ }) => JSX.Element;
5
+ export default PictureItem;
@@ -0,0 +1,85 @@
1
+ "use strict";
2
+
3
+ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
4
+
5
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
6
+
7
+ Object.defineProperty(exports, "__esModule", {
8
+ value: true
9
+ });
10
+ exports.default = void 0;
11
+
12
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
13
+
14
+ var _react = _interopRequireWildcard(require("react"));
15
+
16
+ var _classnames = _interopRequireDefault(require("classnames"));
17
+
18
+ var _linkmoreDesign = require("linkmore-design");
19
+
20
+ // 图片列表项
21
+ var PictureItem = function PictureItem(_ref) {
22
+ var file = _ref.file,
23
+ instance = _ref.instance;
24
+ var size = instance.size;
25
+
26
+ var _useState = (0, _react.useState)(false),
27
+ _useState2 = (0, _slicedToArray2.default)(_useState, 2),
28
+ isError = _useState2[0],
29
+ setIsError = _useState2[1]; // 重置尺寸大小
30
+
31
+
32
+ var resetSize = (0, _react.useMemo)(function () {
33
+ var width = size - 16;
34
+ var padding = size > 60 ? 8 : 4;
35
+ var fontSize = size > 60 ? 16 : 14;
36
+ return {
37
+ width: width,
38
+ padding: padding,
39
+ fontSize: fontSize
40
+ };
41
+ }, [size]);
42
+ return /*#__PURE__*/_react.default.createElement("div", {
43
+ className: (0, _classnames.default)('lm_upload_item', 'lm_upload_item_card', isError && 'error'),
44
+ style: {
45
+ height: size,
46
+ width: size
47
+ }
48
+ }, /*#__PURE__*/_react.default.createElement("div", {
49
+ className: 'lm_upload_item_thumb'
50
+ }, isError ? /*#__PURE__*/_react.default.createElement("div", {
51
+ className: 'lm_upload_item_error'
52
+ }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
53
+ type: "lmweb-image"
54
+ }), /*#__PURE__*/_react.default.createElement("div", {
55
+ className: 'lm_upload_item_name'
56
+ }, file.fileName)) : /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Image, {
57
+ width: resetSize.width,
58
+ height: resetSize.width,
59
+ src: file.url,
60
+ onError: function onError() {
61
+ return setIsError(true);
62
+ }
63
+ })), /*#__PURE__*/_react.default.createElement("div", {
64
+ className: 'lm_upload_item_mask'
65
+ }, /*#__PURE__*/_react.default.createElement("div", {
66
+ className: 'lm_upload_item_action'
67
+ }, /*#__PURE__*/_react.default.createElement("div", {
68
+ className: 'action_preview'
69
+ }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
70
+ type: "lmweb-eye",
71
+ style: {
72
+ fontSize: size > 48 ? 16 : 12
73
+ }
74
+ })), /*#__PURE__*/_react.default.createElement("div", {
75
+ className: 'action_delete'
76
+ }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
77
+ type: "lmweb-delete",
78
+ style: {
79
+ fontSize: size > 48 ? 16 : 12
80
+ }
81
+ })))));
82
+ };
83
+
84
+ var _default = PictureItem;
85
+ exports.default = _default;
@@ -0,0 +1,4 @@
1
+ declare const TextItem: ({ file }: {
2
+ file: any;
3
+ }) => JSX.Element;
4
+ export default TextItem;
@@ -0,0 +1,36 @@
1
+ "use strict";
2
+
3
+ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
4
+
5
+ Object.defineProperty(exports, "__esModule", {
6
+ value: true
7
+ });
8
+ exports.default = void 0;
9
+
10
+ var React = _interopRequireWildcard(require("react"));
11
+
12
+ var _linkmoreDesign = require("linkmore-design");
13
+
14
+ var TextItem = function TextItem(_ref) {
15
+ var file = _ref.file;
16
+ return /*#__PURE__*/React.createElement("div", {
17
+ className: 'lm_upload_item lm_upload_item_text'
18
+ }, /*#__PURE__*/React.createElement("div", {
19
+ className: 'text_left'
20
+ }, /*#__PURE__*/React.createElement("div", {
21
+ className: 'prefix'
22
+ }, /*#__PURE__*/React.createElement(_linkmoreDesign.IconFont, {
23
+ type: "lmweb-attachment"
24
+ })), /*#__PURE__*/React.createElement("div", {
25
+ className: 'lm_upload_item_name'
26
+ }, file.fileName)), /*#__PURE__*/React.createElement("div", {
27
+ className: 'text_right lm_upload_item_text_action'
28
+ }, /*#__PURE__*/React.createElement("div", {
29
+ className: 'action_delete'
30
+ }, /*#__PURE__*/React.createElement(_linkmoreDesign.IconFont, {
31
+ type: "lmweb-delete"
32
+ }))));
33
+ };
34
+
35
+ var _default = TextItem;
36
+ exports.default = _default;