linkmore-design 1.1.27-alpha.0 → 1.1.27

package/es/LmEditTable/EditTable.js

@@ -47,31 +47,32 @@ var __rest = this && this.__rest || function (s, e) {
   }
   return t;
 };
+/* eslint-disable no-unused-vars */
 
+
+import { PlusCircleOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { arrayMove } from '@dnd-kit/sortable';
-import { Checkbox, IconFont, Input, InputNumber, Radio, Select, Table, Switch, DatePicker, Form } from 'linkmore-design';
-import { isFunction, omit, isEqual, pick, isBoolean, isObject, debounce } from 'lodash';
+import { Button, Checkbox, IconFont, Input, InputNumber, Radio, Select, Table, Switch, DatePicker, Form, Popover } from 'linkmore-design';
+import { get, set, isFunction, omit, isObject } from 'lodash';
 import React, { forwardRef, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState, memo, useCallback } from 'react';
 import { useControllableValue } from 'ahooks';
 import { produce } from 'immer';
 import DndContainer from './DndContainer';
+import SortableBox from './sortableBox';
 import SortableBoxCol from './sortableBoxCol';
 import SortableItem from './sortableItem';
 import ColSortableItem from './sortableItemCol';
 import DragHandle from './DragHandle';
 import UploadOss from '../UploadOss';
-import { isObjEmpty, deepDataSourcePreKeys, isExpandRow, checkRowKeyByDataSource, checkMemoShouldUploadSpecialFun, checkExpandIconColumnIndex } from './util';
-import { DraggableContainer, BottomOpetateComponent, QuickOpetate } from './components';
-import cls from 'classnames';
-import { VirtualTable, VirtualWrapper, VirtualRow } from './virtual';
+import { isObjEmpty, deepDataSourcePreKeys, isExpandRow, checkRowKeyByDataSource } from './util';
+import cls from "classnames";
 var UploadBtn = UploadOss.UploadBtn;
 var EditableContext = /*#__PURE__*/React.createContext(null); // 表格行
 
 var EditableRow = function EditableRow(_a) {
   var index = _a.index,
-      virtual = _a.virtual,
-      props = __rest(_a, ["index", "virtual"]);
+      props = __rest(_a, ["index"]);
 
   var _Form$useForm = Form.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -82,7 +83,7 @@ var EditableRow = function EditableRow(_a) {
     component: false
   }, /*#__PURE__*/React.createElement(EditableContext.Provider, {
     value: form
-  }, virtual ? /*#__PURE__*/React.createElement(VirtualRow, Object.assign({}, props)) : /*#__PURE__*/React.createElement("tr", Object.assign({}, props))));
+  }, /*#__PURE__*/React.createElement("tr", Object.assign({}, props))));
 };
 
 var EditableSortRow = function EditableSortRow(_a) {
@@ -95,7 +96,6 @@ var EditableSortRow = function EditableSortRow(_a) {
 
   return /*#__PURE__*/React.createElement(Form, {
     form: form,
-    disabled: props.disabled || false,
     component: false
   }, /*#__PURE__*/React.createElement(EditableContext.Provider, {
     value: form
@@ -226,7 +226,88 @@ 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.createElement("div", {
+    style: {
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'flex-start',
+      marginLeft: '-4px'
+    }
+  }, options.includes('delete') && /*#__PURE__*/React.createElement(Button, {
+    type: "link",
+    size: "small",
+    disabled: !quickOpetateClearAll && getLength < 2,
+    icon: /*#__PURE__*/React.createElement(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.createElement(Popover, {
+    placement: "bottom",
+    overlayClassName: 'lm_table_append_add_popover',
+    open: open,
+    title: null,
+    content: /*#__PURE__*/React.createElement("ul", null, /*#__PURE__*/React.createElement("li", {
+      onClick: appendAdd
+    }, "\u6DFB\u52A0\u5E73\u7EA7"), /*#__PURE__*/React.createElement("li", {
+      onClick: appendChildren
+    }, "\u6DFB\u52A0\u5B50\u7EA7")),
+    trigger: "hover"
+  }, /*#__PURE__*/React.createElement(Button, {
+    type: "link",
+    size: "small",
+    icon: /*#__PURE__*/React.createElement(IconFont, {
+      type: "lmweb-plus-circle-fill",
+      style: {
+        fontSize: 16
+      }
+    })
+  })) : (options === null || options === void 0 ? void 0 : options.includes('add')) || (options === null || options === void 0 ? void 0 : options.includes('addInChildren')) ? /*#__PURE__*/React.createElement(Button, {
+    type: "link",
+    size: "small",
+    icon: /*#__PURE__*/React.createElement(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);
+    }
+  }) : null);
+}; // const isValidValue = (verifyValue) => {
+//   const toStringValue = JSON.stringify(verifyValue);
+//   if (verifyValue === undefined || verifyValue === null || verifyValue === '' || toStringValue === '[]' || toStringValue === '{}') {
+//     return false;
+//   }
+//   return true;
+// }
+
 /*
   表格单元格
   editEnum： 下拉框时的数据数组（非数组时是配置设置）
@@ -256,7 +337,9 @@ var EditableCell = function EditableCell(props) {
       handleDelete = props.handleDelete,
       handleCopy = props.handleCopy,
       itemProps = props.itemProps,
-      restProps = __rest(props, ["record", "rowKey", "isEdit", "col", "rowIndex", "colIndex", "handleTableRowDelete", "handleTableRowAdd", "quickOpetateClearAll", "getLength", "isHoverEdit", "editEnum", "valueType", "children", "handleSave", "handleAdd", "handleDelete", "handleCopy", "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"]);
   /** 去除移入移出功能，保留最纯粹的功能，优化性能 */
 
 
@@ -276,12 +359,6 @@ var EditableCell = function EditableCell(props) {
 
   var inputRef = useRef(null);
   var form = useContext(EditableContext);
-
-  var _useState5 = useState(false),
-      _useState6 = _slicedToArray(_useState5, 2),
-      hoverStatus = _useState6[0],
-      setHoverStatus = _useState6[1];
-
   useEffect(function () {
     var _a;
 
@@ -292,7 +369,13 @@ var EditableCell = function EditableCell(props) {
 
   var toggleEdit = function toggleEdit() {
     setEditing(!editing); // form.setFieldsValue({ [dataIndex]: record[dataIndex] });
-  }; // 校验保存
+  }; // const checkCellRef = useRef(null)
+  // const focusCapturedRef = useRef(false);
+  // const curValue = useMemo(() => {
+  //   return record?.dataIndex
+  // }, [record])
+  // const curValueIsValid = isValidValue(curValue);
+  // 校验保存
 
 
   var save = function save(row) {
@@ -344,7 +427,13 @@ 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;
@@ -369,14 +458,15 @@ var EditableCell = function EditableCell(props) {
   /** 快捷刷子，把当前的所有列的值，刷成当前的选中的列 */
 
 
-  var copyKey = function copyKey(e, type) {
+  var copyKey = function copyKey(e) {
     e === null || e === void 0 ? void 0 : e.stopPropagation();
     var dataIndex = col.dataIndex;
-    handleCopy === null || handleCopy === void 0 ? void 0 : handleCopy(dataIndex, record[dataIndex], type, props.rowIndex);
+    handleCopy === null || handleCopy === void 0 ? void 0 : handleCopy(dataIndex, record[dataIndex]);
   };
 
   var Control = function Control(con) {
-    var _a;
+    var _a; // const resultComponentProps = isFunction(componentProps) ? componentProps?.(record, col) : componentProps
+
 
     var resultComponentProps = isFunction(componentProps) ? componentProps === null || componentProps === void 0 ? void 0 : componentProps(record, col) : componentProps;
 
@@ -386,7 +476,7 @@ var EditableCell = function EditableCell(props) {
       });
     }
 
-    var clearAttrComponentProps = omit(resultComponentProps, ['optionOnly', 'isOnlyValue', 'quickcopy']);
+    var clearAttrComponentProps = omit(resultComponentProps, ['optionOnly', 'isOnlyValue']);
 
     switch (con) {
       case 'input':
@@ -407,12 +497,19 @@ var EditableCell = function EditableCell(props) {
             noStyle: true
           }, /*#__PURE__*/React.cloneElement(resultComponentProps.addonAfter, {
             onChange: handleFormItemChange
+          })) : null,
+          suffix: resultComponentProps.quickcopy ? /*#__PURE__*/React.createElement("span", {
+            className: 'lm_table_quickcopy'
+          }, /*#__PURE__*/React.createElement(IconFont, {
+            onClick: copyKey,
+            type: 'lmweb-icon_m_brush'
           })) : null
         }));
 
       case 'inputRange':
         return /*#__PURE__*/React.createElement(InputRange, Object.assign({
-          onChange: handleFormItemChange
+          onChange: handleFormItemChange,
+          ref: inputRef
         }, resultComponentProps, {
           record: record,
           rowIndex: rowIndex,
@@ -488,7 +585,7 @@ var EditableCell = function EditableCell(props) {
 
       case 'switch':
         return /*#__PURE__*/React.createElement(Switch, Object.assign({
-          size: "small"
+          size: 'small'
         }, clearAttrComponentProps, {
           onChange: handleFormItemChange
         }));
@@ -502,9 +599,10 @@ var EditableCell = function EditableCell(props) {
 
       case 'operate':
       case 'lm_edit_opetate':
-        return /*#__PURE__*/React.createElement(QuickOpetate, Object.assign({
+        return /*#__PURE__*/React.createElement(Opetate, Object.assign({
           record: record,
           rowKey: rowKey,
+          ref: inputRef,
           handleAdd: handleTableRowAdd,
           handleDelete: handleTableRowDelete,
           getLength: getLength,
@@ -518,7 +616,7 @@ var EditableCell = function EditableCell(props) {
           var fromData = form.getFieldsValue();
           return render === null || render === void 0 ? void 0 : render(Object.assign(Object.assign({}, !isObjEmpty(fromData) ? Object.assign(Object.assign({}, record), _defineProperty({}, dataIndex, fromData[dataIndex])) : record), {
             onChange: save
-          }), rowIndex);
+          }));
         }
 
       default:
@@ -555,8 +653,7 @@ var EditableCell = function EditableCell(props) {
         valuePropName: editable === 'switch' ? 'checked' : 'value',
         style: {
           margin: 0
-        },
-        noStyle: formProps ? false : true
+        }
       }, formProps, {
         name: dataIndex
       }), Control(editable)));
@@ -568,7 +665,6 @@ var EditableCell = function EditableCell(props) {
             margin: 0
           }
         }, formProps, {
-          noStyle: formProps ? false : true,
           name: [dataIndex, 'value']
         }), Control(editable)));
       }
@@ -579,68 +675,31 @@ var EditableCell = function EditableCell(props) {
     }
 
     return childNode;
-  }, [col, isEdit, editing, getLength, record]); // 出现死循环找我
+  }, [col, isEdit, editing, getLength]); // const [childNode, setChildNode] = useState(getMemoChildNode);
+  // 出现死循环找我
 
   useEffect(function () {
     var editable = col.editable,
         dataIndex = col.dataIndex;
 
     if (isEdit && editable) {
-      form.setFieldsValue(_defineProperty({}, dataIndex, editable === 'date' && record[dataIndex] ? moment(record[dataIndex]) : record[dataIndex]));
-    }
-  }, [record]);
-
-  var handleTdHover = function handleTdHover() {
-    setHoverStatus(true);
-  };
-
-  var handleTdMouseOut = function handleTdMouseOut() {
-    setHoverStatus(false);
-  };
+      form.setFieldsValue(_defineProperty({}, dataIndex, editable === 'date' ? moment(record[dataIndex]) : record[dataIndex]));
+    } // if (
+    //   (isEdit && editable && record[dataIndex]) ||
+    //   (isHoverEdit && editable && record[dataIndex])
+    // ) {
+    //   form.setFieldsValue({
+    //     [dataIndex]: editable === 'date' ? moment(record[dataIndex]) : record[dataIndex],
+    //   })
+    // }
 
+  }, [record]);
   return /*#__PURE__*/React.createElement("td", Object.assign({}, omit(clearProps, ['dataIndex']), {
     className: cls(clearProps === null || clearProps === void 0 ? void 0 : clearProps.className, 'lm_custom_cell_td'),
-    onMouseEnter: componentProps.quickcopy ? handleTdHover : undefined,
-    onMouseLeave: componentProps.quickcopy ? handleTdMouseOut : undefined,
     key: "r".concat(rowIndex, "_c").concat(colIndex)
-  }), hoverStatus && props.rowIndex > 0 && /*#__PURE__*/React.createElement("span", {
-    className: 'quick_copy_warp quick_copy_up',
-    onClick: function onClick(e) {
-      return copyKey(e, 'up');
-    }
-  }, /*#__PURE__*/React.createElement(IconFont, {
-    type: 'lmweb-icon_up'
-  })), getMemoChildNode, hoverStatus && props.rowIndex < props.getLength - 1 && /*#__PURE__*/React.createElement("span", {
-    className: 'quick_copy_warp quick_copy_down',
-    onClick: function onClick(e) {
-      return copyKey(e, 'down');
-    }
-  }, /*#__PURE__*/React.createElement(IconFont, {
-    type: 'lmweb-icon_down'
-  })));
+  }), getMemoChildNode);
 };
-/** true 不刷新， false 刷新 */
 
-
-var MemoEditableCell = /*#__PURE__*/memo(EditableCell, function (prev, next) {
-  var pickProps = ['record', 'colIndex'];
-  var p = pick(prev, pickProps);
-  var n = 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 (!checkMemoShouldUploadSpecialFun(prev, next)) {
-    return false;
-  }
-
-  return isEqual(p, n);
-});
 var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
   var _a, _b;
 
@@ -660,21 +719,16 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
       _props$quickOpetateCl = props.quickOpetateClearAll,
       quickOpetateClearAll = _props$quickOpetateCl === void 0 ? true : _props$quickOpetateCl,
       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,
-      _props$loading = props.loading,
-      loading = _props$loading === void 0 ? false : _props$loading,
-      resetProps = __rest(props, ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "virtual", "sortOpen", "disabled", "colSortOpen", "indexCol", "filterChange", "size", "recordCreatorProps", "shouldUpdate", "loading"]);
+      resetProps = __rest(props, ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "sortOpen", "colSortOpen", "filterChange", "size", "recordCreatorProps", "shouldUpdate"]); // const [dataSource, setDataSource] = useState([]);
+
 
   var _useControllableValue = useControllableValue({
     value: checkRowKeyByDataSource(props.value, _rowKey),
@@ -682,7 +736,14 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
   }),
       _useControllableValue2 = _slicedToArray(_useControllableValue, 2),
       dataSource = _useControllableValue2[0],
-      setDataSource = _useControllableValue2[1];
+      setDataSource = _useControllableValue2[1]; // const [count, setCount] = useState(0);
+
+
+  var _useState5 = useState({}),
+      _useState6 = _slicedToArray(_useState5, 2),
+      _valid = _useState6[0],
+      setValid = _useState6[1]; // const [localRowSelectList, setLocalRowSelectList] = useState([])
+
 
   var transformRowSelect = function transformRowSelect(selectedRowKeys, selectedRows, info) {
     var _a;
@@ -699,28 +760,43 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
       _useControllableValue4 = _slicedToArray(_useControllableValue3, 2),
       localRowSelectList = _useControllableValue4[0],
       setLocalRowSelectList = _useControllableValue4[1];
-  /** TODO: 当前展开的列 */
-
 
   var _useState7 = useState([]),
       _useState8 = _slicedToArray(_useState7, 2),
-      expandedRowKeys = _useState8[0],
-      setExpandedRowKeys = _useState8[1];
+      sortEditTable = _useState8[0],
+      setCallBackFalg = _useState8[1];
+  /** 当前展开的列 */
+
+
+  var _useState9 = useState([]),
+      _useState10 = _slicedToArray(_useState9, 2),
+      expandedRowKeys = _useState10[0],
+      setExpandedRowKeys = _useState10[1];
 
-  var dataSourceRef = useRef(dataSource);
-  var deepDataSourceRef = useRef(deepDataSourcePreKeys(dataSource, _rowKey));
-  dataSourceRef.current = dataSource;
-  deepDataSourceRef.current = deepDataSourcePreKeys(dataSource, _rowKey);
-  var tableWarpRef = useRef(null);
+  var dataSourceRef = useRef([]);
+  var sortDataSorceRef = useRef([]);
+  var deepDataSourceRef = useRef([]);
+
+  var onSortEnd = function onSortEnd(active, over) {
+    var cloneArr = _toConsumableArray(dataSourceRef.current);
+
+    var oldIndex = cloneArr.findIndex(function (v) {
+      return v[_rowKey] === active;
+    });
+    var newIndex = cloneArr.findIndex(function (v) {
+      return v[_rowKey] === over;
+    });
+    setDataSource(arrayMove(cloneArr, oldIndex, newIndex));
+  };
 
   var onColSortEnd = function onColSortEnd(active, over) {
     var _a;
 
     var oldIndex = columns.findIndex(function (item) {
-      return item.dataIndex === active;
+      return item['dataIndex'] === active;
     });
     var newIndex = columns.findIndex(function (item) {
-      return item.dataIndex === over;
+      return item['dataIndex'] === over;
     });
     filterChange === null || filterChange === void 0 ? void 0 : filterChange((_a = arrayMove(columns, oldIndex, newIndex)) === null || _a === void 0 ? void 0 : _a.map(function (item, index) {
       return Object.assign(Object.assign({}, item), {
@@ -733,21 +809,55 @@ var EditTable = /*#__PURE__*/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 = debounce(function (row) {
+  var handleAdd = function handleAdd(row) {
     var _a;
 
     var addDataInfo = 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 = produce(dataSourceRef.current, function (draft) {
       draft.push(Object.assign(_defineProperty({}, _rowKey, "".concat(Date.now())), addDataInfo || {}));
     });
-    setDataSource(res);
-  }, 40);
+    setDataSource(res); // onChange?.(res)
+  };
+
+  useEffect(function () {
+    var _a;
+
+    dataSourceRef.current = dataSource;
+    deepDataSourceRef.current = deepDataSourcePreKeys(dataSource, _rowKey);
+
+    if (sortOpen) {
+      var dataSourceKeys = dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
+        return item[_rowKey];
+      }).join(',');
+      var setCallBackFalgKeys = ((_a = sortDataSorceRef.current) === null || _a === void 0 ? void 0 : _a.map(function (item) {
+        return item[_rowKey];
+      }).join(',')) || '';
+
+      if (dataSourceKeys !== setCallBackFalgKeys) {
+        setCallBackFalg(dataSource);
+        sortDataSorceRef.current = dataSource;
+      }
+    }
+  }, [dataSource]); // /** 本地缓存一个选择数据 */
+  // useEffect(() => {
+  //   if (rowSelection) {
+  //     const { selectedRowKeys } = rowSelection
+  //     if (selectedRowKeys) {
+  //       setLocalRowSelectList(localRowSelectList || [])
+  //     }
+  //   }
+  // }, [rowSelection])
+  // const editTableRowChange = (selectRows) => {
+  //   setLocalRowSelectList(selectRows);
+  //   // (rowSelection?.onChange as any)?.(selectRows)
+  // }
 
   var handleSave = function handleSave(row, options) {
     var _a, _b;
@@ -755,9 +865,9 @@ var EditTable = /*#__PURE__*/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 = 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;
+        var _ref2 = options === null || options === void 0 ? void 0 : options.only,
+            key = _ref2.key,
+            value = _ref2.value;
 
         if ((preKeys === null || preKeys === void 0 ? void 0 : preKeys.length) > 1) {
           var deeps = function deeps(children) {
@@ -820,26 +930,25 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
       }
     });
     setDataSource(res);
-  }; // 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 reWriteOriginSource = function reWriteOriginSource(rowKey, rowValue, dataIndex, nextValue) {
+    setDataSource(function (prevDataSource) {
+      return prevDataSource === null || prevDataSource === void 0 ? void 0 : prevDataSource.map(function (item) {
+        if (get(item, rowKey) === rowValue) {
+          set(item, dataIndex, nextValue);
+        }
+
+        return item;
+      });
+    });
+  }; // @ts-ignore
 
 
-  var handleTableRowDelete = debounce(function (key) {
+  var handleTableRowDelete = function handleTableRowDelete(key) {
     var _a, _b, _c;
 
-    var rkey = 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;
+    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;
 
     if (preKeys.length > 1) {
       /** 说明删除的是children中的数据 */
@@ -860,7 +969,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
         return newData;
       };
 
-      var res = filter(dataSourceRef.current, key);
+      var res = filter(dataSource, key);
       setDataSource(res);
     } else {
       if (((_c = dataSourceRef.current) === null || _c === void 0 ? void 0 : _c.length) === 1 && !quickOpetateClearAll) {
@@ -879,76 +988,34 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
 
       setDataSource(_res);
     }
-
-    return null;
-  }, 40);
-  /** 替换当前行 */
-
-  var handleTableRowReplace = debounce(function (record, defaultRecord) {
-    var _a, _b;
-
-    var rkey = 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 = debounce(function (record, isAppendInChindren, defaultRecord) {
+
+  var handleTableRowAdd = function handleTableRowAdd(record, isAppendInChindren) {
     var _a, _b;
 
-    var rkey = 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 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 res = produce(dataSourceRef.current, function (draft) {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c, _d;
 
-      if ((preKeys === null || preKeys === void 0 ? void 0 : preKeys.length) > 1) {
+      if (preKeys.length > 1) {
         var deeps = function deeps(children) {
           children === null || children === void 0 ? void 0 : children.forEach(function (item, index) {
-            var _a, _b;
+            var _a;
 
             if (preKeys === null || preKeys === void 0 ? void 0 : preKeys.includes(item[_rowKey])) {
-              if (item[_rowKey] === rkey) {
+              if (item[_rowKey] === record[_rowKey]) {
                 if (isAppendInChindren) {
                   if (item === null || item === void 0 ? void 0 : item.children) {
-                    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, _toConsumableArray(defaultRecord));
-                    } else {
-                      (_b = item === null || item === void 0 ? void 0 : item.children) === null || _b === void 0 ? void 0 : _b.push(defaultRecord || _defineProperty({}, _rowKey, "".concat(Date.now())));
-                    }
+                    (_a = item === null || item === void 0 ? void 0 : item.children) === null || _a === void 0 ? void 0 : _a.push(_defineProperty({}, _rowKey, "".concat(Date.now())));
                   } else {
-                    if (Array.isArray(defaultRecord)) {
-                      item.children = _toConsumableArray(defaultRecord);
-                    } else {
-                      item.children = [defaultRecord || _defineProperty({}, _rowKey, "".concat(Date.now()))];
-                    }
+                    item.children = [_defineProperty({}, _rowKey, "".concat(Date.now()))];
                   }
 
                   !expandedRowKeys.includes(item[_rowKey]) && setExpandedRowKeys([].concat(_toConsumableArray(expandedRowKeys), [item[_rowKey]]));
                 } else {
-                  if (Array.isArray(defaultRecord)) {
-                    children.splice.apply(children, [index + 1, 0].concat(_toConsumableArray(defaultRecord)));
-                  } else {
-                    children.splice(index + 1, 0, defaultRecord || _defineProperty({}, _rowKey, "".concat(Date.now())));
-                  }
+                  children.splice(index + 1, 0, _defineProperty({}, _rowKey, "".concat(Date.now())));
                 }
               } else if (item.children) {
                 deeps(item.children);
@@ -960,44 +1027,31 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
         deeps(draft);
       } else {
         var index = draft.findIndex(function (item) {
-          return rkey === item[_rowKey];
+          return record[_rowKey] === item[_rowKey];
         });
 
         if (index !== -1) {
           if (isAppendInChindren) {
             if ((_a = draft[index].children) === null || _a === void 0 ? void 0 : _a.length) {
-              if (Array.isArray(defaultRecord)) {
-                var _b2;
-
-                (_b = draft[index].children) === null || _b === void 0 ? void 0 : (_b2 = _b).push.apply(_b2, _toConsumableArray(defaultRecord));
-              } else {
-                (_c = draft[index].children) === null || _c === void 0 ? void 0 : _c.push(defaultRecord || _defineProperty({}, _rowKey, "".concat(Date.now())));
-              }
+              (_b = draft[index].children) === null || _b === void 0 ? void 0 : _b.push(_defineProperty({}, _rowKey, "".concat(Date.now())));
             } else {
-              draft[index].children = Array.isArray(defaultRecord) ? _toConsumableArray(defaultRecord) : [defaultRecord || _defineProperty({}, _rowKey, "".concat(Date.now()))];
+              draft[index].children = [_defineProperty({}, _rowKey, "".concat(Date.now()))];
             }
 
-            !expandedRowKeys.includes((_d = draft[index]) === null || _d === void 0 ? void 0 : _d[_rowKey]) && setExpandedRowKeys([].concat(_toConsumableArray(expandedRowKeys), [(_e = draft[index]) === null || _e === void 0 ? void 0 : _e[_rowKey]]));
+            !expandedRowKeys.includes((_c = draft[index]) === null || _c === void 0 ? void 0 : _c[_rowKey]) && setExpandedRowKeys([].concat(_toConsumableArray(expandedRowKeys), [(_d = draft[index]) === null || _d === void 0 ? void 0 : _d[_rowKey]]));
           } else {
-            if (Array.isArray(defaultRecord)) {
-              draft.splice.apply(draft, [index + 1, 0].concat(_toConsumableArray(defaultRecord)));
-            } else {
-              draft.splice(index + 1, 0, defaultRecord || _defineProperty({}, _rowKey, "".concat(Date.now())));
-            }
+            draft.splice(index + 1, 0, _defineProperty({}, _rowKey, "".concat(Date.now())));
           }
         }
       }
     });
     setDataSource(res);
-  }, 50);
-  /** 快捷刷子功能 */
+  };
 
-  var handleCopy = function handleCopy(key, value, type, rowIndex) {
+  var handleCopy = function handleCopy(key, value) {
     var res = produce(dataSourceRef.current, function (draft) {
-      draft === null || draft === void 0 ? void 0 : draft.forEach(function (item, index) {
-        if (type === 'up' && index < rowIndex || type === 'down' && index > rowIndex) {
-          item[key] = value;
-        }
+      draft === null || draft === void 0 ? void 0 : draft.forEach(function (item) {
+        return item[key] = value;
       });
     });
     setDataSource(res);
@@ -1006,16 +1060,17 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
 
 
   var hasDisableOptions = useMemo(function () {
+    // const hasOnlyOptionsDatas = columns.filter(item => item?.['componentProps']?.optionOnly)
     var hasOnlyOptionsDatas = columns.filter(function (item) {
       var _a;
 
       var resultComponentProps = 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) {
-        return item.dataIndex;
+        return item['dataIndex'];
       });
     }
 
@@ -1027,11 +1082,12 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
     var newColumns = columns === null || columns === void 0 ? void 0 : columns.map(function (item) {
       var _a;
 
-      var resultComponentProps = isFunction(item.componentProps) ? (_a = item.componentProps) === null || _a === void 0 ? void 0 : _a.call(item, {}, item) : item.componentProps;
+      var resultComponentProps = isFunction(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;
+
+      var _ref5 = resultComponentProps || {},
+          optionOnly = _ref5.optionOnly,
+          options = _ref5.options; // const { optionOnly, options } = item['componentProps'] || {}
 
-      var _ref8 = resultComponentProps || {},
-          optionOnly = _ref8.optionOnly,
-          options = _ref8.options;
 
       if (optionOnly && options) {
         var dataIndex = item.dataIndex;
@@ -1051,7 +1107,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
         }
 
         return Object.assign(Object.assign({}, item), {
-          componentProps: Object.assign(Object.assign({}, item.componentProps), {
+          componentProps: Object.assign(Object.assign({}, item['componentProps']), {
             options: newOptions
           })
         });
@@ -1070,47 +1126,16 @@ var EditTable = /*#__PURE__*/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.createElement(DragHandle, {
-          id: (record === null || record === void 0 ? void 0 : record[_rowKey]) || (record === null || record === void 0 ? void 0 : record.id)
+          id: record[_rowKey] || record.id
         });
       }
-    } : null, indexCol ? 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 (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(_toConsumableArray(rColumns), [useQuickOpetate ? {
+    } : null].concat(_toConsumableArray(rColumns), [useQuickOpetate ? {
       title: '操作',
       dataIndex: 'lm_edit_opetate',
       width: 68,
@@ -1121,11 +1146,11 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
         options: Array.isArray(useQuickOpetate) ? useQuickOpetate : ['add', 'delete']
       }
     } : null]).filter(function (item) {
-      return item && (item === null || item === void 0 ? void 0 : item.show) !== false;
+      return item && item.show !== false;
     });
-    localColumns = localColumns === null || localColumns === void 0 ? void 0 : localColumns.map(function (item, index) {
+    localColumns = localColumns.map(function (item, index) {
       return Object.assign(Object.assign({}, item), {
-        order: [null, undefined].includes(item.order) ? index : item.order
+        order: [null, undefined].includes(item['order']) ? index : item['order']
       });
     }).sort(function (a, b) {
       return a.order - b.order;
@@ -1148,22 +1173,29 @@ var EditTable = /*#__PURE__*/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) && (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;
+      if (!col.editable && !((_a = col.children) === null || _a === void 0 ? void 0 : _a.length)) {
+        return col;
+      }
+
+      var newCol = Object.assign(Object.assign({}, col), {
+        shouldCellUpdate: function shouldCellUpdate(record, prevRecord) {
+          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);
+          var dataIndex = col.dataIndex,
+              editable = col.editable,
+              relevanceCols = col.relevanceCols,
+              componentProps = col.componentProps;
+
+          if (componentProps && isFunction(componentProps)) {
+            return true;
           }
-        });
-      }
 
-      if (isEdit && (col === null || col === void 0 ? void 0 : col.render) && (col === null || col === void 0 ? void 0 : col.editable) === 'render') {
-        delete col.render;
-      }
+          if ((col === null || col === void 0 ? void 0 : col.fixed) || hasDisableOptions && hasDisableOptions.includes(dataIndex) || ((_a = col.componentProps) === null || _a === void 0 ? void 0 : _a.options) || editable === 'render' || !!relevanceCols || !!shouldUpdate || !!record.children) {
+            return true;
+          }
 
-      var newCol = Object.assign(Object.assign({}, col), {
+          return record[dataIndex] !== prevRecord[dataIndex];
+        },
         onCell: function onCell(record, rowIndex) {
           return {
             getLength: dataSource.length,
@@ -1178,7 +1210,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
             editable: col.editable,
             dataIndex: col.dataIndex,
             itemProps: col.itemProps,
-            shouldUpdate: shouldUpdate,
+            setValid: setValid,
             isEdit: isEdit,
             isHoverEdit: isHoverEdit,
             handleAdd: handleAdd,
@@ -1186,7 +1218,8 @@ var EditTable = /*#__PURE__*/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
+            handleSave: handleSave,
+            reWriteOriginSource: reWriteOriginSource
           };
         }
       });
@@ -1198,24 +1231,24 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
       return newCol;
     };
 
-    var res = localColumns === null || localColumns === void 0 ? void 0 : localColumns.map(function (col, index) {
+    var res = localColumns.map(function (col, index) {
       return mapColumns(col, index);
     });
     return res;
-  }, [columns, isAdd, sortOpen, useQuickOpetate, dataSource, _toConsumableArray(memoOptions)]);
-
-  var onSortEnd = function onSortEnd(active, over) {
-    var cloneArr = _toConsumableArray(dataSourceRef.current);
+  }, [columns, isAdd, sortOpen, useQuickOpetate, sortEditTable, dataSource, _toConsumableArray(memoOptions)]);
+  var DraggableContainer = useCallback(function (_a) {
+    var _b;
 
-    var oldIndex = cloneArr.findIndex(function (v) {
-      return v[_rowKey] === active;
-    });
-    var newIndex = cloneArr.findIndex(function (v) {
-      return v[_rowKey] === over;
-    });
-    setDataSource(arrayMove(cloneArr, oldIndex, newIndex));
-  };
+    var props = __rest(_a, []);
 
+    return /*#__PURE__*/React.createElement(DndContainer, {
+      move: onSortEnd
+    }, /*#__PURE__*/React.createElement(SortableBox, {
+      items: (_b = dataSourceRef.current) === null || _b === void 0 ? void 0 : _b.map(function (item) {
+        return item[_rowKey];
+      })
+    }, /*#__PURE__*/React.createElement("tbody", Object.assign({}, props))));
+  }, [sortEditTable]);
   var colDraggableContainer = useCallback(function (_a) {
     var _b;
 
@@ -1233,18 +1266,40 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
       }, child);
     }));
   }, [columns]);
+  var config = useMemo(function () {
+    var component = {
+      body: Object.assign({
+        row: sortOpen ? EditableSortRow : EditableRow,
+        cell: EditableCell
+      }, sortOpen ? {
+        wrapper: DraggableContainer
+      } : {})
+    };
+
+    if (colSortOpen) {
+      component['header'] = {
+        row: colDraggableContainer
+      };
+    }
+
+    return Object.assign({
+      pagination: false,
+      tableLayout: 'fixed',
+      scroll: {
+        x: '100%'
+      },
+      rowKey: function rowKey(record) {
+        return record[_rowKey] || record.index || Math.random();
+      },
+      components: component
+    }, resetProps);
+  }, [resultColumns, dataSource, sortOpen, colSortOpen, size]);
   useImperativeHandle(ref, function () {
     return {
       setRow: handleSave,
       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: []
@@ -1254,80 +1309,32 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
         setLocalRowSelectList({
           selectedRows: value
         });
+      },
+      valid: function valid() {
+        return _valid;
       }
     };
   });
   var isShowAddAction = useMemo(function () {
     return isEdit && isAdd || isHoverEdit && isAdd;
   }, [isEdit, isAdd, isHoverEdit]);
-  var config = useRef(Object.assign({
-    pagination: false,
-    tableLayout: 'fixed',
-    scroll: {
-      x: '100%'
-    },
-    rowKey: function rowKey(record) {
-      return record[_rowKey] || record.index || Math.random();
-    },
-    components: {
-      table: virtual ? VirtualTable : null,
-      body: Object.assign({
-        row: function row(rowProps) {
-          return sortOpen ? EditableSortRow(Object.assign(Object.assign({}, rowProps), {
-            virtual: virtual
-          })) : EditableRow(Object.assign(Object.assign({}, rowProps), {
-            virtual: virtual
-          }));
-        },
-        cell: MemoEditableCell
-      }, sortOpen ? {
-        wrapper: function wrapper(wrapperProps) {
-          var _a, _b, _c;
-
-          return DraggableContainer(Object.assign(Object.assign({}, wrapperProps), {
-            virtual: virtual,
-            keys: (_a = dataSourceRef.current) === null || _a === void 0 ? void 0 : _a.map(function (item) {
-              return item[_rowKey];
-            }),
-            options: dataSourceRef.current,
-            rowKey: _rowKey,
-            onSortEnd: onSortEnd,
-            tableWidth: (_c = (_b = tableWarpRef === null || tableWarpRef === void 0 ? void 0 : tableWarpRef.current) === null || _b === void 0 ? void 0 : _b.getBoundingClientRect()) === null || _c === void 0 ? void 0 : _c.width
-          }));
-        }
-      } : virtual ? {
-        wrapper: VirtualWrapper
-      } : {}),
-      header: {
-        row: colSortOpen ? colDraggableContainer : null
-      }
-    },
-    onRow: function onRow(record, index) {
-      return {
-        disabled: disabled
-      };
-    }
-  }, resetProps));
 
   if (colSortOpen) {
     return /*#__PURE__*/React.createElement("div", {
-      className: "lm_editTable_warpper",
-      ref: tableWarpRef
+      className: "lm_editTable_warpper"
     }, /*#__PURE__*/React.createElement(DndContainer, {
-      rowKey: _rowKey,
-      options: resultColumns,
       move: onColSortEnd
     }, /*#__PURE__*/React.createElement(SortableBoxCol, {
       items: columns.reduce(function (acc, item) {
         return [].concat(_toConsumableArray(acc), [item.dataIndex]);
       }, [])
-    }, /*#__PURE__*/React.createElement(Table, Object.assign({}, config.current, {
-      loading: loading,
+    }, /*#__PURE__*/React.createElement(Table, Object.assign({}, config, {
       size: size || 'small',
       columns: resultColumns,
       rowClassName: "editable-row",
       bordered: true,
       pagination: false,
+      // components={tableComponents}
       rowSelection: !rowSelection ? undefined : Object.assign(Object.assign({
         fixed: true,
         type: 'checkbox',
@@ -1337,39 +1344,36 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
           return isObject(v) ? v[_rowKey] : v;
         }),
         onChange: function onChange(selectedRowKeys, selectedRows, info) {
+          // editTableRowChange(selectedRowKeys, selectedRows, info)
           setLocalRowSelectList(selectedRowKeys, selectedRows, info);
         }
       }),
       dataSource: dataSource
-    })))), /*#__PURE__*/React.createElement(BottomOpetateComponent, {
-      disabled: disabled,
-      isShowAddAction: isShowAddAction,
-      recordCreatorProps: recordCreatorProps,
-      handleAdd: handleAdd
-    }));
+    })))), isShowAddAction && /*#__PURE__*/React.createElement(Button, {
+      className: "lm_editTable_add_bar",
+      type: "dashed",
+      onClick: handleAdd,
+      style: {
+        marginTop: 8
+      }
+    }, /*#__PURE__*/React.createElement(PlusCircleOutlined, {
+      className: "lmweb-plus"
+    }), "\u65B0\u589E"));
   } // @ts-ignore
 
 
   return /*#__PURE__*/React.createElement("div", {
-    className: "lm_editTable_warpper",
-    ref: tableWarpRef
-  }, /*#__PURE__*/React.createElement(Table, Object.assign({}, config.current, {
+    className: "lm_editTable_warpper"
+  }, /*#__PURE__*/React.createElement(Table, Object.assign({}, config, {
     size: size || 'small',
     columns: resultColumns,
     rowClassName: "editable-row",
     bordered: true,
-    loading: loading,
     pagination: false,
     // components={tableComponents}
     expandable: (resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable) || {
       expandedRowKeys: expandedRowKeys,
       fixed: true,
-      // indentSize: 0,
-      expandIconColumnIndex: checkExpandIconColumnIndex({
-        rowSelection: rowSelection,
-        sortOpen: sortOpen,
-        indexCol: indexCol
-      }) || 0,
       onExpandedRowsChange: function onExpandedRowsChange(expandedRows) {
         return setExpandedRowKeys(expandedRows);
       }
@@ -1387,11 +1391,15 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
       }
     }),
     dataSource: dataSource
-  })), /*#__PURE__*/React.createElement(BottomOpetateComponent, {
-    disabled: disabled,
-    isShowAddAction: isShowAddAction,
-    recordCreatorProps: recordCreatorProps,
-    handleAdd: handleAdd
-  }));
+  })), isShowAddAction && /*#__PURE__*/React.createElement(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.createElement(IconFont, {
+    type: "lmweb-plus"
+  }), (recordCreatorProps === null || recordCreatorProps === void 0 ? void 0 : recordCreatorProps.creatorButtonText) || '新增'));
 });
 export default /*#__PURE__*/memo(EditTable);