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

package/lib/LmEditTable/EditTable.js

@@ -591,7 +591,13 @@ var EditableCell = function EditableCell(props) {
         onClick: toggleEdit
       }, childNode);
     } else if (isEdit && editable) {
-      childNode = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _util.isExpandRow)(childNode) && childNode[0], /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
+      childNode = (0, _util.isExpandRow)(childNode) ? /*#__PURE__*/_react.default.createElement("div", {
+        style: {
+          display: 'flex',
+          flexDirection: 'row',
+          flexWrap: 'nowrap'
+        }
+      }, (0, _util.isExpandRow)(childNode) && childNode[0], /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
         errorPlacement: "right",
         valuePropName: editable === 'switch' ? 'checked' : 'value',
         style: {
@@ -600,10 +606,33 @@ var EditableCell = function EditableCell(props) {
         noStyle: formProps ? false : true
       }, formProps, {
         name: dataIndex
-      }), Control(editable)));
+      }), Control(editable))) : /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
+        errorPlacement: "right",
+        valuePropName: editable === 'switch' ? 'checked' : 'value',
+        style: {
+          margin: 0
+        },
+        noStyle: formProps ? false : true
+      }, formProps, {
+        name: dataIndex
+      }), Control(editable));
 
       if (editable === 'input' && ((resultComponentProps === null || resultComponentProps === void 0 ? void 0 : resultComponentProps.addonBefore) || (resultComponentProps === null || resultComponentProps === void 0 ? void 0 : resultComponentProps.addonAfter))) {
-        childNode = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _util.isExpandRow)(childNode) && childNode[0], /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
+        childNode = (0, _util.isExpandRow)(childNode) ? /*#__PURE__*/_react.default.createElement("div", {
+          style: {
+            display: 'flex',
+            flexDirection: 'row',
+            flexWrap: 'nowrap'
+          }
+        }, (0, _util.isExpandRow)(childNode) && childNode[0], /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
+          errorPlacement: "right",
+          style: {
+            margin: 0
+          }
+        }, formProps, {
+          noStyle: formProps ? false : true,
+          name: [dataIndex, 'value']
+        }), Control(editable))) : /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
           errorPlacement: "right",
           style: {
             margin: 0
@@ -611,7 +640,7 @@ var EditableCell = function EditableCell(props) {
         }, formProps, {
           noStyle: formProps ? false : true,
           name: [dataIndex, 'value']
-        }), Control(editable)));
+        }), Control(editable));
       }
     } else if (!isEdit && (componentProps === null || componentProps === void 0 ? void 0 : componentProps.options)) {
       return ((_b = (_a = componentProps === null || componentProps === void 0 ? void 0 : componentProps.options) === null || _a === void 0 ? void 0 : _a.find(function (item) {
@@ -808,80 +837,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       draft.push(Object.assign((0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())), addDataInfo || {}));
     });
     setDataSource(res);
-  }, 40);
-
-  var handleSave = function handleSave(row, options) {
-    var _a, _b;
-
-    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;
-    var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
-      if (options === null || options === void 0 ? void 0 : options.only) {
-        var _ref = options === null || options === void 0 ? void 0 : options.only,
-            key = _ref.key,
-            value = _ref.value;
-
-        if ((preKeys === null || preKeys === void 0 ? void 0 : preKeys.length) > 1) {
-          var deeps = function deeps(children) {
-            children === null || children === void 0 ? void 0 : children.forEach(function (item) {
-              var _a;
-
-              if (preKeys.includes(item[_rowKey])) {
-                if (item[_rowKey] === row[_rowKey]) {
-                  children === null || children === void 0 ? void 0 : children.forEach(function (c) {
-                    c[key] = value;
-                  });
-                  (_a = Object.keys(item)) === null || _a === void 0 ? void 0 : _a.forEach(function (v) {
-                    item[v] = row[v] || item[v];
-                  });
-                } else if (item.children) {
-                  deeps(item.children);
-                }
-              }
-            });
-          };
-
-          deeps(draft);
-        } else {
-          draft === null || draft === void 0 ? void 0 : draft.forEach(function (item, index) {
-            if (row[_rowKey] === item[_rowKey]) {
-              draft[index] = row;
-            } else {
-              draft[index][key] = value;
-            }
-          });
-        }
-      } else {
-        if ((preKeys === null || preKeys === void 0 ? void 0 : preKeys.length) > 1) {
-          var _deeps = function _deeps(children) {
-            children === null || children === void 0 ? void 0 : children.forEach(function (item) {
-              var _a;
-
-              if (preKeys.includes(item[_rowKey])) {
-                if (item[_rowKey] === row[_rowKey]) {
-                  (_a = Object.keys(row)) === null || _a === void 0 ? void 0 : _a.forEach(function (v) {
-                    item[v] = row[v] || item[v];
-                  });
-                } else if (item.children) {
-                  _deeps(item.children);
-                }
-              }
-            });
-          };
-
-          _deeps(draft);
-        } else {
-          var index = draft.findIndex(function (item) {
-            return row[_rowKey] === item[_rowKey];
-          });
-
-          if (index !== -1) {
-            draft[index] = row;
-          }
-        }
-      }
-    });
-    setDataSource(res);
-  }; // const reWriteOriginSource = (rowKey: string, rowValue, dataIndex: number, nextValue) => {
+  }, 40); // const reWriteOriginSource = (rowKey: string, rowValue, dataIndex: number, nextValue) => {
   //   setDataSource((prevDataSource) => {
   //     return prevDataSource?.map((item) => {
   //       if (get(item, rowKey) === rowValue) {
@@ -895,7 +851,6 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   /** 删除当前行 */
 
-
   var handleTableRowDelete = (0, _lodash.debounce)(function (key) {
     var _a, _b, _c;
 
@@ -968,7 +923,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
     var res = deep(dataSourceRef.current);
     setDataSource(res);
-  }, 40);
+  }, 20);
   /** 快捷添加 */
 
   var handleTableRowAdd = (0, _lodash.debounce)(function (record, isAppendInChindren, defaultRecord) {
@@ -1051,8 +1006,87 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     });
     setDataSource(res);
   }, 50);
+
+  var handleSave = function handleSave(row, options) {
+    var _a, _b;
+
+    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;
+
+    if (options === null || options === void 0 ? void 0 : options.only) {
+      var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
+        if (options === null || options === void 0 ? void 0 : options.only) {
+          var _ref7 = options === null || options === void 0 ? void 0 : options.only,
+              key = _ref7.key,
+              value = _ref7.value;
+
+          if ((preKeys === null || preKeys === void 0 ? void 0 : preKeys.length) > 1) {
+            var deeps = function deeps(children) {
+              children === null || children === void 0 ? void 0 : children.forEach(function (item) {
+                var _a;
+
+                if (preKeys.includes(item[_rowKey])) {
+                  if (item[_rowKey] === row[_rowKey]) {
+                    children === null || children === void 0 ? void 0 : children.forEach(function (c) {
+                      c[key] = value;
+                    });
+                    (_a = Object.keys(item)) === null || _a === void 0 ? void 0 : _a.forEach(function (v) {
+                      item[v] = row[v] || item[v];
+                    });
+                  } else if (item.children) {
+                    deeps(item.children);
+                  }
+                }
+              });
+            };
+
+            deeps(draft);
+          } else {
+            draft === null || draft === void 0 ? void 0 : draft.forEach(function (item, index) {
+              if (row[_rowKey] === item[_rowKey]) {
+                draft[index] = row;
+              } else {
+                draft[index][key] = value;
+              }
+            });
+          }
+        } else {
+          if ((preKeys === null || preKeys === void 0 ? void 0 : preKeys.length) > 1) {
+            var _deeps = function _deeps(children) {
+              children === null || children === void 0 ? void 0 : children.forEach(function (item) {
+                var _a;
+
+                if (preKeys.includes(item[_rowKey])) {
+                  if (item[_rowKey] === row[_rowKey]) {
+                    (_a = Object.keys(row)) === null || _a === void 0 ? void 0 : _a.forEach(function (v) {
+                      item[v] = row[v] || item[v];
+                    });
+                  } else if (item.children) {
+                    _deeps(item.children);
+                  }
+                }
+              });
+            };
+
+            _deeps(draft);
+          } else {
+            var index = draft.findIndex(function (item) {
+              return row[_rowKey] === item[_rowKey];
+            });
+
+            if (index !== -1) {
+              draft[index] = row;
+            }
+          }
+        }
+      });
+      setDataSource(res);
+    } else {
+      handleTableRowReplace(row[_rowKey], row);
+    }
+  };
   /** 快捷刷子功能 */
 
+
   var handleCopy = function handleCopy(key, value, type, rowIndex) {
     var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
       draft === null || draft === void 0 ? void 0 : draft.forEach(function (item, index) {
@@ -1136,6 +1170,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       maxWidth: 48,
       className: 'drag-visible',
       fixed: 'left',
+      order: -2,
       render: function render(_, record) {
         return /*#__PURE__*/_react.default.createElement(_DragHandle.default, {
           id: (record === null || record === void 0 ? void 0 : record[_rowKey]) || (record === null || record === void 0 ? void 0 : record.id)
@@ -1148,6 +1183,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       maxWidth: 48,
       ellipsis: true,
       fixed: 'left',
+      order: -1,
       render: function render(_, record, index) {
         var _a, _b, _c;
 
@@ -1159,6 +1195,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       width: 48,
       ellipsis: true,
       maxWidth: 48,
+      order: -1,
       fixed: 'left'
     }, indexCol || {}), {
       render: function render(_, record, index) {
@@ -1194,7 +1231,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var mainColumns = [];
     var rightColumns = [];
     localColumns === null || localColumns === void 0 ? void 0 : localColumns.forEach(function (item) {
-      if ((item === null || item === void 0 ? void 0 : item.fixed) === 'left') {
+      if ((item === null || item === void 0 ? void 0 : item.fixed) === 'left' || (item === null || item === void 0 ? void 0 : item.fixed) === true) {
         leftColumns.push(item);
       } else if ((item === null || item === void 0 ? void 0 : item.fixed) === 'right') {
         rightColumns.push(item);
@@ -1390,6 +1427,11 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
             while (1) {
               switch (_context4.prev = _context4.next) {
                 case 0:
+                  if (!virtual) {
+                    _context4.next = 17;
+                    break;
+                  }
+
                   fullNum = 0;
                   flag = true;
                   messageIndex = null;
@@ -1462,18 +1504,18 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
                     }));
                   };
 
-                  _context4.next = 8;
+                  _context4.next = 9;
                   return deepValidator(dataSource, null);
 
-                case 8:
+                case 9:
                   if (!flag) {
-                    _context4.next = 12;
+                    _context4.next = 13;
                     break;
                   }
 
                   return _context4.abrupt("return", Promise.resolve(dataSource));
 
-                case 12:
+                case 13:
                   setTimeout(function () {
                     var _a;
 
@@ -1542,7 +1584,18 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
                   }, 100);
                   return _context4.abrupt("return", Promise.reject(errorInfo));
 
-                case 14:
+                case 15:
+                  _context4.next = 18;
+                  break;
+
+                case 17:
+                  return _context4.abrupt("return", Promise.all(Object.values(allFormListRef.current || []).map(function (item) {
+                    var _a;
+
+                    return (_a = item === null || item === void 0 ? void 0 : item.form) === null || _a === void 0 ? void 0 : _a.validateFields();
+                  })));
+
+                case 18:
                 case "end":
                   return _context4.stop();
               }
@@ -1647,6 +1700,29 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       };
     }
   }, []);
+  var checkFormItem = (0, _react.useMemo)(function () {
+    var arr = [];
+    columns.forEach(function (item) {
+      var _a;
+
+      if (item.children) {
+        (_a = item.children) === null || _a === void 0 ? void 0 : _a.forEach(function (c) {
+          arr.push( /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
+            noStyle: true,
+            key: c.dataIndex,
+            name: c.dataIndex
+          }, (c === null || c === void 0 ? void 0 : c['formProps']) || {}), c.dataIndex || 'text'));
+        });
+      } else {
+        arr.push( /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
+          noStyle: true,
+          key: item.dataIndex,
+          name: item.dataIndex
+        }, (item === null || item === void 0 ? void 0 : item['formProps']) || {}), item.dataIndex || 'text'));
+      }
+    });
+    return arr;
+  }, [columns]);
 
   if (colSortOpen) {
     return /*#__PURE__*/_react.default.createElement("div", {
@@ -1671,6 +1747,19 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       rowClassName: "editable-row",
       bordered: true,
       pagination: false,
+      expandable: Object.assign({
+        expandedRowKeys: expandedRowKeys,
+        fixed: true,
+        indentSize: 0,
+        expandIconColumnIndex: (0, _util.checkExpandIconColumnIndex)({
+          rowSelection: rowSelection,
+          sortOpen: sortOpen,
+          indexCol: indexCol
+        }) || 0,
+        onExpandedRowsChange: function onExpandedRowsChange(expandedRows) {
+          return setExpandedRowKeys(expandedRows);
+        }
+      }, resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable),
       rowSelection: !rowSelection ? undefined : Object.assign(Object.assign({
         fixed: true,
         type: 'checkbox',
@@ -1696,13 +1785,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form, {
       form: checkForm,
       component: false
-    }, columns.map(function (item) {
-      return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
-        noStyle: true,
-        key: item.dataIndex,
-        name: item.dataIndex
-      }, (item === null || item === void 0 ? void 0 : item['formProps']) || {}), item.dataIndex || 'text');
-    }))));
+    }, checkFormItem)));
   } // @ts-ignore
 
 
@@ -1724,10 +1807,10 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     } : undefined,
     pagination: false,
     // components={tableComponents}
-    expandable: (resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable) || {
+    expandable: Object.assign({
       expandedRowKeys: expandedRowKeys,
       fixed: true,
-      // indentSize: 0,
+      indentSize: 0,
       expandIconColumnIndex: (0, _util.checkExpandIconColumnIndex)({
         rowSelection: rowSelection,
         sortOpen: sortOpen,
@@ -1736,7 +1819,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       onExpandedRowsChange: function onExpandedRowsChange(expandedRows) {
         return setExpandedRowKeys(expandedRows);
       }
-    },
+    }, resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable),
     rowSelection: !rowSelection ? undefined : Object.assign(Object.assign({
       fixed: true,
       type: 'checkbox',
@@ -1762,13 +1845,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form, {
     form: checkForm,
     component: false
-  }, columns.map(function (item) {
-    return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
-      noStyle: true,
-      key: item.dataIndex,
-      name: item.dataIndex
-    }, (item === null || item === void 0 ? void 0 : item['formProps']) || {}), item.dataIndex || 'text');
-  }))));
+  }, checkFormItem)));
 });
 
 var _default = /*#__PURE__*/(0, _react.memo)(EditTable);

package/lib/LmEditTable/style/index.css

@@ -530,7 +530,7 @@ p {
   content: '-';
 }
 .lm_editTable_warpper .ant-table-thead .ant-table-cell {
-  height: 40px;
+  min-height: 40px;
   padding: 10px 8px;
   font-family: PingFangSC-Medium;
   font-size: 12px;
@@ -559,11 +559,6 @@ p {
 .lm_editTable_warpper .lm_custom_cell_td {
   position: relative;
 }
-.lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-}
 .lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append .ant-table-row-expand-icon {
   margin-right: 8px;
   flex: none;

package/lib/LmEditTable/style/variables.css

@@ -18,7 +18,7 @@
   content: '-';
 }
 .lm_editTable_warpper .ant-table-thead .ant-table-cell {
-  height: 40px;
+  min-height: 40px;
   padding: 10px 8px;
   font-family: PingFangSC-Medium;
   font-size: 12px;
@@ -47,11 +47,6 @@
 .lm_editTable_warpper .lm_custom_cell_td {
   position: relative;
 }
-.lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-}
 .lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append .ant-table-row-expand-icon {
   margin-right: 8px;
   flex: none;

package/lib/LmEditTable/util.js

@@ -88,7 +88,7 @@ function getExpandStatus(children) {
 }
 
 function checkMemoShouldUploadSpecialFun(prev, next) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
 
   var checkExpandStatus = getExpandStatus(prev.children) === getExpandStatus(next.children);
 
@@ -146,13 +146,17 @@ function checkMemoShouldUploadSpecialFun(prev, next) {
     return false;
   }
 
+  if (((_m = next.className) === null || _m === void 0 ? void 0 : _m.indexOf('ant-table-cell-with-append')) > -1) {
+    return false;
+  }
+
   if (next.className.indexOf('ant-table-selection-column') > -1) {
-    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);
+    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);
   }
   /** 如果启用了快速复制功能，需要实时判断rowIndex与getLength */
 
 
-  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)) {
+  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)) {
     var pickProps = ['record', 'colIndex', 'rowIndex', 'getLength'];
     var p = (0, _lodash.pick)(prev, pickProps);
     var n = (0, _lodash.pick)(next, pickProps);

package/lib/styles/variables.css

@@ -9734,7 +9734,7 @@ p {
   content: '-';
 }
 .lm_editTable_warpper .ant-table-thead .ant-table-cell {
-  height: 40px;
+  min-height: 40px;
   padding: 10px 8px;
   font-family: PingFangSC-Medium;
   font-size: 12px;
@@ -9763,11 +9763,6 @@ p {
 .lm_editTable_warpper .lm_custom_cell_td {
   position: relative;
 }
-.lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-}
 .lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append .ant-table-row-expand-icon {
   margin-right: 8px;
   flex: none;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.1.28-alpha.6",
+  "version": "1.1.28-alpha.8",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"