linkmore-design 1.1.13-alpha.1 → 1.1.13-alpha.10

package/lib/LmEditTable/EditTable.js

@@ -17,8 +17,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-var _icons = require("@ant-design/icons");
-
 var _moment = _interopRequireDefault(require("moment"));
 
 var _sortable = require("@dnd-kit/sortable");
@@ -97,8 +95,6 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   }
   return t;
 };
-/* eslint-disable no-unused-vars */
-
 
 var UploadBtn = _UploadOss.default.UploadBtn;
 
@@ -132,6 +128,7 @@ var EditableSortRow = function EditableSortRow(_a) {
 
   return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form, {
     form: form,
+    disabled: props.disabled || false,
     component: false
   }, /*#__PURE__*/_react.default.createElement(EditableContext.Provider, {
     value: form
@@ -262,80 +259,6 @@ var InputRange = function InputRange(_a) {
       return handleInput(e, 'next');
     }
   }, editEnum))));
-}; // 操作列
-
-
-var Opetate = function Opetate(_ref) {
-  var record = _ref.record,
-      rowKey = _ref.rowKey,
-      handleAdd = _ref.handleAdd,
-      handleDelete = _ref.handleDelete,
-      _ref$options = _ref.options,
-      options = _ref$options === void 0 ? ['add', 'delete'] : _ref$options,
-      getLength = _ref.getLength,
-      quickOpetateClearAll = _ref.quickOpetateClearAll;
-
-  var appendChildren = function appendChildren() {
-    handleAdd === null || handleAdd === void 0 ? void 0 : handleAdd(record, true);
-  };
-
-  var appendAdd = function appendAdd() {
-    handleAdd === null || handleAdd === void 0 ? void 0 : handleAdd(record);
-  };
-
-  return /*#__PURE__*/_react.default.createElement("div", {
-    style: {
-      display: 'flex',
-      alignItems: 'center',
-      justifyContent: 'flex-start',
-      marginLeft: '-4px'
-    }
-  }, options.includes('delete') && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
-    type: "link",
-    size: "small",
-    disabled: !quickOpetateClearAll && getLength < 2,
-    icon: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
-      type: "lmweb-minus-circle",
-      style: {
-        fontSize: 16
-      }
-    }),
-    onClick: function onClick() {
-      return handleDelete(record[rowKey]);
-    }
-  }), (options === null || options === void 0 ? void 0 : options.includes('add')) && (options === null || options === void 0 ? void 0 : options.includes('addInChildren')) ? /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Popover, {
-    placement: "bottom",
-    overlayClassName: "lm_table_append_add_popover",
-    open: open,
-    title: null,
-    content: /*#__PURE__*/_react.default.createElement("ul", null, /*#__PURE__*/_react.default.createElement("li", {
-      onClick: appendAdd
-    }, "\u6DFB\u52A0\u5E73\u7EA7"), /*#__PURE__*/_react.default.createElement("li", {
-      onClick: appendChildren
-    }, "\u6DFB\u52A0\u5B50\u7EA7")),
-    trigger: "hover"
-  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
-    type: "link",
-    size: "small",
-    icon: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
-      type: "lmweb-plus-circle-fill",
-      style: {
-        fontSize: 16
-      }
-    })
-  })) : /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
-    type: "link",
-    size: "small",
-    icon: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
-      type: "lmweb-plus-circle-fill",
-      style: {
-        fontSize: 16
-      }
-    }),
-    onClick: function onClick() {
-      return handleAdd(record, (options === null || options === void 0 ? void 0 : options.includes('addInChildren')) ? true : false);
-    }
-  }));
 };
 /*
   表格单元格
@@ -366,9 +289,7 @@ var EditableCell = function EditableCell(props) {
       handleDelete = props.handleDelete,
       handleCopy = props.handleCopy,
       itemProps = props.itemProps,
-      setValid = props.setValid,
-      reWriteOriginSource = props.reWriteOriginSource,
-      restProps = __rest(props, ["record", "rowKey", "isEdit", "col", "rowIndex", "colIndex", "handleTableRowDelete", "handleTableRowAdd", "quickOpetateClearAll", "getLength", "isHoverEdit", "editEnum", "valueType", "children", "handleSave", "handleAdd", "handleDelete", "handleCopy", "itemProps", "setValid", "reWriteOriginSource"]);
+      restProps = __rest(props, ["record", "rowKey", "isEdit", "col", "rowIndex", "colIndex", "handleTableRowDelete", "handleTableRowAdd", "quickOpetateClearAll", "getLength", "isHoverEdit", "editEnum", "valueType", "children", "handleSave", "handleAdd", "handleDelete", "handleCopy", "itemProps"]);
   /** 去除移入移出功能，保留最纯粹的功能，优化性能 */
 
 
@@ -456,13 +377,7 @@ var EditableCell = function EditableCell(props) {
             case 13:
               if (col === null || col === void 0 ? void 0 : col.hoverEdit) {
                 toggleEdit();
-              } // // 清空异常校验
-              // setValid((old) => {
-              //   const obj = { ...old }
-              //   delete obj[record[rowKey]]
-              //   return obj
-              // })
-
+              }
 
               _context.next = 18;
               break;
@@ -494,7 +409,16 @@ var EditableCell = function EditableCell(props) {
   };
 
   var Control = function Control(con) {
+    var _a;
+
     var resultComponentProps = (0, _lodash.isFunction)(componentProps) ? componentProps === null || componentProps === void 0 ? void 0 : componentProps(record, col) : componentProps;
+
+    if ((0, _lodash.isFunction)(componentProps) && ((_a = col === null || col === void 0 ? void 0 : col.newOptions) === null || _a === void 0 ? void 0 : _a.length)) {
+      resultComponentProps = Object.assign(Object.assign({}, resultComponentProps), {
+        options: col === null || col === void 0 ? void 0 : col.newOptions
+      });
+    }
+
     var clearAttrComponentProps = (0, _lodash.omit)(resultComponentProps, ['optionOnly', 'isOnlyValue', 'quickcopy']);
 
     switch (con) {
@@ -521,8 +445,7 @@ var EditableCell = function EditableCell(props) {
 
       case 'inputRange':
         return /*#__PURE__*/_react.default.createElement(InputRange, Object.assign({
-          onChange: handleFormItemChange,
-          ref: inputRef
+          onChange: handleFormItemChange
         }, resultComponentProps, {
           record: record,
           rowIndex: rowIndex,
@@ -612,10 +535,9 @@ var EditableCell = function EditableCell(props) {
 
       case 'operate':
       case 'lm_edit_opetate':
-        return /*#__PURE__*/_react.default.createElement(Opetate, Object.assign({
+        return /*#__PURE__*/_react.default.createElement(_components.QuickOpetate, Object.assign({
           record: record,
           rowKey: rowKey,
-          ref: inputRef,
           handleAdd: handleTableRowAdd,
           handleDelete: handleTableRowDelete,
           getLength: getLength,
@@ -624,11 +546,12 @@ var EditableCell = function EditableCell(props) {
 
       case 'render':
         {
-          var render = resultComponentProps.render;
+          var _resultComponentProps = resultComponentProps,
+              render = _resultComponentProps.render;
           var fromData = form.getFieldsValue();
           return render === null || render === void 0 ? void 0 : render(Object.assign(Object.assign({}, !(0, _util.isObjEmpty)(fromData) ? Object.assign(Object.assign({}, record), (0, _defineProperty2.default)({}, dataIndex, fromData[dataIndex])) : record), {
             onChange: save
-          }));
+          }), rowIndex);
         }
 
       default:
@@ -665,7 +588,8 @@ var EditableCell = function EditableCell(props) {
         valuePropName: editable === 'switch' ? 'checked' : 'value',
         style: {
           margin: 0
-        }
+        },
+        noStyle: formProps ? false : true
       }, formProps, {
         name: dataIndex
       }), Control(editable)));
@@ -677,6 +601,7 @@ var EditableCell = function EditableCell(props) {
             margin: 0
           }
         }, formProps, {
+          noStyle: formProps ? false : true,
           name: [dataIndex, 'value']
         }), Control(editable)));
       }
@@ -687,14 +612,14 @@ var EditableCell = function EditableCell(props) {
     }
 
     return childNode;
-  }, [col, isEdit, editing, getLength]); // 出现死循环找我
+  }, [col, isEdit, editing, getLength, record]); // 出现死循环找我
 
   (0, _react.useEffect)(function () {
     var editable = col.editable,
         dataIndex = col.dataIndex;
 
     if (isEdit && editable) {
-      form.setFieldsValue((0, _defineProperty2.default)({}, dataIndex, editable === 'date' ? (0, _moment.default)(record[dataIndex]) : record[dataIndex]));
+      form.setFieldsValue((0, _defineProperty2.default)({}, dataIndex, editable === 'date' && record[dataIndex] ? (0, _moment.default)(record[dataIndex]) : record[dataIndex]));
     }
   }, [record]);
 
@@ -733,10 +658,16 @@ var EditableCell = function EditableCell(props) {
 var MemoEditableCell = /*#__PURE__*/(0, _react.memo)(EditableCell, function (prev, next) {
   var pickProps = ['record', 'colIndex'];
   var p = (0, _lodash.pick)(prev, pickProps);
-  var n = (0, _lodash.pick)(next, pickProps); // console.log(prev, next, '22', checkMemoShouldUploadSpecialFun(prev, next), isEqual(p, n))
+  var n = (0, _lodash.pick)(next, pickProps);
+
+  if (next === null || next === void 0 ? void 0 : next.shouldUpdate) {
+    return false;
+  } // console.log(!checkMemoShouldUploadSpecialFun(prev, next), isEqual(p, n), '22', prev.record, next.record)
+  // console.log('333', checkMemoShouldUploadSpecialFun(prev, next), isEqual(p, n))
 
   /** TODO: 在record中带有children，子列表数据修改之后，会导致父级的record对比不一样 */
 
+
   if (!(0, _util.checkMemoShouldUploadSpecialFun)(prev, next)) {
     return false;
   }
@@ -744,6 +675,8 @@ var MemoEditableCell = /*#__PURE__*/(0, _react.memo)(EditableCell, function (pre
   return (0, _lodash.isEqual)(p, n);
 });
 var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  var _a, _b;
+
   var defaultData = props.value,
       columns = props.columns,
       isEdit = props.isEdit,
@@ -762,16 +695,17 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       rowSelection = props.rowSelection,
       virtual = props.virtual,
       sortOpen = props.sortOpen,
+      disabled = props.disabled,
       colSortOpen = props.colSortOpen,
+      _props$indexCol = props.indexCol,
+      indexCol = _props$indexCol === void 0 ? false : _props$indexCol,
       filterChange = props.filterChange,
       _props$size = props.size,
       size = _props$size === void 0 ? 'small' : _props$size,
       recordCreatorProps = props.recordCreatorProps,
       _props$shouldUpdate = props.shouldUpdate,
       shouldUpdate = _props$shouldUpdate === void 0 ? false : _props$shouldUpdate,
-      resetProps = __rest(props // const [dataSource, setDataSource] = useState([]);
-  , ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "virtual", "sortOpen", "colSortOpen", "filterChange", "size", "recordCreatorProps", "shouldUpdate"]); // const [dataSource, setDataSource] = useState([]);
-
+      resetProps = __rest(props, ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "virtual", "sortOpen", "disabled", "colSortOpen", "indexCol", "filterChange", "size", "recordCreatorProps", "shouldUpdate"]);
 
   var _useControllableValue = (0, _ahooks.useControllableValue)({
     value: (0, _util.checkRowKeyByDataSource)(props.value, _rowKey),
@@ -779,25 +713,30 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }),
       _useControllableValue2 = (0, _slicedToArray2.default)(_useControllableValue, 2),
       dataSource = _useControllableValue2[0],
-      setDataSource = _useControllableValue2[1]; // const [count, setCount] = useState(0);
+      setDataSource = _useControllableValue2[1];
 
+  var transformRowSelect = function transformRowSelect(selectedRowKeys, selectedRows, info) {
+    var _a;
 
-  var _useState7 = (0, _react.useState)({}),
-      _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-      _valid = _useState8[0],
-      setValid = _useState8[1];
+    return (_a = rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.onChange) === null || _a === void 0 ? void 0 : _a.call(rowSelection, selectedRowKeys, selectedRows, info);
+  };
 
-  var _useState9 = (0, _react.useState)([]),
-      _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-      localRowSelectList = _useState10[0],
-      setLocalRowSelectList = _useState10[1];
-  /** 当前展开的列 */
+  var _useControllableValue3 = (0, _ahooks.useControllableValue)({
+    value: {
+      selectedRows: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || []
+    },
+    onChange: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.onChange) ? transformRowSelect : undefined
+  }),
+      _useControllableValue4 = (0, _slicedToArray2.default)(_useControllableValue3, 2),
+      localRowSelectList = _useControllableValue4[0],
+      setLocalRowSelectList = _useControllableValue4[1];
+  /** TODO: 当前展开的列 */
 
 
-  var _useState11 = (0, _react.useState)([]),
-      _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
-      expandedRowKeys = _useState12[0],
-      setExpandedRowKeys = _useState12[1];
+  var _useState7 = (0, _react.useState)([]),
+      _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
+      expandedRowKeys = _useState8[0],
+      setExpandedRowKeys = _useState8[1];
 
   var dataSourceRef = (0, _react.useRef)(dataSource);
   var deepDataSourceRef = (0, _react.useRef)((0, _util.deepDataSourcePreKeys)(dataSource, _rowKey));
@@ -824,41 +763,21 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var handleDelete = function handleDelete(key) {
     var nValue = dataSource.filter(function (item) {
       return item[_rowKey] !== key;
-    }); // onChange?.(nValue)
-
+    });
     setDataSource(nValue);
   };
-  /** 点击添加按钮添加 */
+  /** 点击底部添加按钮添加 */
 
 
-  var handleAdd = function handleAdd(row) {
+  var handleAdd = (0, _lodash.debounce)(function (row) {
     var _a;
 
     var addDataInfo = (0, _lodash.isFunction)(recordCreatorProps === null || recordCreatorProps === void 0 ? void 0 : recordCreatorProps.initData) ? (_a = recordCreatorProps === null || recordCreatorProps === void 0 ? void 0 : recordCreatorProps.initData) === null || _a === void 0 ? void 0 : _a.call(recordCreatorProps) : recordCreatorProps === null || recordCreatorProps === void 0 ? void 0 : recordCreatorProps.initData;
     var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
       draft.push(Object.assign((0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())), addDataInfo || {}));
     });
-    setDataSource(res); // onChange?.(res)
-  };
-  /** 本地缓存一个选择数据 */
-
-
-  (0, _react.useEffect)(function () {
-    if (rowSelection) {
-      var selectedRowKeys = rowSelection.selectedRowKeys;
-
-      if (selectedRowKeys) {
-        setLocalRowSelectList(localRowSelectList || []);
-      }
-    }
-  }, [rowSelection]);
-
-  var editTableRowChange = function editTableRowChange(selectRows) {
-    var _a;
-
-    setLocalRowSelectList(selectRows);
-    (_a = rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.onChange) === null || _a === void 0 ? void 0 : _a.call(rowSelection, selectRows);
-  };
+    setDataSource(res);
+  }, 40);
 
   var handleSave = function handleSave(row, options) {
     var _a, _b;
@@ -866,9 +785,9 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     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 _ref2 = options === null || options === void 0 ? void 0 : options.only,
-            key = _ref2.key,
-            value = _ref2.value;
+        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) {
@@ -931,25 +850,26 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       }
     });
     setDataSource(res);
-  };
-
-  var reWriteOriginSource = function reWriteOriginSource(rowKey, rowValue, dataIndex, nextValue) {
-    setDataSource(function (prevDataSource) {
-      return prevDataSource === null || prevDataSource === void 0 ? void 0 : prevDataSource.map(function (item) {
-        if ((0, _lodash.get)(item, rowKey) === rowValue) {
-          (0, _lodash.set)(item, dataIndex, nextValue);
-        }
-
-        return item;
-      });
-    });
-  }; // @ts-ignore
-
-
-  var handleTableRowDelete = function handleTableRowDelete(key) {
+  }; // const reWriteOriginSource = (rowKey: string, rowValue, dataIndex: number, nextValue) => {
+  //   setDataSource((prevDataSource) => {
+  //     return prevDataSource?.map((item) => {
+  //       if (get(item, rowKey) === rowValue) {
+  //         set(item, dataIndex, nextValue)
+  //       }
+  //       return item
+  //     })
+  //   })
+  // }
+  // @ts-ignore
+
+  /** 删除当前行 */
+
+
+  var handleTableRowDelete = (0, _lodash.debounce)(function (key) {
     var _a, _b, _c;
 
-    var preKeys = (_b = (_a = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : deepDataSourceRef.current) === null || _a === void 0 ? void 0 : _a[key]) === null || _b === void 0 ? void 0 : _b.preKeys;
+    var rkey = (0, _lodash.isObject)(key) ? key[_rowKey] : key;
+    var preKeys = (_b = (_a = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : deepDataSourceRef.current) === null || _a === void 0 ? void 0 : _a[rkey]) === null || _b === void 0 ? void 0 : _b.preKeys;
 
     if (preKeys.length > 1) {
       /** 说明删除的是children中的数据 */
@@ -989,34 +909,76 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
       setDataSource(_res);
     }
-  };
-  /** 快捷添加 */
 
+    return null;
+  }, 40);
+  /** 替换当前行 */
 
-  var handleTableRowAdd = function handleTableRowAdd(record, isAppendInChindren) {
+  var handleTableRowReplace = (0, _lodash.debounce)(function (record, defaultRecord) {
     var _a, _b;
 
-    var preKeys = (_b = (_a = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : deepDataSourceRef.current) === null || _a === void 0 ? void 0 : _a[record[_rowKey]]) === null || _b === void 0 ? void 0 : _b.preKeys;
+    var rkey = (0, _lodash.isObject)(record) ? record[_rowKey] : record;
+    var preKeys = (_b = (_a = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : deepDataSourceRef.current) === null || _a === void 0 ? void 0 : _a[rkey]) === null || _b === void 0 ? void 0 : _b.preKeys; // const res = cloneDeep(dataSourceRef.current)
+
+    var deep = function deep(children) {
+      return children.map(function (item) {
+        if (item[_rowKey] === rkey) {
+          return defaultRecord;
+        } else if (preKeys.includes(item[_rowKey]) && item.children) {
+          var child = deep(item.children);
+          return Object.assign(Object.assign({}, item), {
+            children: child
+          });
+        } else {
+          return item;
+        }
+      });
+    };
+
+    var res = deep(dataSourceRef.current);
+    setDataSource(res);
+  }, 40);
+  /** 快捷添加 */
+
+  var handleTableRowAdd = (0, _lodash.debounce)(function (record, isAppendInChindren, defaultRecord) {
+    var _a, _b;
+
+    var rkey = (0, _lodash.isObject)(record) ? record[_rowKey] : record;
+    var preKeys = (_b = (_a = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : deepDataSourceRef.current) === null || _a === void 0 ? void 0 : _a[rkey]) === null || _b === void 0 ? void 0 : _b.preKeys;
     var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
-      var _a, _b, _c, _d;
+      var _a, _b, _c, _d, _e;
 
-      if (preKeys.length > 1) {
+      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, index) {
-            var _a;
+            var _a, _b;
 
             if (preKeys === null || preKeys === void 0 ? void 0 : preKeys.includes(item[_rowKey])) {
-              if (item[_rowKey] === record[_rowKey]) {
+              if (item[_rowKey] === rkey) {
                 if (isAppendInChindren) {
                   if (item === null || item === void 0 ? void 0 : item.children) {
-                    (_a = item === null || item === void 0 ? void 0 : item.children) === null || _a === void 0 ? void 0 : _a.push((0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+                    if (Array.isArray(defaultRecord)) {
+                      var _a2;
+
+                      (_a = item === null || item === void 0 ? void 0 : item.children) === null || _a === void 0 ? void 0 : (_a2 = _a).push.apply(_a2, (0, _toConsumableArray2.default)(defaultRecord));
+                    } else {
+                      (_b = item === null || item === void 0 ? void 0 : item.children) === null || _b === void 0 ? void 0 : _b.push(defaultRecord || (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+                    }
                   } else {
-                    item.children = [(0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now()))];
+                    if (Array.isArray(defaultRecord)) {
+                      item.children = (0, _toConsumableArray2.default)(defaultRecord);
+                    } else {
+                      item.children = [defaultRecord || (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now()))];
+                    }
                   }
 
                   !expandedRowKeys.includes(item[_rowKey]) && setExpandedRowKeys([].concat((0, _toConsumableArray2.default)(expandedRowKeys), [item[_rowKey]]));
                 } else {
-                  children.splice(index + 1, 0, (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+                  if (Array.isArray(defaultRecord)) {
+                    children.splice.apply(children, [index + 1, 0].concat((0, _toConsumableArray2.default)(defaultRecord)));
+                  } else {
+                    children.splice(index + 1, 0, defaultRecord || (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+                  }
                 }
               } else if (item.children) {
                 deeps(item.children);
@@ -1028,26 +990,37 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         deeps(draft);
       } else {
         var index = draft.findIndex(function (item) {
-          return record[_rowKey] === item[_rowKey];
+          return rkey === item[_rowKey];
         });
 
         if (index !== -1) {
           if (isAppendInChindren) {
             if ((_a = draft[index].children) === null || _a === void 0 ? void 0 : _a.length) {
-              (_b = draft[index].children) === null || _b === void 0 ? void 0 : _b.push((0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+              if (Array.isArray(defaultRecord)) {
+                var _b2;
+
+                (_b = draft[index].children) === null || _b === void 0 ? void 0 : (_b2 = _b).push.apply(_b2, (0, _toConsumableArray2.default)(defaultRecord));
+              } else {
+                (_c = draft[index].children) === null || _c === void 0 ? void 0 : _c.push(defaultRecord || (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+              }
             } else {
-              draft[index].children = [(0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now()))];
+              draft[index].children = Array.isArray(defaultRecord) ? (0, _toConsumableArray2.default)(defaultRecord) : [defaultRecord || (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now()))];
             }
 
-            !expandedRowKeys.includes((_c = draft[index]) === null || _c === void 0 ? void 0 : _c[_rowKey]) && setExpandedRowKeys([].concat((0, _toConsumableArray2.default)(expandedRowKeys), [(_d = draft[index]) === null || _d === void 0 ? void 0 : _d[_rowKey]]));
+            !expandedRowKeys.includes((_d = draft[index]) === null || _d === void 0 ? void 0 : _d[_rowKey]) && setExpandedRowKeys([].concat((0, _toConsumableArray2.default)(expandedRowKeys), [(_e = draft[index]) === null || _e === void 0 ? void 0 : _e[_rowKey]]));
           } else {
-            draft.splice(index + 1, 0, (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+            if (Array.isArray(defaultRecord)) {
+              draft.splice.apply(draft, [index + 1, 0].concat((0, _toConsumableArray2.default)(defaultRecord)));
+            } else {
+              draft.splice(index + 1, 0, defaultRecord || (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+            }
           }
         }
       }
     });
     setDataSource(res);
-  };
+  }, 50);
+  /** 快捷刷子功能 */
 
   var handleCopy = function handleCopy(key, value, type, rowIndex) {
     var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
@@ -1066,8 +1039,9 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var hasOnlyOptionsDatas = columns.filter(function (item) {
       var _a;
 
-      return (_a = item === null || item === void 0 ? void 0 : item.componentProps) === null || _a === void 0 ? void 0 : _a.optionOnly;
-    });
+      var resultComponentProps = (0, _lodash.isFunction)(item === null || item === void 0 ? void 0 : item.componentProps) ? (_a = item === null || item === void 0 ? void 0 : item.componentProps) === null || _a === void 0 ? void 0 : _a.call(item, {}, item) : item === null || item === void 0 ? void 0 : item.componentProps;
+      return resultComponentProps === null || resultComponentProps === void 0 ? void 0 : resultComponentProps.optionOnly;
+    }); // const hasOnlyOptionsDatas = columns.filter((item) => item?.componentProps?.optionOnly)
 
     if (hasOnlyOptionsDatas.length) {
       return hasOnlyOptionsDatas === null || hasOnlyOptionsDatas === void 0 ? void 0 : hasOnlyOptionsDatas.map(function (item) {
@@ -1081,9 +1055,13 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   var DisableOptions = (0, _react.useMemo)(function () {
     var newColumns = columns === null || columns === void 0 ? void 0 : columns.map(function (item) {
-      var _ref5 = item.componentProps || {},
-          optionOnly = _ref5.optionOnly,
-          options = _ref5.options;
+      var _a;
+
+      var resultComponentProps = (0, _lodash.isFunction)(item.componentProps) ? (_a = item.componentProps) === null || _a === void 0 ? void 0 : _a.call(item, {}, item) : item.componentProps;
+
+      var _ref8 = resultComponentProps || {},
+          optionOnly = _ref8.optionOnly,
+          options = _ref8.options;
 
       if (optionOnly && options) {
         var dataIndex = item.dataIndex;
@@ -1095,6 +1073,13 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
             disabled: !!dataIndexData.includes(o === null || o === void 0 ? void 0 : o.value)
           });
         });
+
+        if ((0, _lodash.isFunction)(item.componentProps)) {
+          return Object.assign(Object.assign({}, item), {
+            newOptions: newOptions
+          });
+        }
+
         return Object.assign(Object.assign({}, item), {
           componentProps: Object.assign(Object.assign({}, item.componentProps), {
             options: newOptions
@@ -1115,17 +1100,47 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var rColumns = hasDisableOptions ? DisableOptions : columns;
     var localColumns = [sortOpen ? {
       title: '排序',
-      dataIndex: 'sort',
+      dataIndex: '_sort',
       width: 48,
       maxWidth: 48,
       className: 'drag-visible',
       fixed: 'left',
       render: function render(_, record) {
         return /*#__PURE__*/_react.default.createElement(_DragHandle.default, {
-          id: record[_rowKey] || record.id
+          id: (record === null || record === void 0 ? void 0 : record[_rowKey]) || (record === null || record === void 0 ? void 0 : record.id)
         });
       }
-    } : null].concat((0, _toConsumableArray2.default)(rColumns), [useQuickOpetate ? {
+    } : null, indexCol ? (0, _lodash.isBoolean)(indexCol) ? {
+      title: '',
+      dataIndex: '_index',
+      width: 48,
+      maxWidth: 48,
+      ellipsis: true,
+      fixed: 'left',
+      render: function render(_, record, index) {
+        var _a, _b, _c;
+
+        console.log(deepDataSourceRef.current, '--deepDataSourceRef.current', _rowKey);
+        return ((_c = (_b = (_a = deepDataSourceRef.current) === null || _a === void 0 ? void 0 : _a[record[_rowKey]]) === null || _b === void 0 ? void 0 : _b['_deepIds']) === null || _c === void 0 ? void 0 : _c.join('-')) || "".concat(index + 1);
+      }
+    } : Object.assign(Object.assign({
+      title: '',
+      dataIndex: '_index',
+      width: 48,
+      ellipsis: true,
+      maxWidth: 48,
+      fixed: 'left'
+    }, indexCol || {}), {
+      render: function render(_, record, index) {
+        var _a, _b, _c, _d, _e, _f;
+
+        if ((0, _lodash.isFunction)(indexCol === null || indexCol === void 0 ? void 0 : indexCol.render)) {
+          return (_a = indexCol === null || indexCol === void 0 ? void 0 : indexCol.render) === null || _a === void 0 ? void 0 : _a.call(indexCol, record, (_c = (_b = deepDataSourceRef.current) === null || _b === void 0 ? void 0 : _b[record[_rowKey]]) === null || _c === void 0 ? void 0 : _c['_deepIds']);
+        }
+
+        return ((_f = (_e = (_d = deepDataSourceRef.current) === null || _d === void 0 ? void 0 : _d[record[_rowKey]]) === null || _e === void 0 ? void 0 : _e['_deepIds']) === null || _f === void 0 ? void 0 : _f.join('-')) || "".concat(index + 1);
+      }
+    }) : null].concat((0, _toConsumableArray2.default)(rColumns), [useQuickOpetate ? {
       title: '操作',
       dataIndex: 'lm_edit_opetate',
       width: 68,
@@ -1136,9 +1151,9 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         options: Array.isArray(useQuickOpetate) ? useQuickOpetate : ['add', 'delete']
       }
     } : null]).filter(function (item) {
-      return item;
+      return item && (item === null || item === void 0 ? void 0 : item.show) !== false;
     });
-    localColumns = localColumns.map(function (item, index) {
+    localColumns = localColumns === null || localColumns === void 0 ? void 0 : localColumns.map(function (item, index) {
       return Object.assign(Object.assign({}, item), {
         order: [null, undefined].includes(item.order) ? index : item.order
       });
@@ -1163,8 +1178,19 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var mapColumns = function mapColumns(col, index) {
       var _a, _b;
 
-      if (!col.editable && !((_a = col.children) === null || _a === void 0 ? void 0 : _a.length)) {
-        return col;
+      if (!col.editable && !((_a = col.children) === null || _a === void 0 ? void 0 : _a.length) && (col === null || col === void 0 ? void 0 : col.dataIndex) === '_sort') {
+        var fn = col === null || col === void 0 ? void 0 : col.render;
+        return Object.assign(Object.assign({}, col), {
+          render: function render(text, record, i) {
+            var _a;
+
+            return fn === null || fn === void 0 ? void 0 : fn((_a = dataSource[i]) === null || _a === void 0 ? void 0 : _a[col.dataIndex], dataSource[i], i);
+          }
+        });
+      }
+
+      if (isEdit && (col === null || col === void 0 ? void 0 : col.render) && (col === null || col === void 0 ? void 0 : col.editable) === 'render') {
+        delete col.render;
       }
 
       var newCol = Object.assign(Object.assign({}, col), {
@@ -1182,7 +1208,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
             editable: col.editable,
             dataIndex: col.dataIndex,
             itemProps: col.itemProps,
-            setValid: setValid,
+            shouldUpdate: shouldUpdate,
             isEdit: isEdit,
             isHoverEdit: isHoverEdit,
             handleAdd: handleAdd,
@@ -1190,8 +1216,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
             handleCopy: handleCopy,
             editEnum: typeof col.editEnum === 'function' ? col.editEnum(record) : col.editEnum,
             valueType: typeof col.valueType === 'function' ? col.valueType(record) : col.valueType,
-            handleSave: handleSave,
-            reWriteOriginSource: reWriteOriginSource
+            handleSave: handleSave
           };
         }
       });
@@ -1203,7 +1228,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       return newCol;
     };
 
-    var res = localColumns.map(function (col, index) {
+    var res = localColumns === null || localColumns === void 0 ? void 0 : localColumns.map(function (col, index) {
       return mapColumns(col, index);
     });
     return res;
@@ -1240,8 +1265,24 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       setRow: handleSave,
-      valid: function valid() {
-        return _valid;
+      getCheckboxRecords: function getCheckboxRecords() {
+        return localRowSelectList.selectedRows;
+      },
+      deleteRowData: function deleteRowData(data) {
+        return handleTableRowDelete(data);
+      },
+      addRowData: function addRowData(data, defaultValue, addInChild) {
+        return addInChild === 'replace' ? handleTableRowReplace(data, defaultValue) : handleTableRowAdd(data, addInChild, defaultValue);
+      },
+      clearSelect: function clearSelect() {
+        setLocalRowSelectList({
+          selectedRows: []
+        });
+      },
+      customSetCheckboxRecords: function customSetCheckboxRecords(value) {
+        setLocalRowSelectList({
+          selectedRows: value
+        });
       }
     };
   });
@@ -1286,6 +1327,11 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       header: {
         row: colSortOpen ? colDraggableContainer : null
       }
+    },
+    onRow: function onRow(record, index) {
+      return {
+        disabled: disabled
+      };
     }
   }, resetProps));
 
@@ -1304,29 +1350,25 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       rowClassName: "editable-row",
       bordered: true,
       pagination: false,
-      // components={tableComponents}
-      rowSelection: !rowSelection ? undefined : {
+      rowSelection: !rowSelection ? undefined : Object.assign(Object.assign({
         fixed: true,
         type: 'checkbox',
-        columnWidth: 36,
-        selectedRowKeys: localRowSelectList.map(function (v) {
-          return v[_rowKey];
+        columnWidth: 36
+      }, rowSelection), {
+        selectedRowKeys: (_a = localRowSelectList === null || localRowSelectList === void 0 ? void 0 : localRowSelectList.selectedRows) === null || _a === void 0 ? void 0 : _a.map(function (v) {
+          return (0, _lodash.isObject)(v) ? v[_rowKey] : v;
         }),
-        onChange: function onChange(selectedRowKeys, selectedRows) {
-          editTableRowChange(selectedRows);
+        onChange: function onChange(selectedRowKeys, selectedRows, info) {
+          setLocalRowSelectList(selectedRowKeys, selectedRows, info);
         }
-      },
+      }),
       dataSource: dataSource
-    })))), isShowAddAction && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
-      className: "lm_editTable_add_bar",
-      type: "dashed",
-      onClick: handleAdd,
-      style: {
-        marginTop: 8
-      }
-    }, /*#__PURE__*/_react.default.createElement(_icons.PlusCircleOutlined, {
-      className: "lmweb-plus"
-    }), "\u65B0\u589E"));
+    })))), /*#__PURE__*/_react.default.createElement(_components.BottomOpetateComponent, {
+      disabled: disabled,
+      isShowAddAction: isShowAddAction,
+      recordCreatorProps: recordCreatorProps,
+      handleAdd: handleAdd
+    }));
   } // @ts-ignore
 
 
@@ -1342,32 +1384,31 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     expandable: (resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable) || {
       expandedRowKeys: expandedRowKeys,
       fixed: true,
+      // indentSize: 0,
+      expandIconColumnIndex: rowSelection && sortOpen ? 3 : rowSelection || sortOpen ? 2 : 0,
       onExpandedRowsChange: function onExpandedRowsChange(expandedRows) {
         return setExpandedRowKeys(expandedRows);
       }
     },
-    rowSelection: !rowSelection ? undefined : {
+    rowSelection: !rowSelection ? undefined : Object.assign(Object.assign({
       fixed: true,
       type: 'checkbox',
-      columnWidth: 36,
-      selectedRowKeys: localRowSelectList === null || localRowSelectList === void 0 ? void 0 : localRowSelectList.map(function (v) {
-        return v[_rowKey];
+      columnWidth: 36
+    }, rowSelection), {
+      selectedRowKeys: (_b = localRowSelectList === null || localRowSelectList === void 0 ? void 0 : localRowSelectList.selectedRows) === null || _b === void 0 ? void 0 : _b.map(function (v) {
+        return (0, _lodash.isObject)(v) ? v[_rowKey] : v;
       }),
-      onChange: function onChange(selectedRowKeys, selectedRows) {
-        editTableRowChange(selectedRows);
+      onChange: function onChange(selectedRowKeys, selectedRows, info) {
+        setLocalRowSelectList(selectedRowKeys, selectedRows, info);
       }
-    },
+    }),
     dataSource: dataSource
-  })), isShowAddAction && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
-    className: "lm_editTable_add_bar",
-    type: "dashed",
-    onClick: (recordCreatorProps === null || recordCreatorProps === void 0 ? void 0 : recordCreatorProps.customAddClick) || handleAdd,
-    style: Object.assign({
-      marginTop: 8
-    }, (recordCreatorProps === null || recordCreatorProps === void 0 ? void 0 : recordCreatorProps.style) || {})
-  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
-    type: "lmweb-plus"
-  }), (recordCreatorProps === null || recordCreatorProps === void 0 ? void 0 : recordCreatorProps.creatorButtonText) || '新增'));
+  })), /*#__PURE__*/_react.default.createElement(_components.BottomOpetateComponent, {
+    disabled: disabled,
+    isShowAddAction: isShowAddAction,
+    recordCreatorProps: recordCreatorProps,
+    handleAdd: handleAdd
+  }));
 });
 
 var _default = /*#__PURE__*/(0, _react.memo)(EditTable);