linkmore-design 1.0.82 → 1.0.83

package/es/Form/style/index.css

@@ -1,3 +1,6 @@
+@import url(./form.css);
+@import url(./grid.css);
+@import url(./tooltip.css);
 .ant-layout-sider {
   min-height: 100vh;
   background-color: #022766;
@@ -515,6 +518,9 @@ p {
 .lm_form.ant-form .ant-form-item .ant-form-item-explain {
   line-height: 24px;
 }
+.lm_form.ant-form.ant-form-horizontal .ant-form-item-label {
+  margin-top: 8px;
+}
 .lm_form.ant-form .ant-form-item-label {
   display: flex;
   align-items: center;
@@ -522,7 +528,6 @@ p {
   line-height: 18px;
   padding: 0;
   margin-bottom: 8px;
-  margin-top: 8px;
 }
 .lm_form.ant-form .ant-form-item-label > label {
   width: 132px;

package/es/Form/style/index.d.ts

@@ -1,4 +1 @@
-import '../../../node_modules/antd/es/form/style/index.css';
-import '../../../node_modules/antd/es/grid/style/index.css';
-import '../../../node_modules/antd/es/tooltip/style/index.css';
 import './index.less';

package/es/Form/style/index.js

@@ -1,5 +1 @@
-import '../../../node_modules/antd/es/form/style/index.css'; // style dependencies
-
-import '../../../node_modules/antd/es/grid/style/index.css';
-import '../../../node_modules/antd/es/tooltip/style/index.css';
 import "./index.css";

package/es/Form/style/tooltip.css

@@ -0,0 +1,275 @@
+/* stylelint-disable at-rule-empty-line-before,at-rule-name-space-after,at-rule-no-unknown */
+/* stylelint-disable no-duplicate-selectors */
+/* stylelint-disable */
+/* stylelint-disable declaration-bang-space-before,no-duplicate-selectors,string-no-newline */
+.ant-tooltip {
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+  color: rgba(0, 0, 0, 0.85);
+  font-size: 14px;
+  font-variant: tabular-nums;
+  line-height: 1.5715;
+  list-style: none;
+  font-feature-settings: 'tnum';
+  position: absolute;
+  z-index: 1070;
+  display: block;
+  width: -webkit-max-content;
+  width: -moz-max-content;
+  width: max-content;
+  width: intrinsic;
+  max-width: 250px;
+  visibility: visible;
+}
+.ant-tooltip-content {
+  position: relative;
+}
+.ant-tooltip-hidden {
+  display: none;
+}
+.ant-tooltip-placement-top,
+.ant-tooltip-placement-topLeft,
+.ant-tooltip-placement-topRight {
+  padding-bottom: 14.3137085px;
+}
+.ant-tooltip-placement-right,
+.ant-tooltip-placement-rightTop,
+.ant-tooltip-placement-rightBottom {
+  padding-left: 14.3137085px;
+}
+.ant-tooltip-placement-bottom,
+.ant-tooltip-placement-bottomLeft,
+.ant-tooltip-placement-bottomRight {
+  padding-top: 14.3137085px;
+}
+.ant-tooltip-placement-left,
+.ant-tooltip-placement-leftTop,
+.ant-tooltip-placement-leftBottom {
+  padding-right: 14.3137085px;
+}
+.ant-tooltip-inner {
+  min-width: 30px;
+  min-height: 32px;
+  padding: 6px 8px;
+  color: #fff;
+  text-align: left;
+  text-decoration: none;
+  word-wrap: break-word;
+  background-color: rgba(0, 0, 0, 0.75);
+  border-radius: 2px;
+  box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
+}
+.ant-tooltip-arrow {
+  position: absolute;
+  z-index: 2;
+  display: block;
+  width: 22px;
+  height: 22px;
+  overflow: hidden;
+  background: transparent;
+  pointer-events: none;
+}
+.ant-tooltip-arrow-content {
+  --antd-arrow-background-color: linear-gradient(to right bottom, rgba(0, 0, 0, 0.65), rgba(0, 0, 0, 0.75));
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  display: block;
+  width: 11.3137085px;
+  height: 11.3137085px;
+  margin: auto;
+  content: '';
+  pointer-events: auto;
+  border-radius: 0 0 2px;
+  pointer-events: none;
+}
+.ant-tooltip-arrow-content::before {
+  position: absolute;
+  top: -11.3137085px;
+  left: -11.3137085px;
+  width: 33.9411255px;
+  height: 33.9411255px;
+  background: var(--antd-arrow-background-color);
+  background-repeat: no-repeat;
+  background-position: -10px -10px;
+  content: '';
+  -webkit-clip-path: inset(33% 33%);
+          clip-path: inset(33% 33%);
+  -webkit-clip-path: path('M 9.849242404917499 24.091883092036785 A 5 5 0 0 1 13.384776310850237 22.627416997969522 L 20.627416997969522 22.627416997969522 A 2 2 0 0 0 22.627416997969522 20.627416997969522 L 22.627416997969522 13.384776310850237 A 5 5 0 0 1 24.091883092036785 9.849242404917499 L 23.091883092036785 9.849242404917499 L 9.849242404917499 23.091883092036785 Z');
+          clip-path: path('M 9.849242404917499 24.091883092036785 A 5 5 0 0 1 13.384776310850237 22.627416997969522 L 20.627416997969522 22.627416997969522 A 2 2 0 0 0 22.627416997969522 20.627416997969522 L 22.627416997969522 13.384776310850237 A 5 5 0 0 1 24.091883092036785 9.849242404917499 L 23.091883092036785 9.849242404917499 L 9.849242404917499 23.091883092036785 Z');
+}
+.ant-tooltip-placement-top .ant-tooltip-arrow,
+.ant-tooltip-placement-topLeft .ant-tooltip-arrow,
+.ant-tooltip-placement-topRight .ant-tooltip-arrow {
+  bottom: 0;
+  transform: translateY(100%);
+}
+.ant-tooltip-placement-top .ant-tooltip-arrow-content,
+.ant-tooltip-placement-topLeft .ant-tooltip-arrow-content,
+.ant-tooltip-placement-topRight .ant-tooltip-arrow-content {
+  box-shadow: 3px 3px 7px rgba(0, 0, 0, 0.07);
+  transform: translateY(-11px) rotate(45deg);
+}
+.ant-tooltip-placement-top .ant-tooltip-arrow {
+  left: 50%;
+  transform: translateY(100%) translateX(-50%);
+}
+.ant-tooltip-placement-topLeft .ant-tooltip-arrow {
+  left: 13px;
+}
+.ant-tooltip-placement-topRight .ant-tooltip-arrow {
+  right: 13px;
+}
+.ant-tooltip-placement-right .ant-tooltip-arrow,
+.ant-tooltip-placement-rightTop .ant-tooltip-arrow,
+.ant-tooltip-placement-rightBottom .ant-tooltip-arrow {
+  left: 0;
+  transform: translateX(-100%);
+}
+.ant-tooltip-placement-right .ant-tooltip-arrow-content,
+.ant-tooltip-placement-rightTop .ant-tooltip-arrow-content,
+.ant-tooltip-placement-rightBottom .ant-tooltip-arrow-content {
+  box-shadow: -3px 3px 7px rgba(0, 0, 0, 0.07);
+  transform: translateX(11px) rotate(135deg);
+}
+.ant-tooltip-placement-right .ant-tooltip-arrow {
+  top: 50%;
+  transform: translateX(-100%) translateY(-50%);
+}
+.ant-tooltip-placement-rightTop .ant-tooltip-arrow {
+  top: 5px;
+}
+.ant-tooltip-placement-rightBottom .ant-tooltip-arrow {
+  bottom: 5px;
+}
+.ant-tooltip-placement-left .ant-tooltip-arrow,
+.ant-tooltip-placement-leftTop .ant-tooltip-arrow,
+.ant-tooltip-placement-leftBottom .ant-tooltip-arrow {
+  right: 0;
+  transform: translateX(100%);
+}
+.ant-tooltip-placement-left .ant-tooltip-arrow-content,
+.ant-tooltip-placement-leftTop .ant-tooltip-arrow-content,
+.ant-tooltip-placement-leftBottom .ant-tooltip-arrow-content {
+  box-shadow: 3px -3px 7px rgba(0, 0, 0, 0.07);
+  transform: translateX(-11px) rotate(315deg);
+}
+.ant-tooltip-placement-left .ant-tooltip-arrow {
+  top: 50%;
+  transform: translateX(100%) translateY(-50%);
+}
+.ant-tooltip-placement-leftTop .ant-tooltip-arrow {
+  top: 5px;
+}
+.ant-tooltip-placement-leftBottom .ant-tooltip-arrow {
+  bottom: 5px;
+}
+.ant-tooltip-placement-bottom .ant-tooltip-arrow,
+.ant-tooltip-placement-bottomLeft .ant-tooltip-arrow,
+.ant-tooltip-placement-bottomRight .ant-tooltip-arrow {
+  top: 0;
+  transform: translateY(-100%);
+}
+.ant-tooltip-placement-bottom .ant-tooltip-arrow-content,
+.ant-tooltip-placement-bottomLeft .ant-tooltip-arrow-content,
+.ant-tooltip-placement-bottomRight .ant-tooltip-arrow-content {
+  box-shadow: -3px -3px 7px rgba(0, 0, 0, 0.07);
+  transform: translateY(11px) rotate(225deg);
+}
+.ant-tooltip-placement-bottom .ant-tooltip-arrow {
+  left: 50%;
+  transform: translateY(-100%) translateX(-50%);
+}
+.ant-tooltip-placement-bottomLeft .ant-tooltip-arrow {
+  left: 13px;
+}
+.ant-tooltip-placement-bottomRight .ant-tooltip-arrow {
+  right: 13px;
+}
+.ant-tooltip-pink .ant-tooltip-inner {
+  background-color: #eb2f96;
+}
+.ant-tooltip-pink .ant-tooltip-arrow-content::before {
+  background: #eb2f96;
+}
+.ant-tooltip-magenta .ant-tooltip-inner {
+  background-color: #eb2f96;
+}
+.ant-tooltip-magenta .ant-tooltip-arrow-content::before {
+  background: #eb2f96;
+}
+.ant-tooltip-red .ant-tooltip-inner {
+  background-color: #f5222d;
+}
+.ant-tooltip-red .ant-tooltip-arrow-content::before {
+  background: #f5222d;
+}
+.ant-tooltip-volcano .ant-tooltip-inner {
+  background-color: #fa541c;
+}
+.ant-tooltip-volcano .ant-tooltip-arrow-content::before {
+  background: #fa541c;
+}
+.ant-tooltip-orange .ant-tooltip-inner {
+  background-color: #fa8c16;
+}
+.ant-tooltip-orange .ant-tooltip-arrow-content::before {
+  background: #fa8c16;
+}
+.ant-tooltip-yellow .ant-tooltip-inner {
+  background-color: #fadb14;
+}
+.ant-tooltip-yellow .ant-tooltip-arrow-content::before {
+  background: #fadb14;
+}
+.ant-tooltip-gold .ant-tooltip-inner {
+  background-color: #faad14;
+}
+.ant-tooltip-gold .ant-tooltip-arrow-content::before {
+  background: #faad14;
+}
+.ant-tooltip-cyan .ant-tooltip-inner {
+  background-color: #13c2c2;
+}
+.ant-tooltip-cyan .ant-tooltip-arrow-content::before {
+  background: #13c2c2;
+}
+.ant-tooltip-lime .ant-tooltip-inner {
+  background-color: #a0d911;
+}
+.ant-tooltip-lime .ant-tooltip-arrow-content::before {
+  background: #a0d911;
+}
+.ant-tooltip-green .ant-tooltip-inner {
+  background-color: #52c41a;
+}
+.ant-tooltip-green .ant-tooltip-arrow-content::before {
+  background: #52c41a;
+}
+.ant-tooltip-blue .ant-tooltip-inner {
+  background-color: #1890ff;
+}
+.ant-tooltip-blue .ant-tooltip-arrow-content::before {
+  background: #1890ff;
+}
+.ant-tooltip-geekblue .ant-tooltip-inner {
+  background-color: #2f54eb;
+}
+.ant-tooltip-geekblue .ant-tooltip-arrow-content::before {
+  background: #2f54eb;
+}
+.ant-tooltip-purple .ant-tooltip-inner {
+  background-color: #722ed1;
+}
+.ant-tooltip-purple .ant-tooltip-arrow-content::before {
+  background: #722ed1;
+}
+.ant-tooltip-rtl {
+  direction: rtl;
+}
+.ant-tooltip-rtl .ant-tooltip-inner {
+  text-align: right;
+}

package/es/LmEditTable/EditTable.d.ts

@@ -14,6 +14,11 @@ interface ILmEditTable extends TableProps<any> {
     size?: TableProps<any>['size'];
     colSortOpen?: boolean;
     filterChange?: (data: TableProps<any>['columns']) => void;
+    recordCreatorProps?: {
+        creatorButtonText?: string;
+        style?: Record<string, any>;
+        initData?: Record<string, any> | (() => Record<string, any>);
+    };
 }
 interface ILmColumns extends TableColumnType<any> {
     editable?: 'input' | 'number' | 'inputRange' | 'date' | 'select' | 'multiple' | 'checkbox' | 'radio' | 'switch' | 'upload' | 'operate' | 'lm_edit_opetate' | 'render';
@@ -23,6 +28,7 @@ interface ILmColumns extends TableColumnType<any> {
     valueType?: any;
     order?: number;
     componentProps?: Record<string, any>;
+    relevanceCols?: boolean;
 }
 export declare type TLmEditTable = {
     onChange?: (data: any[]) => void;

package/es/LmEditTable/EditTable.js

@@ -54,7 +54,7 @@ import { PlusCircleOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { arrayMove } from '@dnd-kit/sortable';
 import { Button, Checkbox, IconFont, Input, InputNumber, Radio, Select, Table, Switch, DatePicker, Form } from 'linkmore-design';
-import { get, set, isFunction } from 'lodash';
+import { get, set, isFunction, omit } from 'lodash';
 import React, { forwardRef, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState, memo, useCallback } from 'react';
 import { produce } from 'immer';
 import DndContainer from './DndContainer';
@@ -64,6 +64,8 @@ import SortableItem from './sortableItem';
 import ColSortableItem from './sortableItemCol';
 import DragHandle from './DragHandle';
 import UploadOss from '../UploadOss';
+import { isObjEmpty } from './util';
+import cls from "classnames";
 var UploadBtn = UploadOss.UploadBtn;
 var EditableContext = /*#__PURE__*/React.createContext(null); // 表格行
 
@@ -182,7 +184,9 @@ var Opetate = function Opetate(_ref) {
       handleAdd = _ref.handleAdd,
       handleDelete = _ref.handleDelete,
       _ref$options = _ref.options,
-      options = _ref$options === void 0 ? ['add', 'delete'] : _ref$options;
+      options = _ref$options === void 0 ? ['add', 'delete'] : _ref$options,
+      getLength = _ref.getLength,
+      quickOpetateClearAll = _ref.quickOpetateClearAll;
   return /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'flex',
@@ -192,6 +196,7 @@ var Opetate = function Opetate(_ref) {
   }, 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: {
@@ -236,8 +241,11 @@ var EditableCell = function EditableCell(props) {
       isEdit = props.isEdit,
       _props$col = props.col,
       col = _props$col === void 0 ? {} : _props$col,
+      rowIndex = props.rowIndex,
+      colIndex = props.colIndex,
       handleTableRowDelete = props.handleTableRowDelete,
       handleTableRowAdd = props.handleTableRowAdd,
+      quickOpetateClearAll = props.quickOpetateClearAll,
       getLength = props.getLength,
       isHoverEdit = props.isHoverEdit,
       editEnum = props.editEnum,
@@ -250,7 +258,7 @@ var EditableCell = function EditableCell(props) {
       itemProps = props.itemProps,
       setValid = props.setValid,
       reWriteOriginSource = props.reWriteOriginSource,
-      restProps = __rest(props, ["record", "rowKey", "isEdit", "col", "handleTableRowDelete", "handleTableRowAdd", "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", "setValid", "reWriteOriginSource"]);
   /** 去除移入移出功能，保留最纯粹的功能，优化性能 */
 
 
@@ -295,20 +303,24 @@ var EditableCell = function EditableCell(props) {
           switch (_context.prev = _context.next) {
             case 0:
               _context.prev = 0;
-              _context.t0 = row;
 
-              if (_context.t0) {
-                _context.next = 6;
+              if (!row) {
+                _context.next = 5;
                 break;
               }
 
-              _context.next = 5;
-              return form.getFieldsValue();
+              _context.t0 = omit(row, 'onChange');
+              _context.next = 8;
+              break;
 
             case 5:
+              _context.next = 7;
+              return form.getFieldsValue();
+
+            case 7:
               _context.t0 = _context.sent;
 
-            case 6:
+            case 8:
               values = _context.t0;
               resultComponentProps = isFunction(componentProps) ? componentProps === null || componentProps === void 0 ? void 0 : componentProps(record, col) : componentProps; // console.time('testForEach');
 
@@ -326,10 +338,10 @@ var EditableCell = function EditableCell(props) {
               } // console.timeEnd('testForEach');
 
 
-              _context.next = 11;
+              _context.next = 13;
               return form.validateFields();
 
-            case 11:
+            case 13:
               if (col === null || col === void 0 ? void 0 : col.hoverEdit) {
                 toggleEdit();
               } // // 清空异常校验
@@ -340,31 +352,25 @@ var EditableCell = function EditableCell(props) {
               // })
 
 
-              _context.next = 16;
+              _context.next = 18;
               break;
 
-            case 14:
-              _context.prev = 14;
+            case 16:
+              _context.prev = 16;
               _context.t1 = _context["catch"](0);
 
-            case 16:
+            case 18:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[0, 14]]);
+      }, _callee, null, [[0, 16]]);
     }));
   }; // 触发保存
 
 
   var handleFormItemChange = function handleFormItemChange(e) {
-    save === null || save === void 0 ? void 0 : save(); // const { dataIndex } = col
-    // if (componentProps.isOnlyValue !== undefined) {
-    //   console.log(777)
-    //   handleCopy?.(dataIndex, componentProps.isOnlyValue)
-    // } else {
-    //   save?.()
-    // }
+    save === null || save === void 0 ? void 0 : save();
   };
   /** 快捷刷子，把当前的所有列的值，刷成当前的选中的列 */
 
@@ -474,10 +480,11 @@ var EditableCell = function EditableCell(props) {
         }, resultComponentProps));
 
       case 'switch':
-        return /*#__PURE__*/React.createElement(Switch, {
-          size: 'small',
+        return /*#__PURE__*/React.createElement(Switch, Object.assign({
+          size: 'small'
+        }, resultComponentProps, {
           onChange: handleFormItemChange
-        });
+        }));
 
       case 'upload':
         return /*#__PURE__*/React.createElement(UploadSingle, {
@@ -494,13 +501,15 @@ var EditableCell = function EditableCell(props) {
           ref: inputRef,
           handleAdd: handleTableRowAdd,
           handleDelete: handleTableRowDelete,
-          getLength: getLength
+          getLength: getLength,
+          quickOpetateClearAll: quickOpetateClearAll
         }, resultComponentProps));
 
       case 'render':
         {
           var render = resultComponentProps.render;
-          return render === null || render === void 0 ? void 0 : render(Object.assign(Object.assign({}, record), {
+          var fromData = form.getFieldsValue();
+          return render === null || render === void 0 ? void 0 : render(Object.assign(Object.assign({}, !isObjEmpty(fromData) ? fromData : record), {
             onChange: save
           }));
         }
@@ -555,7 +564,7 @@ var EditableCell = function EditableCell(props) {
     }
 
     return childNode;
-  }, [col, isEdit, editing]); // const [childNode, setChildNode] = useState(getMemoChildNode);
+  }, [col, isEdit, editing, getLength]); // const [childNode, setChildNode] = useState(getMemoChildNode);
   // 出现死循环找我
 
   useEffect(function () {
@@ -573,38 +582,11 @@ var EditableCell = function EditableCell(props) {
     //   })
     // }
 
-  }, [record]); // const isOpenEdit = (isEdit && focusCapturedRef.current) || (isHoverEdit && focusCapturedRef.current);
-  // const classNames = cx({
-  //   'lm_base_editTable_cell': true,
-  //   'lm_base_editTable_cell_edit': isOpenEdit || (isHoverEdit && !curValueIsValid),
-  // });
-  // const extensionConfig = {};
-  // const mouseEnterCell = () => {
-  //   focusCapturedRef.current = true;
-  //   const newChildNode = getMemoChildNode;
-  //   setChildNode(newChildNode);
-  // };
-  // const mouseLeaveCell = () => {
-  //   focusCapturedRef.current = false;
-  //   const nextValue = form.getFieldValue(dataIndex);
-  //   const prevValue = get(record, dataIndex);
-  //   if (!eq(prevValue, nextValue)) {
-  //     const rowValue = get(record, rowKey);
-  //     reWriteOriginSource(rowKey, rowValue, dataIndex, nextValue);
-  //   } else {
-  //     const newChildNode = getDefaultChildNode(false);
-  //     setChildNode(newChildNode);
-  //   }
-  // };
-  // if (isHoverEdit && record?.editable) {
-  //   console.log('ssssbbb')
-  //   set(extensionConfig, 'onMouseEnter', mouseEnterCell);
-  //   set(extensionConfig, 'onMouseLeave', mouseLeaveCell);
-  // }
-
+  }, [record]);
   return /*#__PURE__*/React.createElement("td", Object.assign({}, clearProps, {
-    key: "".concat(record[rowKey], "_").concat(col.dataIndex)
-  }), getMemoChildNode); // return <td {...restProps} className={classNames} {...extensionConfig} key={`${get(record, rowKey)}_${dataIndex}`}>{childNode}</td>
+    className: cls(clearProps === null || clearProps === void 0 ? void 0 : clearProps.className, 'lm_custom_cell_td'),
+    key: "r".concat(rowIndex, "_c").concat(colIndex)
+  }), getMemoChildNode);
 };
 
 var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
@@ -629,7 +611,8 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
       filterChange = props.filterChange,
       _props$size = props.size,
       size = _props$size === void 0 ? 'small' : _props$size,
-      resetProps = __rest(props, ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "sortOpen", "colSortOpen", "filterChange", "size"]);
+      recordCreatorProps = props.recordCreatorProps,
+      resetProps = __rest(props, ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "sortOpen", "colSortOpen", "filterChange", "size", "recordCreatorProps"]);
 
   var _useState3 = useState([]),
       _useState4 = _slicedToArray(_useState3, 2),
@@ -673,14 +656,12 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
   };
 
   var onColSortEnd = function onColSortEnd(active, over) {
-    console.log(active, over, 2223);
     var oldIndex = columns.findIndex(function (item) {
       return item.dataIndex === active;
     });
     var newIndex = columns.findIndex(function (item) {
       return item.dataIndex === over;
     });
-    console.log(arrayMove(columns, oldIndex, newIndex), 222);
     filterChange === null || filterChange === void 0 ? void 0 : filterChange(arrayMove(columns, oldIndex, newIndex).map(function (item, index) {
       return Object.assign(Object.assign({}, item), {
         order: index
@@ -699,8 +680,11 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
 
 
   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(_defineProperty({}, _rowKey, "".concat(Date.now())));
+      draft.push(Object.assign(_defineProperty({}, _rowKey, "".concat(Date.now())), addDataInfo || {}));
     });
     setDataSource(res);
     onChange === null || onChange === void 0 ? void 0 : onChange(res);
@@ -896,7 +880,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
         });
         var newOptions = options.map(function (o) {
           return Object.assign(Object.assign({}, o), {
-            disabled: dataIndexData.includes(o === null || o === void 0 ? void 0 : o.value) ? true : false
+            disabled: !!dataIndexData.includes(o === null || o === void 0 ? void 0 : o.value)
           });
         });
         return Object.assign(Object.assign({}, item), {
@@ -913,15 +897,8 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
   var memoOptions = useMemo(function () {
     return hasDisableOptions ? [DisableOptions] : [];
   }, [hasDisableOptions, DisableOptions]);
-
-  var getDataSourceLen = function getDataSourceLen() {
-    var _a;
-
-    return (_a = dataSourceRef.current) === null || _a === void 0 ? void 0 : _a.length;
-  };
   /** 组装之后的最终columns */
 
-
   var resultColumns = useMemo(function () {
     var rColumns = hasDisableOptions ? DisableOptions : columns;
     var localColumns = [sortOpen ? {
@@ -967,7 +944,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
       }
     });
     localColumns = [].concat(leftColumns, mainColumns, rightColumns);
-    var res = localColumns.map(function (col) {
+    var res = localColumns.map(function (col, index) {
       if (!col.editable) {
         return col;
       }
@@ -976,20 +953,25 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
         shouldCellUpdate: function shouldCellUpdate(record, prevRecord) {
           var _a;
 
-          var dataIndex = col.dataIndex;
+          var dataIndex = col.dataIndex,
+              editable = col.editable,
+              relevanceCols = col.relevanceCols;
 
-          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)) {
+          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) {
             return true;
           }
 
-          return record[dataIndex] === prevRecord[dataIndex] ? false : true;
+          return record[dataIndex] !== prevRecord[dataIndex];
         },
-        onCell: function onCell(record) {
+        onCell: function onCell(record, rowIndex) {
           return {
-            getLength: getDataSourceLen,
+            getLength: dataSource.length,
             rowKey: _rowKey,
             record: record,
             col: col,
+            rowIndex: rowIndex,
+            colIndex: index,
+            quickOpetateClearAll: quickOpetateClearAll,
             handleTableRowDelete: handleTableRowDelete,
             handleTableRowAdd: handleTableRowAdd,
             editable: col.editable,
@@ -1150,11 +1132,11 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
     className: "lm_editTable_add_bar",
     type: "dashed",
     onClick: handleAdd,
-    style: {
+    style: Object.assign({
       marginTop: 8
-    }
+    }, (recordCreatorProps === null || recordCreatorProps === void 0 ? void 0 : recordCreatorProps.style) || {})
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "lmweb-plus"
-  }), "\u65B0\u589E"));
+  }), (recordCreatorProps === null || recordCreatorProps === void 0 ? void 0 : recordCreatorProps.creatorButtonText) || '新增'));
 });
 export default /*#__PURE__*/memo(EditTable);