linkmore-design 1.1.28-alpha.7 → 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.
@@ -557,7 +557,7 @@ var EditableCell = function EditableCell(props) {
557
557
  onClick: toggleEdit
558
558
  }, childNode);
559
559
  } else if (isEdit && editable) {
560
- childNode = /*#__PURE__*/React.createElement("div", {
560
+ childNode = isExpandRow(childNode) ? /*#__PURE__*/React.createElement("div", {
561
561
  style: {
562
562
  display: 'flex',
563
563
  flexDirection: 'row',
@@ -572,10 +572,19 @@ var EditableCell = function EditableCell(props) {
572
572
  noStyle: formProps ? false : true
573
573
  }, formProps, {
574
574
  name: dataIndex
575
- }), 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));
576
585
 
577
586
  if (editable === 'input' && ((resultComponentProps === null || resultComponentProps === void 0 ? void 0 : resultComponentProps.addonBefore) || (resultComponentProps === null || resultComponentProps === void 0 ? void 0 : resultComponentProps.addonAfter))) {
578
- childNode = /*#__PURE__*/React.createElement("div", {
587
+ childNode = isExpandRow(childNode) ? /*#__PURE__*/React.createElement("div", {
579
588
  style: {
580
589
  display: 'flex',
581
590
  flexDirection: 'row',
@@ -589,7 +598,15 @@ var EditableCell = function EditableCell(props) {
589
598
  }, formProps, {
590
599
  noStyle: formProps ? false : true,
591
600
  name: [dataIndex, 'value']
592
- }), Control(editable)));
601
+ }), Control(editable))) : /*#__PURE__*/React.createElement(Form.Item, Object.assign({
602
+ errorPlacement: "right",
603
+ style: {
604
+ margin: 0
605
+ }
606
+ }, formProps, {
607
+ noStyle: formProps ? false : true,
608
+ name: [dataIndex, 'value']
609
+ }), Control(editable));
593
610
  }
594
611
  } else if (!isEdit && (componentProps === null || componentProps === void 0 ? void 0 : componentProps.options)) {
595
612
  return ((_b = (_a = componentProps === null || componentProps === void 0 ? void 0 : componentProps.options) === null || _a === void 0 ? void 0 : _a.find(function (item) {
@@ -1119,6 +1136,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1119
1136
  maxWidth: 48,
1120
1137
  className: 'drag-visible',
1121
1138
  fixed: 'left',
1139
+ order: -2,
1122
1140
  render: function render(_, record) {
1123
1141
  return /*#__PURE__*/React.createElement(DragHandle, {
1124
1142
  id: (record === null || record === void 0 ? void 0 : record[_rowKey]) || (record === null || record === void 0 ? void 0 : record.id)
@@ -1131,6 +1149,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1131
1149
  maxWidth: 48,
1132
1150
  ellipsis: true,
1133
1151
  fixed: 'left',
1152
+ order: -1,
1134
1153
  render: function render(_, record, index) {
1135
1154
  var _a, _b, _c;
1136
1155
 
@@ -1142,6 +1161,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1142
1161
  width: 48,
1143
1162
  ellipsis: true,
1144
1163
  maxWidth: 48,
1164
+ order: -1,
1145
1165
  fixed: 'left'
1146
1166
  }, indexCol || {}), {
1147
1167
  render: function render(_, record, index) {
@@ -1177,7 +1197,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1177
1197
  var mainColumns = [];
1178
1198
  var rightColumns = [];
1179
1199
  localColumns === null || localColumns === void 0 ? void 0 : localColumns.forEach(function (item) {
1180
- 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) {
1181
1201
  leftColumns.push(item);
1182
1202
  } else if ((item === null || item === void 0 ? void 0 : item.fixed) === 'right') {
1183
1203
  rightColumns.push(item);
@@ -1374,6 +1394,11 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1374
1394
  while (1) {
1375
1395
  switch (_context4.prev = _context4.next) {
1376
1396
  case 0:
1397
+ if (!virtual) {
1398
+ _context4.next = 17;
1399
+ break;
1400
+ }
1401
+
1377
1402
  fullNum = 0;
1378
1403
  flag = true;
1379
1404
  messageIndex = null;
@@ -1446,18 +1471,18 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1446
1471
  }));
1447
1472
  };
1448
1473
 
1449
- _context4.next = 8;
1474
+ _context4.next = 9;
1450
1475
  return deepValidator(dataSource, null);
1451
1476
 
1452
- case 8:
1477
+ case 9:
1453
1478
  if (!flag) {
1454
- _context4.next = 12;
1479
+ _context4.next = 13;
1455
1480
  break;
1456
1481
  }
1457
1482
 
1458
1483
  return _context4.abrupt("return", Promise.resolve(dataSource));
1459
1484
 
1460
- case 12:
1485
+ case 13:
1461
1486
  setTimeout(function () {
1462
1487
  var _a;
1463
1488
 
@@ -1526,7 +1551,18 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1526
1551
  }, 100);
1527
1552
  return _context4.abrupt("return", Promise.reject(errorInfo));
1528
1553
 
1529
- 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:
1530
1566
  case "end":
1531
1567
  return _context4.stop();
1532
1568
  }
@@ -1678,6 +1714,19 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1678
1714
  rowClassName: "editable-row",
1679
1715
  bordered: true,
1680
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),
1681
1730
  rowSelection: !rowSelection ? undefined : Object.assign(Object.assign({
1682
1731
  fixed: true,
1683
1732
  type: 'checkbox',
@@ -1725,10 +1774,10 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1725
1774
  } : undefined,
1726
1775
  pagination: false,
1727
1776
  // components={tableComponents}
1728
- expandable: (resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable) || {
1777
+ expandable: Object.assign({
1729
1778
  expandedRowKeys: expandedRowKeys,
1730
1779
  fixed: true,
1731
- // indentSize: 0,
1780
+ indentSize: 0,
1732
1781
  expandIconColumnIndex: checkExpandIconColumnIndex({
1733
1782
  rowSelection: rowSelection,
1734
1783
  sortOpen: sortOpen,
@@ -1737,7 +1786,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1737
1786
  onExpandedRowsChange: function onExpandedRowsChange(expandedRows) {
1738
1787
  return setExpandedRowKeys(expandedRows);
1739
1788
  }
1740
- },
1789
+ }, resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable),
1741
1790
  rowSelection: !rowSelection ? undefined : Object.assign(Object.assign({
1742
1791
  fixed: true,
1743
1792
  type: 'checkbox',
@@ -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);
@@ -591,7 +591,7 @@ var EditableCell = function EditableCell(props) {
591
591
  onClick: toggleEdit
592
592
  }, childNode);
593
593
  } else if (isEdit && editable) {
594
- childNode = /*#__PURE__*/_react.default.createElement("div", {
594
+ childNode = (0, _util.isExpandRow)(childNode) ? /*#__PURE__*/_react.default.createElement("div", {
595
595
  style: {
596
596
  display: 'flex',
597
597
  flexDirection: 'row',
@@ -606,10 +606,19 @@ var EditableCell = function EditableCell(props) {
606
606
  noStyle: formProps ? false : true
607
607
  }, formProps, {
608
608
  name: dataIndex
609
- }), Control(editable)));
609
+ }), Control(editable))) : /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
610
+ errorPlacement: "right",
611
+ valuePropName: editable === 'switch' ? 'checked' : 'value',
612
+ style: {
613
+ margin: 0
614
+ },
615
+ noStyle: formProps ? false : true
616
+ }, formProps, {
617
+ name: dataIndex
618
+ }), Control(editable));
610
619
 
611
620
  if (editable === 'input' && ((resultComponentProps === null || resultComponentProps === void 0 ? void 0 : resultComponentProps.addonBefore) || (resultComponentProps === null || resultComponentProps === void 0 ? void 0 : resultComponentProps.addonAfter))) {
612
- childNode = /*#__PURE__*/_react.default.createElement("div", {
621
+ childNode = (0, _util.isExpandRow)(childNode) ? /*#__PURE__*/_react.default.createElement("div", {
613
622
  style: {
614
623
  display: 'flex',
615
624
  flexDirection: 'row',
@@ -623,7 +632,15 @@ var EditableCell = function EditableCell(props) {
623
632
  }, formProps, {
624
633
  noStyle: formProps ? false : true,
625
634
  name: [dataIndex, 'value']
626
- }), Control(editable)));
635
+ }), Control(editable))) : /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
636
+ errorPlacement: "right",
637
+ style: {
638
+ margin: 0
639
+ }
640
+ }, formProps, {
641
+ noStyle: formProps ? false : true,
642
+ name: [dataIndex, 'value']
643
+ }), Control(editable));
627
644
  }
628
645
  } else if (!isEdit && (componentProps === null || componentProps === void 0 ? void 0 : componentProps.options)) {
629
646
  return ((_b = (_a = componentProps === null || componentProps === void 0 ? void 0 : componentProps.options) === null || _a === void 0 ? void 0 : _a.find(function (item) {
@@ -1153,6 +1170,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1153
1170
  maxWidth: 48,
1154
1171
  className: 'drag-visible',
1155
1172
  fixed: 'left',
1173
+ order: -2,
1156
1174
  render: function render(_, record) {
1157
1175
  return /*#__PURE__*/_react.default.createElement(_DragHandle.default, {
1158
1176
  id: (record === null || record === void 0 ? void 0 : record[_rowKey]) || (record === null || record === void 0 ? void 0 : record.id)
@@ -1165,6 +1183,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1165
1183
  maxWidth: 48,
1166
1184
  ellipsis: true,
1167
1185
  fixed: 'left',
1186
+ order: -1,
1168
1187
  render: function render(_, record, index) {
1169
1188
  var _a, _b, _c;
1170
1189
 
@@ -1176,6 +1195,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1176
1195
  width: 48,
1177
1196
  ellipsis: true,
1178
1197
  maxWidth: 48,
1198
+ order: -1,
1179
1199
  fixed: 'left'
1180
1200
  }, indexCol || {}), {
1181
1201
  render: function render(_, record, index) {
@@ -1211,7 +1231,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1211
1231
  var mainColumns = [];
1212
1232
  var rightColumns = [];
1213
1233
  localColumns === null || localColumns === void 0 ? void 0 : localColumns.forEach(function (item) {
1214
- if ((item === null || item === void 0 ? void 0 : item.fixed) === 'left') {
1234
+ if ((item === null || item === void 0 ? void 0 : item.fixed) === 'left' || (item === null || item === void 0 ? void 0 : item.fixed) === true) {
1215
1235
  leftColumns.push(item);
1216
1236
  } else if ((item === null || item === void 0 ? void 0 : item.fixed) === 'right') {
1217
1237
  rightColumns.push(item);
@@ -1407,6 +1427,11 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1407
1427
  while (1) {
1408
1428
  switch (_context4.prev = _context4.next) {
1409
1429
  case 0:
1430
+ if (!virtual) {
1431
+ _context4.next = 17;
1432
+ break;
1433
+ }
1434
+
1410
1435
  fullNum = 0;
1411
1436
  flag = true;
1412
1437
  messageIndex = null;
@@ -1479,18 +1504,18 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1479
1504
  }));
1480
1505
  };
1481
1506
 
1482
- _context4.next = 8;
1507
+ _context4.next = 9;
1483
1508
  return deepValidator(dataSource, null);
1484
1509
 
1485
- case 8:
1510
+ case 9:
1486
1511
  if (!flag) {
1487
- _context4.next = 12;
1512
+ _context4.next = 13;
1488
1513
  break;
1489
1514
  }
1490
1515
 
1491
1516
  return _context4.abrupt("return", Promise.resolve(dataSource));
1492
1517
 
1493
- case 12:
1518
+ case 13:
1494
1519
  setTimeout(function () {
1495
1520
  var _a;
1496
1521
 
@@ -1559,7 +1584,18 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1559
1584
  }, 100);
1560
1585
  return _context4.abrupt("return", Promise.reject(errorInfo));
1561
1586
 
1562
- case 14:
1587
+ case 15:
1588
+ _context4.next = 18;
1589
+ break;
1590
+
1591
+ case 17:
1592
+ return _context4.abrupt("return", Promise.all(Object.values(allFormListRef.current || []).map(function (item) {
1593
+ var _a;
1594
+
1595
+ return (_a = item === null || item === void 0 ? void 0 : item.form) === null || _a === void 0 ? void 0 : _a.validateFields();
1596
+ })));
1597
+
1598
+ case 18:
1563
1599
  case "end":
1564
1600
  return _context4.stop();
1565
1601
  }
@@ -1711,6 +1747,19 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1711
1747
  rowClassName: "editable-row",
1712
1748
  bordered: true,
1713
1749
  pagination: false,
1750
+ expandable: Object.assign({
1751
+ expandedRowKeys: expandedRowKeys,
1752
+ fixed: true,
1753
+ indentSize: 0,
1754
+ expandIconColumnIndex: (0, _util.checkExpandIconColumnIndex)({
1755
+ rowSelection: rowSelection,
1756
+ sortOpen: sortOpen,
1757
+ indexCol: indexCol
1758
+ }) || 0,
1759
+ onExpandedRowsChange: function onExpandedRowsChange(expandedRows) {
1760
+ return setExpandedRowKeys(expandedRows);
1761
+ }
1762
+ }, resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable),
1714
1763
  rowSelection: !rowSelection ? undefined : Object.assign(Object.assign({
1715
1764
  fixed: true,
1716
1765
  type: 'checkbox',
@@ -1758,10 +1807,10 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1758
1807
  } : undefined,
1759
1808
  pagination: false,
1760
1809
  // components={tableComponents}
1761
- expandable: (resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable) || {
1810
+ expandable: Object.assign({
1762
1811
  expandedRowKeys: expandedRowKeys,
1763
1812
  fixed: true,
1764
- // indentSize: 0,
1813
+ indentSize: 0,
1765
1814
  expandIconColumnIndex: (0, _util.checkExpandIconColumnIndex)({
1766
1815
  rowSelection: rowSelection,
1767
1816
  sortOpen: sortOpen,
@@ -1770,7 +1819,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1770
1819
  onExpandedRowsChange: function onExpandedRowsChange(expandedRows) {
1771
1820
  return setExpandedRowKeys(expandedRows);
1772
1821
  }
1773
- },
1822
+ }, resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable),
1774
1823
  rowSelection: !rowSelection ? undefined : Object.assign(Object.assign({
1775
1824
  fixed: true,
1776
1825
  type: 'checkbox',
@@ -88,7 +88,7 @@ function getExpandStatus(children) {
88
88
  }
89
89
 
90
90
  function checkMemoShouldUploadSpecialFun(prev, next) {
91
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
91
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
92
92
 
93
93
  var checkExpandStatus = getExpandStatus(prev.children) === getExpandStatus(next.children);
94
94
 
@@ -146,13 +146,17 @@ function checkMemoShouldUploadSpecialFun(prev, next) {
146
146
  return false;
147
147
  }
148
148
 
149
+ if (((_m = next.className) === null || _m === void 0 ? void 0 : _m.indexOf('ant-table-cell-with-append')) > -1) {
150
+ return false;
151
+ }
152
+
149
153
  if (next.className.indexOf('ant-table-selection-column') > -1) {
150
- return (0, _lodash.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);
154
+ return (0, _lodash.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);
151
155
  }
152
156
  /** 如果启用了快速复制功能,需要实时判断rowIndex与getLength */
153
157
 
154
158
 
155
- 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)) {
159
+ 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)) {
156
160
  var pickProps = ['record', 'colIndex', 'rowIndex', 'getLength'];
157
161
  var p = (0, _lodash.pick)(prev, pickProps);
158
162
  var n = (0, _lodash.pick)(next, pickProps);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "linkmore-design",
3
- "version": "1.1.28-alpha.7",
3
+ "version": "1.1.28-alpha.8",
4
4
  "author": {
5
5
  "name": "nowthen",
6
6
  "email": "rnlvwyx@gmail.com"