@ant-design/pro-components 3.1.0-0 → 3.1.1-1

package/es/table/components/EditableTable/index.js

@@ -1,16 +1,7 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _typeof from "@babel/runtime/helpers/esm/typeof";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _excluded = ["record", "position", "creatorButtonText", "newRecordType", "parentKey", "style"],
-  _excluded2 = ["onTableChange", "maxLength", "formItemProps", "recordCreatorProps", "rowKey", "controlled", "defaultValue", "onChange", "editableFormRef"];
 import { PlusOutlined } from '@ant-design/icons';
-import { get, set, useMergedState } from '@rc-component/util';
+import { get, set, useControlledState } from '@rc-component/util';
 import { Button, Form } from 'antd';
-import React, { useContext, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
+import React, { useCallback, useContext, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import ProForm, { ProFormDependency } from "../../../form";
 import { useIntl } from "../../../provider";
 import { isDeepEqualReact, runFunction, useDeepCompareEffect, useRefFunction } from "../../../utils";
@@ -19,71 +10,51 @@ import ProTable from "../../Table";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
-var EditableTableActionContext = /*#__PURE__*/React.createContext(undefined);
+const EditableTableActionContext = /*#__PURE__*/React.createContext(undefined);
 
 /** 可编辑表格的按钮 */
 function RecordCreator(props) {
-  var children = props.children,
-    record = props.record,
-    position = props.position,
-    newRecordType = props.newRecordType,
-    parentKey = props.parentKey;
-  var actionRef = useContext(EditableTableActionContext);
-  return /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), {}, {
-    onClick: function () {
-      var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(e) {
-        var _children$props$onCli, _children$props;
-        var isOk;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return (_children$props$onCli = (_children$props = children.props).onClick) === null || _children$props$onCli === void 0 ? void 0 : _children$props$onCli.call(_children$props, e);
-            case 2:
-              isOk = _context.sent;
-              if (!(isOk === false)) {
-                _context.next = 5;
-                break;
-              }
-              return _context.abrupt("return");
-            case 5:
-              if (actionRef !== null && actionRef !== void 0 && actionRef.current) {
-                actionRef.current.addEditRecord(record, {
-                  position: position,
-                  newRecordType: newRecordType,
-                  parentKey: parentKey
-                });
-              }
-            case 6:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      function onClick(_x) {
-        return _onClick.apply(this, arguments);
+  const {
+    children,
+    record,
+    position,
+    newRecordType,
+    parentKey
+  } = props;
+  const actionRef = useContext(EditableTableActionContext);
+  return /*#__PURE__*/React.cloneElement(children, {
+    ...children.props,
+    onClick: async e => {
+      // 如果返回了false，接触掉默认行为
+      const isOk = await children.props.onClick?.(e);
+      if (isOk === false) return;
+      if (actionRef?.current) {
+        actionRef.current.addEditRecord(record, {
+          position,
+          newRecordType,
+          parentKey: parentKey
+        });
       }
-      return onClick;
-    }()
-  }));
+    }
+  });
 }
 
 /**
  * 处理嵌套行的新增
  */
 function handleNestedRowInsert(baseData, defaultValue, newLineOptions, getRowKey, childrenColumnName) {
-  var _recordKeyToString;
   if (!newLineOptions.recordKey) {
     return baseData;
   }
-  var actionProps = {
+  const actionProps = {
     data: baseData,
-    getRowKey: getRowKey,
-    row: _objectSpread(_objectSpread({}, defaultValue), {}, {
-      map_row_parentKey: (_recordKeyToString = recordKeyToString(newLineOptions.parentKey)) === null || _recordKeyToString === void 0 ? void 0 : _recordKeyToString.toString()
-    }),
+    getRowKey,
+    row: {
+      ...defaultValue,
+      map_row_parentKey: recordKeyToString(newLineOptions.parentKey)?.toString()
+    },
     key: newLineOptions.recordKey,
-    childrenColumnName: childrenColumnName
+    childrenColumnName
   };
   return editableRowByKey(actionProps, newLineOptions.position === 'top' ? 'top' : 'update');
 }
@@ -93,39 +64,42 @@ function handleNestedRowInsert(baseData, defaultValue, newLineOptions, getRowKey
  */
 function handlePaginationInsert(baseData, defaultValue, pageConfig) {
   if (pageConfig.pageSize > baseData.length) {
-    return [].concat(_toConsumableArray(baseData), [defaultValue]);
+    return [...baseData, defaultValue];
   }
-  var insertIndex = pageConfig.current * pageConfig.pageSize - 1;
-  var result = _toConsumableArray(baseData);
+  const insertIndex = pageConfig.current * pageConfig.pageSize - 1;
+  const result = [...baseData];
   result.splice(insertIndex, 0, defaultValue);
   return result;
 }
-function useEditableDataSource(_ref) {
-  var actionDataSource = _ref.actionDataSource,
-    editableUtils = _ref.editableUtils,
-    pagination = _ref.pagination,
-    getRowKey = _ref.getRowKey,
-    childrenColumnName = _ref.childrenColumnName;
-  return useMemo(function () {
-    var newLineConfig = editableUtils === null || editableUtils === void 0 ? void 0 : editableUtils.newLineRecord;
-    var baseData = Array.isArray(actionDataSource) ? _toConsumableArray(actionDataSource) : [];
-    if (!(newLineConfig !== null && newLineConfig !== void 0 && newLineConfig.defaultValue)) {
+function useEditableDataSource({
+  actionDataSource,
+  editableUtils,
+  pagination,
+  getRowKey,
+  childrenColumnName
+}) {
+  return useMemo(() => {
+    const newLineConfig = editableUtils?.newLineRecord;
+    const baseData = Array.isArray(actionDataSource) ? [...actionDataSource] : [];
+    if (!newLineConfig?.defaultValue) {
       return baseData;
     }
-    var newLineOptions = newLineConfig.options,
-      defaultValue = newLineConfig.defaultValue;
-    if (newLineOptions !== null && newLineOptions !== void 0 && newLineOptions.parentKey) {
+    const {
+      options: newLineOptions,
+      defaultValue
+    } = newLineConfig;
+    if (newLineOptions?.parentKey) {
       return handleNestedRowInsert(baseData, defaultValue, newLineOptions, getRowKey, childrenColumnName || 'children');
     }
-    if ((newLineOptions === null || newLineOptions === void 0 ? void 0 : newLineOptions.position) === 'top') {
-      return [defaultValue].concat(_toConsumableArray(baseData));
+    if (newLineOptions?.position === 'top') {
+      return [defaultValue, ...baseData];
     }
-    var pageConfig = pagination && _typeof(pagination) === 'object' ? pagination : undefined;
-    if (pageConfig !== null && pageConfig !== void 0 && pageConfig.current && pageConfig !== null && pageConfig !== void 0 && pageConfig.pageSize) {
+    const pageConfig = pagination && typeof pagination === 'object' ? pagination : undefined;
+    if (pageConfig?.current && pageConfig?.pageSize) {
       return handlePaginationInsert(baseData, defaultValue, pageConfig);
     }
-    return [].concat(_toConsumableArray(baseData), [defaultValue]);
-  }, [actionDataSource, childrenColumnName, editableUtils === null || editableUtils === void 0 ? void 0 : editableUtils.newLineRecord, getRowKey, pagination]);
+    return [...baseData, defaultValue];
+  }, [actionDataSource, childrenColumnName, editableUtils?.newLineRecord, getRowKey, pagination]);
 }
 
 /**
@@ -142,29 +116,32 @@ function shouldShowCreatorButton(maxLength, valueLength, recordCreatorProps) {
  * 创建按钮 DOM
  */
 function createButtonDom(recordCreatorProps, value, intl) {
-  var record = recordCreatorProps.record,
-    position = recordCreatorProps.position,
-    creatorButtonText = recordCreatorProps.creatorButtonText,
-    newRecordType = recordCreatorProps.newRecordType,
-    parentKey = recordCreatorProps.parentKey,
-    style = recordCreatorProps.style,
-    restButtonProps = _objectWithoutProperties(recordCreatorProps, _excluded);
+  const {
+    record,
+    position,
+    creatorButtonText,
+    newRecordType,
+    parentKey,
+    style,
+    ...restButtonProps
+  } = recordCreatorProps;
   return /*#__PURE__*/_jsx(RecordCreator, {
-    record: runFunction(record, value === null || value === void 0 ? void 0 : value.length, value) || {},
+    record: runFunction(record, value?.length, value) || {},
     position: position,
-    parentKey: runFunction(parentKey, value === null || value === void 0 ? void 0 : value.length, value),
+    parentKey: runFunction(parentKey, value?.length, value),
     newRecordType: newRecordType,
-    children: /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
+    children: /*#__PURE__*/_jsx(Button, {
       type: "dashed",
-      style: _objectSpread({
+      style: {
         display: 'block',
         margin: '10px 0',
-        width: '100%'
-      }, style),
-      icon: /*#__PURE__*/_jsx(PlusOutlined, {})
-    }, restButtonProps), {}, {
+        width: '100%',
+        ...style
+      },
+      icon: /*#__PURE__*/_jsx(PlusOutlined, {}),
+      ...restButtonProps,
       children: creatorButtonText || intl.getMessage('editableTable.action.add', '添加一行数据')
-    }))
+    })
   });
 }
 
@@ -175,33 +152,32 @@ function createTopButtonProps(creatorButtonDom, columnsLength) {
   return {
     components: {
       header: {
-        wrapper: function wrapper(_ref2) {
-          var className = _ref2.className,
-            children = _ref2.children;
-          return /*#__PURE__*/_jsxs("thead", {
-            className: className,
-            children: [children, /*#__PURE__*/_jsxs("tr", {
+        wrapper: ({
+          className,
+          children
+        }) => /*#__PURE__*/_jsxs("thead", {
+          className: className,
+          children: [children, /*#__PURE__*/_jsxs("tr", {
+            style: {
+              position: 'relative'
+            },
+            children: [/*#__PURE__*/_jsx("td", {
+              colSpan: 0,
+              style: {
+                visibility: 'hidden'
+              },
+              children: creatorButtonDom
+            }), /*#__PURE__*/_jsx("td", {
               style: {
-                position: 'relative'
+                position: 'absolute',
+                left: 0,
+                width: '100%'
               },
-              children: [/*#__PURE__*/_jsx("td", {
-                colSpan: 0,
-                style: {
-                  visibility: 'hidden'
-                },
-                children: creatorButtonDom
-              }), /*#__PURE__*/_jsx("td", {
-                style: {
-                  position: 'absolute',
-                  left: 0,
-                  width: '100%'
-                },
-                colSpan: columnsLength,
-                children: creatorButtonDom
-              })]
+              colSpan: columnsLength,
+              children: creatorButtonDom
             })]
-          });
-        }
+          })]
+        })
       }
     }
   };
@@ -210,26 +186,24 @@ function createTopButtonProps(creatorButtonDom, columnsLength) {
 /**
  * 创建底部按钮的渲染属性
  */
-function createBottomButtonProps(creatorButtonDom, _tableViewRender) {
+function createBottomButtonProps(creatorButtonDom, tableViewRender) {
   return {
-    tableViewRender: function tableViewRender(_, dom) {
-      var _tableViewRender2;
-      return /*#__PURE__*/_jsxs(_Fragment, {
-        children: [(_tableViewRender2 = _tableViewRender === null || _tableViewRender === void 0 ? void 0 : _tableViewRender(_, dom)) !== null && _tableViewRender2 !== void 0 ? _tableViewRender2 : dom, creatorButtonDom]
-      });
-    }
+    tableViewRender: (_, dom) => /*#__PURE__*/_jsxs(_Fragment, {
+      children: [tableViewRender?.(_, dom) ?? dom, creatorButtonDom]
+    })
   };
 }
-function useCreatorButton(_ref3) {
-  var recordCreatorProps = _ref3.recordCreatorProps,
-    maxLength = _ref3.maxLength,
-    value = _ref3.value,
-    intl = _ref3.intl,
-    isTop = _ref3.isTop,
-    columnsLength = _ref3.columnsLength,
-    tableViewRender = _ref3.tableViewRender;
-  var creatorButtonDom = useMemo(function () {
-    if (!shouldShowCreatorButton(maxLength, (value === null || value === void 0 ? void 0 : value.length) || 0, recordCreatorProps)) {
+function useCreatorButton({
+  recordCreatorProps,
+  maxLength,
+  value,
+  intl,
+  isTop,
+  columnsLength,
+  tableViewRender
+}) {
+  const creatorButtonDom = useMemo(() => {
+    if (!shouldShowCreatorButton(maxLength, value?.length || 0, recordCreatorProps)) {
       return false;
     }
     if (!recordCreatorProps) {
@@ -237,16 +211,16 @@ function useCreatorButton(_ref3) {
     }
     return createButtonDom(recordCreatorProps, value, intl);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [maxLength, recordCreatorProps, value === null || value === void 0 ? void 0 : value.length, intl]);
-  var buttonRenderProps = useMemo(function () {
+  }, [maxLength, recordCreatorProps, value?.length, intl]);
+  const buttonRenderProps = useMemo(() => {
     if (!creatorButtonDom) {
       return {};
     }
     return isTop ? createTopButtonProps(creatorButtonDom, columnsLength) : createBottomButtonProps(creatorButtonDom, tableViewRender);
   }, [columnsLength, creatorButtonDom, isTop, tableViewRender]);
   return {
-    creatorButtonDom: creatorButtonDom,
-    buttonRenderProps: buttonRenderProps
+    creatorButtonDom,
+    buttonRenderProps
   };
 }
 
@@ -256,30 +230,31 @@ function useCreatorButton(_ref3) {
  * @param props
  */
 function EditableTable(props) {
-  var _props$editable2, _rest$columns;
-  var intl = useIntl();
-  var onTableChange = props.onTableChange,
-    maxLength = props.maxLength,
-    formItemProps = props.formItemProps,
-    recordCreatorProps = props.recordCreatorProps,
-    rowKey = props.rowKey,
-    controlled = props.controlled,
-    defaultValue = props.defaultValue,
-    onChange = props.onChange,
-    editableFormRef = props.editableFormRef,
-    rest = _objectWithoutProperties(props, _excluded2);
-  var preData = useRef(undefined);
-  var actionRef = useRef();
-  var formRef = useRef();
-  var form = Form.useFormInstance();
+  const intl = useIntl();
+  const {
+    onTableChange,
+    maxLength,
+    formItemProps,
+    recordCreatorProps,
+    rowKey,
+    controlled,
+    defaultValue,
+    onChange,
+    editableFormRef,
+    // @ts-ignore
+    autoFocus,
+    ...rest
+  } = props;
+  const preData = useRef(undefined);
+  const actionRef = useRef();
+  const formRef = useRef();
+  const form = Form.useFormInstance();
 
   // 设置 ref
-  useImperativeHandle(rest.actionRef, function () {
-    return actionRef.current;
-  }, [actionRef.current]);
+  useImperativeHandle(rest.actionRef, () => actionRef.current, [actionRef.current]);
 
   // 在 name 模式下，如果没有传递 value prop，尝试从表单值中获取初始值
-  var getInitialValue = function getInitialValue() {
+  const getInitialValue = () => {
     if (props.value) {
       return props.value;
     }
@@ -288,62 +263,59 @@ function EditableTable(props) {
     }
     // 如果使用了 name 且没有 value，尝试从表单获取初始值
     if (props.name && form) {
-      var namePath = [props.name].flat(1).filter(Boolean);
-      var formValue = form.getFieldValue(namePath);
+      const namePath = [props.name].flat(1).filter(Boolean);
+      const formValue = form.getFieldValue(namePath);
       if (Array.isArray(formValue)) {
         return formValue;
       }
     }
     return [];
   };
-  var _useMergedState = useMergedState(getInitialValue, {
-      value: props.value,
+  const [value, setValueInner] = useControlledState(getInitialValue, props.value);
+  const onChangeFn = props.controlled ? props.onChange : undefined;
+  const setValue = useCallback(updater => {
+    setValueInner(prev => {
+      const next = typeof updater === 'function' ? updater(prev) : updater;
       // 在非受控模式下，onChange 应该在 onDataSourceChange 中触发
-      // 这样可以确保数据已经正确更新
-      onChange: props.controlled ? props.onChange : undefined
-    }),
-    _useMergedState2 = _slicedToArray(_useMergedState, 2),
-    value = _useMergedState2[0],
-    setValue = _useMergedState2[1];
-  var getRowKey = React.useMemo(function () {
+      onChangeFn?.(next);
+      return next;
+    });
+  }, [onChangeFn]);
+  const getRowKey = React.useMemo(() => {
     if (typeof rowKey === 'function') {
       return rowKey;
     }
-    return function (record, index) {
-      return record[rowKey] || index;
-    };
+    return (record, index) => record[rowKey] || index;
   }, [rowKey]);
 
   /**
    * 创建编辑 keys 的 Set，用于快速查找
    */
-  var createEditingKeysSet = useRefFunction(function (editingKeys) {
-    return new Set((editingKeys || []).map(function (key) {
-      return String(key);
-    }));
+  const createEditingKeysSet = useRefFunction(editingKeys => {
+    return new Set((editingKeys || []).map(key => String(key)));
   });
 
   /**
    * 同步表单值，排除正在编辑的行
    */
-  var syncFormValuesExcludingEditing = useRefFunction(function (dataSource, editingKeysSet, namePath) {
+  const syncFormValuesExcludingEditing = useRefFunction((dataSource, editingKeysSet, namePath) => {
     if (!formRef.current) return;
     try {
       if (namePath && namePath.length > 0) {
         // name 模式：需要保留正在编辑的行
-        var currentFormValues = formRef.current.getFieldsValue() || {};
-        var currentList = get(currentFormValues, namePath);
+        const currentFormValues = formRef.current.getFieldsValue() || {};
+        const currentList = get(currentFormValues, namePath);
         if (currentList && Array.isArray(currentList)) {
           // 构建新的表单值，保留正在编辑的行
           // 使用 Map 优化查找性能，将 O(n²) 降低到 O(n)
-          var currentListMap = new Map();
-          currentList.forEach(function (item, idx) {
-            var key = getRowKey(item, idx);
+          const currentListMap = new Map();
+          currentList.forEach((item, idx) => {
+            const key = getRowKey(item, idx);
             currentListMap.set(String(key), item);
           });
-          var newList = dataSource.map(function (item, index) {
-            var key = getRowKey(item, index);
-            var keyStr = String(key);
+          const newList = dataSource.map((item, index) => {
+            const key = getRowKey(item, index);
+            const keyStr = String(key);
 
             // 如果该行正在编辑，保留表单中的值
             if (editingKeysSet.has(keyStr)) {
@@ -351,18 +323,18 @@ function EditableTable(props) {
             }
             return item;
           });
-          var newValue = set({}, namePath, newList);
+          const newValue = set({}, namePath, newList);
           formRef.current.setFieldsValue(newValue);
         } else {
-          var _newValue = set({}, namePath, dataSource);
-          formRef.current.setFieldsValue(_newValue);
+          const newValue = set({}, namePath, dataSource);
+          formRef.current.setFieldsValue(newValue);
         }
       } else {
         // 非 name 模式：直接设置值
-        var formValues = {};
-        dataSource.forEach(function (current, index) {
-          var key = getRowKey(current, index);
-          var keyStr = String(key);
+        const formValues = {};
+        dataSource.forEach((current, index) => {
+          const key = getRowKey(current, index);
+          const keyStr = String(key);
           if (!editingKeysSet.has(keyStr)) {
             formValues[keyStr] = current;
           }
@@ -379,26 +351,23 @@ function EditableTable(props) {
   /**
    * 将数字索引转换为实际的 rowKey（非 name 模式）
    */
-  var convertIndexToRowKey = useRefFunction(function (index) {
-    var _value$length;
-    var dataLength = (_value$length = value === null || value === void 0 ? void 0 : value.length) !== null && _value$length !== void 0 ? _value$length : 0;
+  const convertIndexToRowKey = useRefFunction(index => {
+    const dataLength = value?.length ?? 0;
     if (index >= dataLength) return index;
-    var rowData = value === null || value === void 0 ? void 0 : value[index];
-    return getRowKey === null || getRowKey === void 0 ? void 0 : getRowKey(rowData, index);
+    const rowData = value?.[index];
+    return getRowKey?.(rowData, index);
   });
 
   /**
    * 将 rowKey 转换为数字索引（name 模式）
    */
-  var convertRowKeyToIndex = useRefFunction(function (rowKey) {
-    var _value$length2;
-    var dataLength = (_value$length2 = value === null || value === void 0 ? void 0 : value.length) !== null && _value$length2 !== void 0 ? _value$length2 : 0;
+  const convertRowKeyToIndex = useRefFunction(rowKey => {
+    const dataLength = value?.length ?? 0;
     if (typeof rowKey === 'string' || rowKey >= dataLength) {
-      var _rowIndex = value.findIndex(function (item, index) {
-        var _getRowKey;
-        return (getRowKey === null || getRowKey === void 0 || (_getRowKey = getRowKey(item, index)) === null || _getRowKey === void 0 ? void 0 : _getRowKey.toString()) === (rowKey === null || rowKey === void 0 ? void 0 : rowKey.toString());
+      const rowIndex = value.findIndex((item, index) => {
+        return getRowKey?.(item, index)?.toString() === rowKey?.toString();
       });
-      if (_rowIndex !== -1) return _rowIndex;
+      if (rowIndex !== -1) return rowIndex;
     }
     return rowKey;
   });
@@ -406,7 +375,7 @@ function EditableTable(props) {
   /**
    * 根据不同的情况返回不同的 rowKey
    */
-  var coverRowKey = useRefFunction(function (finlayRowKey) {
+  const coverRowKey = useRefFunction(finlayRowKey => {
     if (typeof finlayRowKey === 'number' && !props.name) {
       return convertIndexToRowKey(finlayRowKey);
     }
@@ -419,76 +388,71 @@ function EditableTable(props) {
   /**
    * 构建表单字段路径
    */
-  var buildFormFieldPath = useRefFunction(function (rowKey) {
-    var _rowKey$toString;
-    return [props.name, (_rowKey$toString = rowKey === null || rowKey === void 0 ? void 0 : rowKey.toString()) !== null && _rowKey$toString !== void 0 ? _rowKey$toString : ''].flat(1).filter(Boolean);
+  const buildFormFieldPath = useRefFunction(rowKey => {
+    return [props.name, rowKey?.toString() ?? ''].flat(1).filter(Boolean);
   });
 
   /**
    * 获取一行数据
    */
-  var getRowData = useRefFunction(function (rowIndex) {
-    var _formRef$current;
+  const getRowData = useRefFunction(rowIndex => {
     if (rowIndex == null) {
       throw new Error('rowIndex is required');
     }
-    var finlayRowKey = coverRowKey(rowIndex);
-    var rowKeyName = buildFormFieldPath(finlayRowKey);
-    return (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.getFieldValue(rowKeyName);
+    const finlayRowKey = coverRowKey(rowIndex);
+    const rowKeyName = buildFormFieldPath(finlayRowKey);
+    return formRef.current?.getFieldValue(rowKeyName);
   });
 
   /**
    * 获取整个表格的数据
    */
-  var getRowsData = useRefFunction(function () {
-    var _formRef$current3;
-    var rowKeyName = [props.name].flat(1).filter(Boolean);
+  const getRowsData = useRefFunction(() => {
+    const rowKeyName = [props.name].flat(1).filter(Boolean);
     if (Array.isArray(rowKeyName) && rowKeyName.length === 0) {
-      var _formRef$current2;
-      var rowData = (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.getFieldsValue();
+      const rowData = formRef.current?.getFieldsValue();
       if (Array.isArray(rowData)) return rowData;
-      return Object.keys(rowData).map(function (key) {
-        return rowData[key];
-      });
+      return Object.keys(rowData).map(key => rowData[key]);
     }
-    return (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.getFieldValue(rowKeyName);
+    return formRef.current?.getFieldValue(rowKeyName);
   });
 
   /**
    * 设置一行数据
    */
-  var setRowData = useRefFunction(function (rowIndex, data) {
+  const setRowData = useRefFunction((rowIndex, data) => {
     if (rowIndex == null) {
       throw new Error('rowIndex is required');
     }
-    var finlayRowKey = coverRowKey(rowIndex);
-    var rowKeyName = buildFormFieldPath(finlayRowKey);
-    var currentRowData = getRowData(rowIndex);
-    var newRowData = _objectSpread(_objectSpread({}, currentRowData), data || {});
+    const finlayRowKey = coverRowKey(rowIndex);
+    const rowKeyName = buildFormFieldPath(finlayRowKey);
+    const currentRowData = getRowData(rowIndex);
+    const newRowData = {
+      ...currentRowData,
+      ...(data || {})
+    };
 
     // 在 name 模式下，需要更新整个数组
     if (props.name) {
-      var _formRef$current4;
-      var tableName = [props.name].flat(1).filter(Boolean);
+      const tableName = [props.name].flat(1).filter(Boolean);
       // 优先从 value prop 获取数据（受控模式），否则从表单值获取
-      var currentTableData = props.value || ((_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.getFieldValue(tableName));
+      let currentTableData = props.value || formRef.current?.getFieldValue(tableName);
       if (Array.isArray(currentTableData)) {
         // 找到要更新的行的索引
-        var rowIndexToUpdate = typeof finlayRowKey === 'number' ? finlayRowKey : currentTableData.findIndex(function (row, index) {
-          var rowKey = getRowKey === null || getRowKey === void 0 ? void 0 : getRowKey(row, index);
-          return rowKey === finlayRowKey || (rowKey === null || rowKey === void 0 ? void 0 : rowKey.toString()) === (finlayRowKey === null || finlayRowKey === void 0 ? void 0 : finlayRowKey.toString());
+        const rowIndexToUpdate = typeof finlayRowKey === 'number' ? finlayRowKey : currentTableData.findIndex((row, index) => {
+          const rowKey = getRowKey?.(row, index);
+          return rowKey === finlayRowKey || rowKey?.toString() === finlayRowKey?.toString();
         });
         if (rowIndexToUpdate >= 0 && rowIndexToUpdate < currentTableData.length) {
-          var _formRef$current5;
           // 更新数组中的对应行
-          var updatedTableData = _toConsumableArray(currentTableData);
+          const updatedTableData = [...currentTableData];
           updatedTableData[rowIndexToUpdate] = newRowData;
 
           // 设置整个数组，使用 set 来构建正确的路径
           // 使用与 syncFormValuesExcludingEditing 相同的路径格式（数组路径）
           // 这样可以确保 getFieldValue 能正确获取值
-          var updateValues = set({}, tableName, updatedTableData);
-          (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 || _formRef$current5.setFieldsValue(updateValues);
+          const updateValues = set({}, tableName, updatedTableData);
+          formRef.current?.setFieldsValue(updateValues);
 
           // 在受控模式下，触发 onChange
           if (props.controlled && props.onChange) {
@@ -496,27 +460,26 @@ function EditableTable(props) {
           }
         }
       } else {
-        var _formRef$current6;
         // 如果当前没有数据，直接设置单个字段
-        var _updateValues = set({}, rowKeyName, newRowData);
-        (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 || _formRef$current6.setFieldsValue(_updateValues);
+        const updateValues = set({}, rowKeyName, newRowData);
+        formRef.current?.setFieldsValue(updateValues);
       }
     } else {
-      var _formRef$current7;
       // 非 name 模式下，直接设置单个字段
-      var _updateValues2 = set({}, rowKeyName, newRowData);
-      (_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 || _formRef$current7.setFieldsValue(_updateValues2);
+      const updateValues = set({}, rowKeyName, newRowData);
+      formRef.current?.setFieldsValue(updateValues);
     }
     return true;
   });
 
   // 设置 editableFormRef
-  useImperativeHandle(editableFormRef, function () {
-    return _objectSpread(_objectSpread({}, formRef.current), {}, {
-      getRowData: getRowData,
-      getRowsData: getRowsData,
-      setRowData: setRowData
-    });
+  useImperativeHandle(editableFormRef, () => {
+    return {
+      ...formRef.current,
+      getRowData,
+      getRowsData,
+      setRowData
+    };
   }, [coverRowKey, props.name, getRowData, getRowsData, setRowData]);
 
   /**
@@ -525,7 +488,7 @@ function EditableTable(props) {
    * 使用深度比较优化性能，避免频繁的序列化操作
    * 注意：只有当 value 明确传递时才同步，避免覆盖表单中的初始值
    */
-  useDeepCompareEffect(function () {
+  useDeepCompareEffect(() => {
     if (!props.controlled || !formRef.current) return;
 
     // 在受控模式下，只有当 value 明确传递时才同步
@@ -537,15 +500,15 @@ function EditableTable(props) {
     try {
       if (props.name) {
         // name 模式：直接设置整个数组
-        var namePath = [props.name].flat(1);
-        var newValue = set({}, namePath, value);
+        const namePath = [props.name].flat(1);
+        const newValue = set({}, namePath, value);
         formRef.current.setFieldsValue(newValue);
       } else {
         // 非 name 模式：直接设置值
-        var formValues = {};
-        value.forEach(function (item, index) {
-          var key = getRowKey(item, index);
-          var keyStr = String(key);
+        const formValues = {};
+        value.forEach((item, index) => {
+          const key = getRowKey(item, index);
+          const keyStr = String(key);
           formValues[keyStr] = item;
         });
         if (Object.keys(formValues).length > 0) {
@@ -561,40 +524,40 @@ function EditableTable(props) {
    * 同步表单实例引用
    * 只在 name 模式下且 form 存在时更新
    */
-  useEffect(function () {
-    var _props$editable;
-    if (props.name && props !== null && props !== void 0 && (_props$editable = props.editable) !== null && _props$editable !== void 0 && _props$editable.form) {
+  useEffect(() => {
+    if (props.name && props?.editable?.form) {
       formRef.current = props.editable.form;
     }
-  }, [(_props$editable2 = props.editable) === null || _props$editable2 === void 0 ? void 0 : _props$editable2.form, props.name]);
-  var _ref4 = recordCreatorProps || {},
-    position = _ref4.position;
-  var isTop = position === 'top';
-  var _useCreatorButton = useCreatorButton({
-      recordCreatorProps: recordCreatorProps,
-      maxLength: maxLength,
-      value: value,
-      intl: intl,
-      isTop: isTop,
-      columnsLength: (_rest$columns = rest.columns) === null || _rest$columns === void 0 ? void 0 : _rest$columns.length,
-      tableViewRender: props.tableViewRender
-    }),
-    creatorButtonDom = _useCreatorButton.creatorButtonDom,
-    buttonRenderProps = _useCreatorButton.buttonRenderProps;
+  }, [props.editable?.form, props.name]);
+  const {
+    position
+  } = recordCreatorProps || {};
+  const isTop = position === 'top';
+  const {
+    creatorButtonDom,
+    buttonRenderProps
+  } = useCreatorButton({
+    recordCreatorProps,
+    maxLength,
+    value,
+    intl,
+    isTop,
+    columnsLength: rest.columns?.length,
+    tableViewRender: props.tableViewRender
+  });
 
   /**
    * 处理值变化回调
    * 注意：受控模式下不调用 onChange，避免循环更新
    * onChange 应该由外部控制，而不是在内部触发
    */
-  var handleValuesChange = useRefFunction(function (r, dataSource) {
-    var _props$editable3, _props$editable3$onVa, _props$onValuesChange;
-    (_props$editable3 = props.editable) === null || _props$editable3 === void 0 || (_props$editable3$onVa = _props$editable3.onValuesChange) === null || _props$editable3$onVa === void 0 || _props$editable3$onVa.call(_props$editable3, r, dataSource);
-    (_props$onValuesChange = props.onValuesChange) === null || _props$onValuesChange === void 0 || _props$onValuesChange.call(props, dataSource, r);
+  const handleValuesChange = useRefFunction((r, dataSource) => {
+    props.editable?.onValuesChange?.(r, dataSource);
+    props.onValuesChange?.(dataSource, r);
 
     // 在受控模式下，当表单值变化时也应该触发 onChange
     // 这样外部可以同步更新 value，实现真正的受控
-    if (props.controlled && props !== null && props !== void 0 && props.onChange) {
+    if (props.controlled && props?.onChange) {
       props.onChange(dataSource);
     }
     // 非受控模式下，onChange 应该在 onDataSourceChange 中触发
@@ -605,10 +568,11 @@ function EditableTable(props) {
    * 构建可编辑属性
    * 使用 useMemo 优化性能，避免不必要的重新创建
    */
-  var editableProps = useMemo(function () {
-    var _props$editable4;
-    var baseProps = _objectSpread({}, props.editable);
-    var hasOnValuesChange = Boolean(props === null || props === void 0 ? void 0 : props.onValuesChange) || Boolean((_props$editable4 = props.editable) === null || _props$editable4 === void 0 ? void 0 : _props$editable4.onValuesChange) || Boolean(props.controlled && (props === null || props === void 0 ? void 0 : props.onChange));
+  const editableProps = useMemo(() => {
+    const baseProps = {
+      ...props.editable
+    };
+    const hasOnValuesChange = Boolean(props?.onValuesChange) || Boolean(props.editable?.onValuesChange) || Boolean(props.controlled && props?.onChange);
     if (hasOnValuesChange) {
       baseProps.onValuesChange = handleValuesChange;
     }
@@ -617,23 +581,26 @@ function EditableTable(props) {
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(EditableTableActionContext.Provider, {
       value: actionRef,
-      children: /*#__PURE__*/_jsx(ProTable, _objectSpread(_objectSpread(_objectSpread({
+      children: /*#__PURE__*/_jsx(ProTable, {
         search: false,
         options: false,
         pagination: false,
         rowKey: rowKey,
-        revalidateOnFocus: false
-      }, rest), buttonRenderProps), {}, {
+        revalidateOnFocus: false,
+        ...rest,
+        ...buttonRenderProps,
         tableLayout: "fixed",
         actionRef: actionRef,
         onChange: onTableChange,
-        editable: _objectSpread(_objectSpread({}, editableProps), {}, {
-          formProps: _objectSpread({
-            formRef: formRef
-          }, editableProps.formProps)
-        }),
+        editable: {
+          ...editableProps,
+          formProps: {
+            formRef,
+            ...editableProps.formProps
+          }
+        },
         dataSource: value,
-        onDataSourceChange: function onDataSourceChange(dataSource) {
+        onDataSourceChange: dataSource => {
           // setValue 会触发 onChange，但我们需要确保数据已经正确更新
           // 所以先设置数据，然后手动触发 onChange
           setValue(dataSource);
@@ -644,10 +611,9 @@ function EditableTable(props) {
            * 注意：不会覆盖正在编辑的行
            */
           if (props.name && formRef.current) {
-            var _props$editable5;
-            var editingKeys = (_props$editable5 = props.editable) === null || _props$editable5 === void 0 ? void 0 : _props$editable5.editableKeys;
-            var editingKeysSet = createEditingKeysSet(editingKeys);
-            var namePath = [props.name].flat(1).filter(Boolean);
+            const editingKeys = props.editable?.editableKeys;
+            const editingKeysSet = createEditingKeysSet(editingKeys);
+            const namePath = [props.name].flat(1).filter(Boolean);
             syncFormValuesExcludingEditing(dataSource, editingKeysSet, namePath);
           }
 
@@ -657,17 +623,17 @@ function EditableTable(props) {
             props.onChange(dataSource);
           }
         }
-      }))
+      })
     }), props.name ? /*#__PURE__*/_jsx(ProFormDependency, {
       name: [props.name],
-      children: function children(changeValue) {
+      children: changeValue => {
         // 初始化 preData
         if (!preData.current) {
           preData.current = value;
           return null;
         }
-        var namePath = [props.name].flat(1);
-        var list = get(changeValue, namePath);
+        const namePath = [props.name].flat(1);
+        const list = get(changeValue, namePath);
 
         // 添加空值检查，避免后续操作出错
         if (!list || !Array.isArray(list)) {
@@ -677,20 +643,18 @@ function EditableTable(props) {
 
         // 在更新 preData 之前找到变化的项
         // 使用 findIndex 可以同时获取变化的项和索引
-        var changeIndex = list.findIndex(function (item, index) {
-          var _preData$current;
-          return !isDeepEqualReact(item, (_preData$current = preData.current) === null || _preData$current === void 0 ? void 0 : _preData$current[index]);
+        const changeIndex = list.findIndex((item, index) => {
+          return !isDeepEqualReact(item, preData.current?.[index]);
         });
 
         // 只有在找到变化项时才触发回调
         if (changeIndex !== -1) {
-          var _props$editable6, _props$editable6$onVa;
-          var changeItem = list[changeIndex];
-          props === null || props === void 0 || (_props$editable6 = props.editable) === null || _props$editable6 === void 0 || (_props$editable6$onVa = _props$editable6.onValuesChange) === null || _props$editable6$onVa === void 0 || _props$editable6$onVa.call(_props$editable6, changeItem, list);
+          const changeItem = list[changeIndex];
+          props?.editable?.onValuesChange?.(changeItem, list);
         }
 
         // 在找到 changeItem 之后再更新 preData，确保后续比较正确
-        preData.current = value;
+        preData.current = list;
         return null;
       }
     }) : null]
@@ -703,38 +667,40 @@ function EditableTable(props) {
  * @param props
  */
 function FieldEditableTable(props) {
-  var form = ProForm.useFormInstance();
-  if (!props.name) return /*#__PURE__*/_jsx(EditableTable, _objectSpread({
+  const form = ProForm.useFormInstance();
+  if (!props.name) return /*#__PURE__*/_jsx(EditableTable, {
     tableLayout: "fixed",
     scroll: {
       x: 'max-content'
-    }
-  }, props));
-  return /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({
+    },
+    ...props
+  });
+  return /*#__PURE__*/_jsx(Form.Item, {
     style: {
       maxWidth: '100%'
     },
-    shouldUpdate: function shouldUpdate(prev, next) {
-      var name = [props.name].flat(1);
+    shouldUpdate: (prev, next) => {
+      const name = [props.name].flat(1);
       try {
         return JSON.stringify(get(prev, name)) !== JSON.stringify(get(next, name));
       } catch (error) {
         return true;
       }
-    }
-  }, props === null || props === void 0 ? void 0 : props.formItemProps), {}, {
+    },
+    ...props?.formItemProps,
     name: props.name,
-    children: /*#__PURE__*/_jsx(EditableTable, _objectSpread(_objectSpread({
+    children: /*#__PURE__*/_jsx(EditableTable, {
       tableLayout: "fixed",
       scroll: {
         x: 'max-content'
-      }
-    }, props), {}, {
-      editable: _objectSpread(_objectSpread({}, props.editable), {}, {
+      },
+      ...props,
+      editable: {
+        ...props.editable,
         form: form
-      })
-    }))
-  }));
+      }
+    })
+  });
 }
 FieldEditableTable.RecordCreator = RecordCreator;
 export default FieldEditableTable;