linkmore-design 1.1.28-alpha.6 → 1.1.28-alpha.8

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.
@@ -9734,7 +9734,7 @@ p {
9734
9734
  content: '-';
9735
9735
  }
9736
9736
  .lm_editTable_warpper .ant-table-thead .ant-table-cell {
9737
- height: 40px;
9737
+ min-height: 40px;
9738
9738
  padding: 10px 8px;
9739
9739
  font-family: PingFangSC-Medium;
9740
9740
  font-size: 12px;
@@ -9763,11 +9763,6 @@ p {
9763
9763
  .lm_editTable_warpper .lm_custom_cell_td {
9764
9764
  position: relative;
9765
9765
  }
9766
- .lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append {
9767
- display: flex;
9768
- flex-direction: row;
9769
- flex-wrap: nowrap;
9770
- }
9771
9766
  .lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append .ant-table-row-expand-icon {
9772
9767
  margin-right: 8px;
9773
9768
  flex: none;
@@ -117,9 +117,9 @@ var ColumnsSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
117
117
  var _a;
118
118
 
119
119
  var cloneCol = (_a = cloneDeep(localColumns)) === null || _a === void 0 ? void 0 : _a.filter(function (item) {
120
- var _a;
120
+ var _a, _b;
121
121
 
122
- return isFunction(item.title) ? false : ((_a = item.title) === null || _a === void 0 ? void 0 : _a.indexOf(searchValue)) > -1;
122
+ return isFunction(item.title) || ((_a = item.title) === null || _a === void 0 ? void 0 : _a.$$typeof) ? true : ((_b = item.title) === null || _b === void 0 ? void 0 : _b.indexOf(searchValue)) > -1;
123
123
  });
124
124
  cloneCol.forEach(function (item, index) {
125
125
  var _a, _b, _c;
@@ -283,7 +283,6 @@ var ColumnsSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
283
283
  }
284
284
  };
285
285
  });
286
- console.log(sortMenu, 'sortMenu');
287
286
  return /*#__PURE__*/React.createElement("div", {
288
287
  className: "lm_custom_option_columns"
289
288
  }, /*#__PURE__*/React.createElement("div", {
@@ -557,7 +557,13 @@ var EditableCell = function EditableCell(props) {
557
557
  onClick: toggleEdit
558
558
  }, childNode);
559
559
  } else if (isEdit && editable) {
560
- childNode = /*#__PURE__*/React.createElement(React.Fragment, null, isExpandRow(childNode) && childNode[0], /*#__PURE__*/React.createElement(Form.Item, Object.assign({
560
+ childNode = isExpandRow(childNode) ? /*#__PURE__*/React.createElement("div", {
561
+ style: {
562
+ display: 'flex',
563
+ flexDirection: 'row',
564
+ flexWrap: 'nowrap'
565
+ }
566
+ }, isExpandRow(childNode) && childNode[0], /*#__PURE__*/React.createElement(Form.Item, Object.assign({
561
567
  errorPlacement: "right",
562
568
  valuePropName: editable === 'switch' ? 'checked' : 'value',
563
569
  style: {
@@ -566,10 +572,33 @@ var EditableCell = function EditableCell(props) {
566
572
  noStyle: formProps ? false : true
567
573
  }, formProps, {
568
574
  name: dataIndex
569
- }), Control(editable)));
575
+ }), Control(editable))) : /*#__PURE__*/React.createElement(Form.Item, Object.assign({
576
+ errorPlacement: "right",
577
+ valuePropName: editable === 'switch' ? 'checked' : 'value',
578
+ style: {
579
+ margin: 0
580
+ },
581
+ noStyle: formProps ? false : true
582
+ }, formProps, {
583
+ name: dataIndex
584
+ }), Control(editable));
570
585
 
571
586
  if (editable === 'input' && ((resultComponentProps === null || resultComponentProps === void 0 ? void 0 : resultComponentProps.addonBefore) || (resultComponentProps === null || resultComponentProps === void 0 ? void 0 : resultComponentProps.addonAfter))) {
572
- childNode = /*#__PURE__*/React.createElement(React.Fragment, null, isExpandRow(childNode) && childNode[0], /*#__PURE__*/React.createElement(Form.Item, Object.assign({
587
+ childNode = isExpandRow(childNode) ? /*#__PURE__*/React.createElement("div", {
588
+ style: {
589
+ display: 'flex',
590
+ flexDirection: 'row',
591
+ flexWrap: 'nowrap'
592
+ }
593
+ }, isExpandRow(childNode) && childNode[0], /*#__PURE__*/React.createElement(Form.Item, Object.assign({
594
+ errorPlacement: "right",
595
+ style: {
596
+ margin: 0
597
+ }
598
+ }, formProps, {
599
+ noStyle: formProps ? false : true,
600
+ name: [dataIndex, 'value']
601
+ }), Control(editable))) : /*#__PURE__*/React.createElement(Form.Item, Object.assign({
573
602
  errorPlacement: "right",
574
603
  style: {
575
604
  margin: 0
@@ -577,7 +606,7 @@ var EditableCell = function EditableCell(props) {
577
606
  }, formProps, {
578
607
  noStyle: formProps ? false : true,
579
608
  name: [dataIndex, 'value']
580
- }), Control(editable)));
609
+ }), Control(editable));
581
610
  }
582
611
  } else if (!isEdit && (componentProps === null || componentProps === void 0 ? void 0 : componentProps.options)) {
583
612
  return ((_b = (_a = componentProps === null || componentProps === void 0 ? void 0 : componentProps.options) === null || _a === void 0 ? void 0 : _a.find(function (item) {
@@ -774,80 +803,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
774
803
  draft.push(Object.assign(_defineProperty({}, _rowKey, "".concat(Date.now())), addDataInfo || {}));
775
804
  });
776
805
  setDataSource(res);
777
- }, 40);
778
-
779
- var handleSave = function handleSave(row, options) {
780
- var _a, _b;
781
-
782
- var preKeys = (_b = (_a = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : deepDataSourceRef.current) === null || _a === void 0 ? void 0 : _a[row[_rowKey]]) === null || _b === void 0 ? void 0 : _b.preKeys;
783
- var res = produce(dataSourceRef.current, function (draft) {
784
- if (options === null || options === void 0 ? void 0 : options.only) {
785
- var _ref = options === null || options === void 0 ? void 0 : options.only,
786
- key = _ref.key,
787
- value = _ref.value;
788
-
789
- if ((preKeys === null || preKeys === void 0 ? void 0 : preKeys.length) > 1) {
790
- var deeps = function deeps(children) {
791
- children === null || children === void 0 ? void 0 : children.forEach(function (item) {
792
- var _a;
793
-
794
- if (preKeys.includes(item[_rowKey])) {
795
- if (item[_rowKey] === row[_rowKey]) {
796
- children === null || children === void 0 ? void 0 : children.forEach(function (c) {
797
- c[key] = value;
798
- });
799
- (_a = Object.keys(item)) === null || _a === void 0 ? void 0 : _a.forEach(function (v) {
800
- item[v] = row[v] || item[v];
801
- });
802
- } else if (item.children) {
803
- deeps(item.children);
804
- }
805
- }
806
- });
807
- };
808
-
809
- deeps(draft);
810
- } else {
811
- draft === null || draft === void 0 ? void 0 : draft.forEach(function (item, index) {
812
- if (row[_rowKey] === item[_rowKey]) {
813
- draft[index] = row;
814
- } else {
815
- draft[index][key] = value;
816
- }
817
- });
818
- }
819
- } else {
820
- if ((preKeys === null || preKeys === void 0 ? void 0 : preKeys.length) > 1) {
821
- var _deeps = function _deeps(children) {
822
- children === null || children === void 0 ? void 0 : children.forEach(function (item) {
823
- var _a;
824
-
825
- if (preKeys.includes(item[_rowKey])) {
826
- if (item[_rowKey] === row[_rowKey]) {
827
- (_a = Object.keys(row)) === null || _a === void 0 ? void 0 : _a.forEach(function (v) {
828
- item[v] = row[v] || item[v];
829
- });
830
- } else if (item.children) {
831
- _deeps(item.children);
832
- }
833
- }
834
- });
835
- };
836
-
837
- _deeps(draft);
838
- } else {
839
- var index = draft.findIndex(function (item) {
840
- return row[_rowKey] === item[_rowKey];
841
- });
842
-
843
- if (index !== -1) {
844
- draft[index] = row;
845
- }
846
- }
847
- }
848
- });
849
- setDataSource(res);
850
- }; // const reWriteOriginSource = (rowKey: string, rowValue, dataIndex: number, nextValue) => {
806
+ }, 40); // const reWriteOriginSource = (rowKey: string, rowValue, dataIndex: number, nextValue) => {
851
807
  // setDataSource((prevDataSource) => {
852
808
  // return prevDataSource?.map((item) => {
853
809
  // if (get(item, rowKey) === rowValue) {
@@ -861,7 +817,6 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
861
817
 
862
818
  /** 删除当前行 */
863
819
 
864
-
865
820
  var handleTableRowDelete = debounce(function (key) {
866
821
  var _a, _b, _c;
867
822
 
@@ -934,7 +889,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
934
889
 
935
890
  var res = deep(dataSourceRef.current);
936
891
  setDataSource(res);
937
- }, 40);
892
+ }, 20);
938
893
  /** 快捷添加 */
939
894
 
940
895
  var handleTableRowAdd = debounce(function (record, isAppendInChindren, defaultRecord) {
@@ -1017,8 +972,87 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1017
972
  });
1018
973
  setDataSource(res);
1019
974
  }, 50);
975
+
976
+ var handleSave = function handleSave(row, options) {
977
+ var _a, _b;
978
+
979
+ var preKeys = (_b = (_a = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : deepDataSourceRef.current) === null || _a === void 0 ? void 0 : _a[row[_rowKey]]) === null || _b === void 0 ? void 0 : _b.preKeys;
980
+
981
+ if (options === null || options === void 0 ? void 0 : options.only) {
982
+ var res = produce(dataSourceRef.current, function (draft) {
983
+ if (options === null || options === void 0 ? void 0 : options.only) {
984
+ var _ref7 = options === null || options === void 0 ? void 0 : options.only,
985
+ key = _ref7.key,
986
+ value = _ref7.value;
987
+
988
+ if ((preKeys === null || preKeys === void 0 ? void 0 : preKeys.length) > 1) {
989
+ var deeps = function deeps(children) {
990
+ children === null || children === void 0 ? void 0 : children.forEach(function (item) {
991
+ var _a;
992
+
993
+ if (preKeys.includes(item[_rowKey])) {
994
+ if (item[_rowKey] === row[_rowKey]) {
995
+ children === null || children === void 0 ? void 0 : children.forEach(function (c) {
996
+ c[key] = value;
997
+ });
998
+ (_a = Object.keys(item)) === null || _a === void 0 ? void 0 : _a.forEach(function (v) {
999
+ item[v] = row[v] || item[v];
1000
+ });
1001
+ } else if (item.children) {
1002
+ deeps(item.children);
1003
+ }
1004
+ }
1005
+ });
1006
+ };
1007
+
1008
+ deeps(draft);
1009
+ } else {
1010
+ draft === null || draft === void 0 ? void 0 : draft.forEach(function (item, index) {
1011
+ if (row[_rowKey] === item[_rowKey]) {
1012
+ draft[index] = row;
1013
+ } else {
1014
+ draft[index][key] = value;
1015
+ }
1016
+ });
1017
+ }
1018
+ } else {
1019
+ if ((preKeys === null || preKeys === void 0 ? void 0 : preKeys.length) > 1) {
1020
+ var _deeps = function _deeps(children) {
1021
+ children === null || children === void 0 ? void 0 : children.forEach(function (item) {
1022
+ var _a;
1023
+
1024
+ if (preKeys.includes(item[_rowKey])) {
1025
+ if (item[_rowKey] === row[_rowKey]) {
1026
+ (_a = Object.keys(row)) === null || _a === void 0 ? void 0 : _a.forEach(function (v) {
1027
+ item[v] = row[v] || item[v];
1028
+ });
1029
+ } else if (item.children) {
1030
+ _deeps(item.children);
1031
+ }
1032
+ }
1033
+ });
1034
+ };
1035
+
1036
+ _deeps(draft);
1037
+ } else {
1038
+ var index = draft.findIndex(function (item) {
1039
+ return row[_rowKey] === item[_rowKey];
1040
+ });
1041
+
1042
+ if (index !== -1) {
1043
+ draft[index] = row;
1044
+ }
1045
+ }
1046
+ }
1047
+ });
1048
+ setDataSource(res);
1049
+ } else {
1050
+ handleTableRowReplace(row[_rowKey], row);
1051
+ }
1052
+ };
1020
1053
  /** 快捷刷子功能 */
1021
1054
 
1055
+
1022
1056
  var handleCopy = function handleCopy(key, value, type, rowIndex) {
1023
1057
  var res = produce(dataSourceRef.current, function (draft) {
1024
1058
  draft === null || draft === void 0 ? void 0 : draft.forEach(function (item, index) {
@@ -1102,6 +1136,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1102
1136
  maxWidth: 48,
1103
1137
  className: 'drag-visible',
1104
1138
  fixed: 'left',
1139
+ order: -2,
1105
1140
  render: function render(_, record) {
1106
1141
  return /*#__PURE__*/React.createElement(DragHandle, {
1107
1142
  id: (record === null || record === void 0 ? void 0 : record[_rowKey]) || (record === null || record === void 0 ? void 0 : record.id)
@@ -1114,6 +1149,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1114
1149
  maxWidth: 48,
1115
1150
  ellipsis: true,
1116
1151
  fixed: 'left',
1152
+ order: -1,
1117
1153
  render: function render(_, record, index) {
1118
1154
  var _a, _b, _c;
1119
1155
 
@@ -1125,6 +1161,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1125
1161
  width: 48,
1126
1162
  ellipsis: true,
1127
1163
  maxWidth: 48,
1164
+ order: -1,
1128
1165
  fixed: 'left'
1129
1166
  }, indexCol || {}), {
1130
1167
  render: function render(_, record, index) {
@@ -1160,7 +1197,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1160
1197
  var mainColumns = [];
1161
1198
  var rightColumns = [];
1162
1199
  localColumns === null || localColumns === void 0 ? void 0 : localColumns.forEach(function (item) {
1163
- if ((item === null || item === void 0 ? void 0 : item.fixed) === 'left') {
1200
+ if ((item === null || item === void 0 ? void 0 : item.fixed) === 'left' || (item === null || item === void 0 ? void 0 : item.fixed) === true) {
1164
1201
  leftColumns.push(item);
1165
1202
  } else if ((item === null || item === void 0 ? void 0 : item.fixed) === 'right') {
1166
1203
  rightColumns.push(item);
@@ -1357,6 +1394,11 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1357
1394
  while (1) {
1358
1395
  switch (_context4.prev = _context4.next) {
1359
1396
  case 0:
1397
+ if (!virtual) {
1398
+ _context4.next = 17;
1399
+ break;
1400
+ }
1401
+
1360
1402
  fullNum = 0;
1361
1403
  flag = true;
1362
1404
  messageIndex = null;
@@ -1429,18 +1471,18 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1429
1471
  }));
1430
1472
  };
1431
1473
 
1432
- _context4.next = 8;
1474
+ _context4.next = 9;
1433
1475
  return deepValidator(dataSource, null);
1434
1476
 
1435
- case 8:
1477
+ case 9:
1436
1478
  if (!flag) {
1437
- _context4.next = 12;
1479
+ _context4.next = 13;
1438
1480
  break;
1439
1481
  }
1440
1482
 
1441
1483
  return _context4.abrupt("return", Promise.resolve(dataSource));
1442
1484
 
1443
- case 12:
1485
+ case 13:
1444
1486
  setTimeout(function () {
1445
1487
  var _a;
1446
1488
 
@@ -1509,7 +1551,18 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1509
1551
  }, 100);
1510
1552
  return _context4.abrupt("return", Promise.reject(errorInfo));
1511
1553
 
1512
- case 14:
1554
+ case 15:
1555
+ _context4.next = 18;
1556
+ break;
1557
+
1558
+ case 17:
1559
+ return _context4.abrupt("return", Promise.all(Object.values(allFormListRef.current || []).map(function (item) {
1560
+ var _a;
1561
+
1562
+ return (_a = item === null || item === void 0 ? void 0 : item.form) === null || _a === void 0 ? void 0 : _a.validateFields();
1563
+ })));
1564
+
1565
+ case 18:
1513
1566
  case "end":
1514
1567
  return _context4.stop();
1515
1568
  }
@@ -1614,6 +1667,29 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1614
1667
  };
1615
1668
  }
1616
1669
  }, []);
1670
+ var checkFormItem = useMemo(function () {
1671
+ var arr = [];
1672
+ columns.forEach(function (item) {
1673
+ var _a;
1674
+
1675
+ if (item.children) {
1676
+ (_a = item.children) === null || _a === void 0 ? void 0 : _a.forEach(function (c) {
1677
+ arr.push( /*#__PURE__*/React.createElement(Form.Item, Object.assign({
1678
+ noStyle: true,
1679
+ key: c.dataIndex,
1680
+ name: c.dataIndex
1681
+ }, (c === null || c === void 0 ? void 0 : c['formProps']) || {}), c.dataIndex || 'text'));
1682
+ });
1683
+ } else {
1684
+ arr.push( /*#__PURE__*/React.createElement(Form.Item, Object.assign({
1685
+ noStyle: true,
1686
+ key: item.dataIndex,
1687
+ name: item.dataIndex
1688
+ }, (item === null || item === void 0 ? void 0 : item['formProps']) || {}), item.dataIndex || 'text'));
1689
+ }
1690
+ });
1691
+ return arr;
1692
+ }, [columns]);
1617
1693
 
1618
1694
  if (colSortOpen) {
1619
1695
  return /*#__PURE__*/React.createElement("div", {
@@ -1638,6 +1714,19 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1638
1714
  rowClassName: "editable-row",
1639
1715
  bordered: true,
1640
1716
  pagination: false,
1717
+ expandable: Object.assign({
1718
+ expandedRowKeys: expandedRowKeys,
1719
+ fixed: true,
1720
+ indentSize: 0,
1721
+ expandIconColumnIndex: checkExpandIconColumnIndex({
1722
+ rowSelection: rowSelection,
1723
+ sortOpen: sortOpen,
1724
+ indexCol: indexCol
1725
+ }) || 0,
1726
+ onExpandedRowsChange: function onExpandedRowsChange(expandedRows) {
1727
+ return setExpandedRowKeys(expandedRows);
1728
+ }
1729
+ }, resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable),
1641
1730
  rowSelection: !rowSelection ? undefined : Object.assign(Object.assign({
1642
1731
  fixed: true,
1643
1732
  type: 'checkbox',
@@ -1663,13 +1752,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1663
1752
  }, /*#__PURE__*/React.createElement(Form, {
1664
1753
  form: checkForm,
1665
1754
  component: false
1666
- }, columns.map(function (item) {
1667
- return /*#__PURE__*/React.createElement(Form.Item, Object.assign({
1668
- noStyle: true,
1669
- key: item.dataIndex,
1670
- name: item.dataIndex
1671
- }, (item === null || item === void 0 ? void 0 : item['formProps']) || {}), item.dataIndex || 'text');
1672
- }))));
1755
+ }, checkFormItem)));
1673
1756
  } // @ts-ignore
1674
1757
 
1675
1758
 
@@ -1691,10 +1774,10 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1691
1774
  } : undefined,
1692
1775
  pagination: false,
1693
1776
  // components={tableComponents}
1694
- expandable: (resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable) || {
1777
+ expandable: Object.assign({
1695
1778
  expandedRowKeys: expandedRowKeys,
1696
1779
  fixed: true,
1697
- // indentSize: 0,
1780
+ indentSize: 0,
1698
1781
  expandIconColumnIndex: checkExpandIconColumnIndex({
1699
1782
  rowSelection: rowSelection,
1700
1783
  sortOpen: sortOpen,
@@ -1703,7 +1786,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1703
1786
  onExpandedRowsChange: function onExpandedRowsChange(expandedRows) {
1704
1787
  return setExpandedRowKeys(expandedRows);
1705
1788
  }
1706
- },
1789
+ }, resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable),
1707
1790
  rowSelection: !rowSelection ? undefined : Object.assign(Object.assign({
1708
1791
  fixed: true,
1709
1792
  type: 'checkbox',
@@ -1729,12 +1812,6 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1729
1812
  }, /*#__PURE__*/React.createElement(Form, {
1730
1813
  form: checkForm,
1731
1814
  component: false
1732
- }, columns.map(function (item) {
1733
- return /*#__PURE__*/React.createElement(Form.Item, Object.assign({
1734
- noStyle: true,
1735
- key: item.dataIndex,
1736
- name: item.dataIndex
1737
- }, (item === null || item === void 0 ? void 0 : item['formProps']) || {}), item.dataIndex || 'text');
1738
- }))));
1815
+ }, checkFormItem)));
1739
1816
  });
1740
1817
  export default /*#__PURE__*/memo(EditTable);
@@ -530,7 +530,7 @@ p {
530
530
  content: '-';
531
531
  }
532
532
  .lm_editTable_warpper .ant-table-thead .ant-table-cell {
533
- height: 40px;
533
+ min-height: 40px;
534
534
  padding: 10px 8px;
535
535
  font-family: PingFangSC-Medium;
536
536
  font-size: 12px;
@@ -559,11 +559,6 @@ p {
559
559
  .lm_editTable_warpper .lm_custom_cell_td {
560
560
  position: relative;
561
561
  }
562
- .lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append {
563
- display: flex;
564
- flex-direction: row;
565
- flex-wrap: nowrap;
566
- }
567
562
  .lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append .ant-table-row-expand-icon {
568
563
  margin-right: 8px;
569
564
  flex: none;
@@ -18,7 +18,7 @@
18
18
  content: '-';
19
19
  }
20
20
  .lm_editTable_warpper .ant-table-thead .ant-table-cell {
21
- height: 40px;
21
+ min-height: 40px;
22
22
  padding: 10px 8px;
23
23
  font-family: PingFangSC-Medium;
24
24
  font-size: 12px;
@@ -47,11 +47,6 @@
47
47
  .lm_editTable_warpper .lm_custom_cell_td {
48
48
  position: relative;
49
49
  }
50
- .lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append {
51
- display: flex;
52
- flex-direction: row;
53
- flex-wrap: nowrap;
54
- }
55
50
  .lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append .ant-table-row-expand-icon {
56
51
  margin-right: 8px;
57
52
  flex: none;
@@ -62,7 +62,7 @@ export function getExpandStatus(children) {
62
62
  return isExpandRow(children) ? (_e = (_d = (_c = (_b = (_a = children === null || children === void 0 ? void 0 : children[0]) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.children) === null || _c === void 0 ? void 0 : _c[1]) === null || _d === void 0 ? void 0 : _d.props) === null || _e === void 0 ? void 0 : _e['aria-label'] : '';
63
63
  }
64
64
  export function checkMemoShouldUploadSpecialFun(prev, next) {
65
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
65
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
66
66
 
67
67
  var checkExpandStatus = getExpandStatus(prev.children) === getExpandStatus(next.children);
68
68
 
@@ -120,13 +120,17 @@ export function checkMemoShouldUploadSpecialFun(prev, next) {
120
120
  return false;
121
121
  }
122
122
 
123
+ if (((_m = next.className) === null || _m === void 0 ? void 0 : _m.indexOf('ant-table-cell-with-append')) > -1) {
124
+ return false;
125
+ }
126
+
123
127
  if (next.className.indexOf('ant-table-selection-column') > -1) {
124
- return isEqual((_o = (_m = prev.children) === null || _m === void 0 ? void 0 : _m[1]) === null || _o === void 0 ? void 0 : _o.props, (_q = (_p = next.children) === null || _p === void 0 ? void 0 : _p[1]) === null || _q === void 0 ? void 0 : _q.props);
128
+ return isEqual((_p = (_o = prev.children) === null || _o === void 0 ? void 0 : _o[1]) === null || _p === void 0 ? void 0 : _p.props, (_r = (_q = next.children) === null || _q === void 0 ? void 0 : _q[1]) === null || _r === void 0 ? void 0 : _r.props);
125
129
  }
126
130
  /** 如果启用了快速复制功能,需要实时判断rowIndex与getLength */
127
131
 
128
132
 
129
- if (((_r = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _r === void 0 ? void 0 : _r.quickcopy) || ((_s = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _s === void 0 ? void 0 : _s.quickcopy)) {
133
+ if (((_s = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _s === void 0 ? void 0 : _s.quickcopy) || ((_t = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _t === void 0 ? void 0 : _t.quickcopy)) {
130
134
  var pickProps = ['record', 'colIndex', 'rowIndex', 'getLength'];
131
135
  var p = pick(prev, pickProps);
132
136
  var n = pick(next, pickProps);
@@ -9734,7 +9734,7 @@ p {
9734
9734
  content: '-';
9735
9735
  }
9736
9736
  .lm_editTable_warpper .ant-table-thead .ant-table-cell {
9737
- height: 40px;
9737
+ min-height: 40px;
9738
9738
  padding: 10px 8px;
9739
9739
  font-family: PingFangSC-Medium;
9740
9740
  font-size: 12px;
@@ -9763,11 +9763,6 @@ p {
9763
9763
  .lm_editTable_warpper .lm_custom_cell_td {
9764
9764
  position: relative;
9765
9765
  }
9766
- .lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append {
9767
- display: flex;
9768
- flex-direction: row;
9769
- flex-wrap: nowrap;
9770
- }
9771
9766
  .lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append .ant-table-row-expand-icon {
9772
9767
  margin-right: 8px;
9773
9768
  flex: none;
@@ -139,9 +139,9 @@ var ColumnsSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
139
139
  var _a;
140
140
 
141
141
  var cloneCol = (_a = (0, _lodash.cloneDeep)(localColumns)) === null || _a === void 0 ? void 0 : _a.filter(function (item) {
142
- var _a;
142
+ var _a, _b;
143
143
 
144
- return (0, _lodash.isFunction)(item.title) ? false : ((_a = item.title) === null || _a === void 0 ? void 0 : _a.indexOf(searchValue)) > -1;
144
+ return (0, _lodash.isFunction)(item.title) || ((_a = item.title) === null || _a === void 0 ? void 0 : _a.$$typeof) ? true : ((_b = item.title) === null || _b === void 0 ? void 0 : _b.indexOf(searchValue)) > -1;
145
145
  });
146
146
  cloneCol.forEach(function (item, index) {
147
147
  var _a, _b, _c;
@@ -305,7 +305,6 @@ var ColumnsSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
305
305
  }
306
306
  };
307
307
  });
308
- console.log(sortMenu, 'sortMenu');
309
308
  return /*#__PURE__*/_react.default.createElement("div", {
310
309
  className: "lm_custom_option_columns"
311
310
  }, /*#__PURE__*/_react.default.createElement("div", {