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

package/lib/utils/useEditableArray/index.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -11,19 +11,10 @@ exports.defaultActionRender = defaultActionRender;
 exports.editableRowByKey = editableRowByKey;
 exports.recordKeyToString = void 0;
 exports.useEditableArray = useEditableArray;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
-var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _objectSpread4 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _icons = require("@ant-design/icons");
 var _util = require("@rc-component/util");
 var _antd = require("antd");
-var _useLazyKVMap3 = _interopRequireDefault(require("antd/lib/table/hooks/useLazyKVMap"));
+var _useLazyKVMap = _interopRequireDefault(require("antd/lib/table/hooks/useLazyKVMap"));
 var _react = _interopRequireWildcard(require("react"));
 var _ = require("..");
 var _provider = require("../../provider");
@@ -31,45 +22,55 @@ var _ProFormContext = require("../components/ProFormContext");
 var _useDeepCompareEffect = require("../hooks/useDeepCompareEffect");
 var _usePrevious = require("../hooks/usePrevious");
 var _merge = require("../merge");
-var _useMountMergeState5 = require("../useMountMergeState");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["map_row_parentKey"],
-  _excluded2 = ["map_row_parentKey", "map_row_key", "isNewRecord"],
-  _excluded3 = ["map_row_key"];
 /* eslint-disable react-hooks/exhaustive-deps */
-var noteOnce = _util.warning.noteOnce;
+
+const {
+  noteOnce
+} = _util.warning;
 
 /**
  * 显示警告信息
  * @param messageStr
  */
-var warning = function warning(messageStr) {
+const warning = messageStr => {
   return _antd.message.warning(messageStr);
 };
-var recordKeyToString = exports.recordKeyToString = function recordKeyToString(rowKey) {
+const recordKeyToString = rowKey => {
   if (Array.isArray(rowKey)) return rowKey.join(',');
   return rowKey;
 };
+
+/**
+ * Normalize antd Form `NamePath` segments.
+ *
+ * - Preserve `0` (number) and other falsy-but-valid segments
+ * - Flatten nested arrays (e.g. `name={['a','b']}`)
+ * - Convert number segments to string to align with `spellNamePath` behavior
+ */
+exports.recordKeyToString = recordKeyToString;
+const normalizeNamePath = (...segments) => {
+  return segments.flat(1).filter(key => key !== undefined && key !== null).map(key => typeof key === 'number' ? key.toString() : key);
+};
 /**
  * 扁平化记录树结构为 Map
  */
 function flattenRecordsToMap(records, getRowKey, childrenColumnName, parentKey, parentIndex) {
-  var kvMap = new Map();
-  records.forEach(function (record, index) {
-    var eachIndex = (parentIndex || 0) * 10 + index;
-    var recordKey = getRowKey(record, eachIndex).toString();
-    var hasChildren = record && (0, _typeof2.default)(record) === 'object' && childrenColumnName in record;
+  const kvMap = new Map();
+  records.forEach((record, index) => {
+    const eachIndex = (parentIndex || 0) * 10 + index;
+    const recordKey = getRowKey(record, eachIndex).toString();
+    const hasChildren = record && typeof record === 'object' && childrenColumnName in record;
     if (hasChildren) {
-      var children = record[childrenColumnName] || [];
-      var childrenMap = flattenRecordsToMap(children, getRowKey, childrenColumnName, recordKey, eachIndex);
-      childrenMap.forEach(function (value, key) {
-        return kvMap.set(key, value);
-      });
+      const children = record[childrenColumnName] || [];
+      const childrenMap = flattenRecordsToMap(children, getRowKey, childrenColumnName, recordKey, eachIndex);
+      childrenMap.forEach((value, key) => kvMap.set(key, value));
     }
-    var newRecord = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, record), {}, {
+    const newRecord = {
+      ...record,
       map_row_key: recordKey,
       map_row_parentKey: parentKey
-    });
+    };
     delete newRecord.children;
     if (!parentKey) {
       delete newRecord.map_row_parentKey;
@@ -83,20 +84,21 @@ function flattenRecordsToMap(records, getRowKey, childrenColumnName, parentKey,
  * 重建树结构
  */
 function rebuildTreeStructure(map, childrenColumnName, action) {
-  var childrenMap = new Map();
-  var result = [];
-  var addNewRecordToChildren = function addNewRecordToChildren(fillChildren) {
-    map.forEach(function (value) {
+  const childrenMap = new Map();
+  const result = [];
+  const addNewRecordToChildren = fillChildren => {
+    map.forEach(value => {
       if (value.map_row_parentKey != null && !value.map_row_key) {
-        var map_row_parentKey = value.map_row_parentKey,
-          rest = (0, _objectWithoutProperties2.default)(value, _excluded);
-        var parentKeyStr = String(map_row_parentKey);
+        const {
+          map_row_parentKey,
+          ...rest
+        } = value;
+        const parentKeyStr = String(map_row_parentKey);
         if (!childrenMap.has(parentKeyStr)) {
           childrenMap.set(parentKeyStr, []);
         }
         if (fillChildren) {
-          var _childrenMap$get;
-          (_childrenMap$get = childrenMap.get(parentKeyStr)) === null || _childrenMap$get === void 0 || _childrenMap$get.push(rest);
+          childrenMap.get(parentKeyStr)?.push(rest);
         }
       }
     });
@@ -105,20 +107,22 @@ function rebuildTreeStructure(map, childrenColumnName, action) {
 
   // 第一步：将所有有 parentKey 的节点添加到 childrenMap
   // 这一步不获取 children，只是添加节点到对应的父节点下
-  map.forEach(function (value) {
+  map.forEach(value => {
     if (value.map_row_parentKey != null && value.map_row_key) {
-      var _ref = value,
-        map_row_parentKey = _ref.map_row_parentKey,
-        map_row_key = _ref.map_row_key,
-        isNewRecord = _ref.isNewRecord,
-        rest = (0, _objectWithoutProperties2.default)(_ref, _excluded2);
-      var _record = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, rest), {}, {
-        map_row_key: map_row_key
-      });
+      const {
+        map_row_parentKey,
+        map_row_key,
+        isNewRecord,
+        ...rest
+      } = value;
+      const record = {
+        ...rest,
+        map_row_key
+      };
       // 确保 parentKey 的类型转换与 flattenRecordsToMap 中的 recordKey 一致
       // 在 flattenRecordsToMap 中，recordKey 被转换为字符串：getRowKey(record, eachIndex).toString()
       // 所以这里也需要确保 parentKey 被转换为字符串，并且类型一致
-      var parentKeyStr = map_row_parentKey != null ? String(map_row_parentKey) : null;
+      const parentKeyStr = map_row_parentKey != null ? String(map_row_parentKey) : null;
       if (!parentKeyStr) {
         return;
       }
@@ -128,47 +132,54 @@ function rebuildTreeStructure(map, childrenColumnName, action) {
 
       // 如果是新记录且 action 为 'top'，添加到数组开头；否则添加到末尾
       if (isNewRecord && action === 'top') {
-        var _childrenMap$get2;
-        (_childrenMap$get2 = childrenMap.get(parentKeyStr)) === null || _childrenMap$get2 === void 0 || _childrenMap$get2.unshift(_record);
+        childrenMap.get(parentKeyStr)?.unshift(record);
       } else {
-        var _childrenMap$get3;
-        (_childrenMap$get3 = childrenMap.get(parentKeyStr)) === null || _childrenMap$get3 === void 0 || _childrenMap$get3.push(_record);
+        childrenMap.get(parentKeyStr)?.push(record);
       }
     }
   });
 
   // 第二步：为所有节点获取 children
   // 这一步确保所有子节点都已经被添加到 childrenMap，所以可以正确获取 children
-  map.forEach(function (value) {
+  map.forEach(value => {
     if (value.map_row_parentKey != null && value.map_row_key) {
-      var _ref2 = value,
-        map_row_parentKey = _ref2.map_row_parentKey,
-        map_row_key = _ref2.map_row_key;
-      var parentKeyStr = map_row_parentKey != null ? String(map_row_parentKey) : null;
+      const {
+        map_row_parentKey,
+        map_row_key
+      } = value;
+      const parentKeyStr = map_row_parentKey != null ? String(map_row_parentKey) : null;
       if (!parentKeyStr) {
         return;
       }
-      var children = childrenMap.get(parentKeyStr);
+      const children = childrenMap.get(parentKeyStr);
       if (children && children.length > 0) {
         // 找到对应的 record 并添加 children
-        var recordIndex = children.findIndex(function (r) {
+        const recordIndex = children.findIndex(r => {
           // 比较时需要确保类型一致
-          var recordKey = r.map_row_key || r.id;
+          const recordKey = r.map_row_key || r.id;
           return String(recordKey) === String(map_row_key);
         });
         if (recordIndex >= 0 && childrenMap.has(map_row_key)) {
-          children[recordIndex] = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, children[recordIndex]), {}, (0, _defineProperty2.default)({}, childrenColumnName, childrenMap.get(map_row_key)));
+          children[recordIndex] = {
+            ...children[recordIndex],
+            [childrenColumnName]: childrenMap.get(map_row_key)
+          };
         }
       }
     }
   });
   addNewRecordToChildren(action === 'update');
-  map.forEach(function (value) {
+  map.forEach(value => {
     if (!value.map_row_parentKey) {
-      var map_row_key = value.map_row_key,
-        rest = (0, _objectWithoutProperties2.default)(value, _excluded3);
-      var _record2 = map_row_key && childrenMap.has(map_row_key) ? (0, _objectSpread4.default)((0, _objectSpread4.default)({}, rest), {}, (0, _defineProperty2.default)({}, childrenColumnName, childrenMap.get(map_row_key))) : rest;
-      result.push(_record2);
+      const {
+        map_row_key,
+        ...rest
+      } = value;
+      const record = map_row_key && childrenMap.has(map_row_key) ? {
+        ...rest,
+        [childrenColumnName]: childrenMap.get(map_row_key)
+      } : rest;
+      result.push(record);
     }
   });
   return result;
@@ -178,29 +189,33 @@ function rebuildTreeStructure(map, childrenColumnName, action) {
  * 使用map 来删除数据，性能一般 但是准确率比较高
  */
 function editableRowByKey(keyProps, action) {
-  var _recordKeyToString;
-  var getRowKey = keyProps.getRowKey,
-    row = keyProps.row,
-    data = keyProps.data,
-    _keyProps$childrenCol = keyProps.childrenColumnName,
-    childrenColumnName = _keyProps$childrenCol === void 0 ? 'children' : _keyProps$childrenCol;
-  var key = (_recordKeyToString = recordKeyToString(keyProps.key)) === null || _recordKeyToString === void 0 ? void 0 : _recordKeyToString.toString();
-  var kvMap = flattenRecordsToMap(data, getRowKey, childrenColumnName);
+  const {
+    getRowKey,
+    row,
+    data,
+    childrenColumnName = 'children'
+  } = keyProps;
+  const key = recordKeyToString(keyProps.key)?.toString();
+  const kvMap = flattenRecordsToMap(data, getRowKey, childrenColumnName);
   if (action === 'delete') {
     kvMap.delete(key);
   } else if (action === 'top' || action === 'update') {
-    var existingRecord = kvMap.get(key);
+    const existingRecord = kvMap.get(key);
     if (existingRecord) {
-      kvMap.set(key, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, existingRecord), row));
+      kvMap.set(key, {
+        ...existingRecord,
+        ...row
+      });
     } else {
       // 如果记录不存在，创建一个新记录（用于新增场景）
       // 保留 map_row_parentKey 以便正确处理嵌套子节点
       // 添加标记以便在 rebuildTreeStructure 中识别新记录
-      kvMap.set(key, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, row), {}, {
+      kvMap.set(key, {
+        ...row,
         map_row_key: key,
         map_row_parentKey: row.map_row_parentKey,
         isNewRecord: true
-      }));
+      });
     }
   }
   return rebuildTreeStructure(kvMap, childrenColumnName, action);
@@ -211,112 +226,83 @@ function editableRowByKey(keyProps, action) {
  *
  * @param ActionRenderConfig
  */
-function SaveEditableAction(_ref3, ref) {
-  var recordKey = _ref3.recordKey,
-    onSave = _ref3.onSave,
-    row = _ref3.row,
-    children = _ref3.children,
-    newLineConfig = _ref3.newLineConfig,
-    editorType = _ref3.editorType,
-    tableName = _ref3.tableName;
-  var context = (0, _react.useContext)(_ProFormContext.ProFormContext);
-  var form = _antd.Form.useFormInstance();
-  var _useMountMergeState = (0, _useMountMergeState5.useMountMergeState)(false),
-    _useMountMergeState2 = (0, _slicedToArray2.default)(_useMountMergeState, 2),
-    loading = _useMountMergeState2[0],
-    setLoading = _useMountMergeState2[1];
-  var save = (0, _.useRefFunction)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-    var _context$getFieldForm, isMapEditor, namePath, fields, _recordKey, recordKeyPath, curValue, data, res;
-    return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.prev = 0;
-          isMapEditor = editorType === 'Map'; // 为了兼容类型为 array 的 dataIndex,当 recordKey 是一个数组时，用于获取表单值的 key 只取第一项，
-          // 从表单中获取回来之后，再根据 namepath 获取具体的某个字段并设置
-          namePath = [tableName, Array.isArray(recordKey) ? recordKey[0] : recordKey].map(function (key) {
-            return key === null || key === void 0 ? void 0 : key.toString();
-          }).flat(1).filter(Boolean);
-          setLoading(true);
-          _context.prev = 4;
-          _context.next = 7;
-          return form.validateFields(namePath, {
-            recursive: true
-          });
-        case 7:
-          _context.next = 13;
-          break;
-        case 9:
-          _context.prev = 9;
-          _context.t0 = _context["catch"](4);
-          setLoading(false);
-          // 重新抛出验证错误，让表单显示错误信息
-          // validateFields 抛出错误时，表单会自动设置错误状态并显示错误
-          // 错误对象包含 errorFields，表单会根据这些字段显示错误
-          // 确保错误被正确传播，这样表单可以正确显示验证错误
-          throw _context.t0;
-        case 13:
-          fields = (context === null || context === void 0 || (_context$getFieldForm = context.getFieldFormatValue) === null || _context$getFieldForm === void 0 ? void 0 : _context$getFieldForm.call(context, namePath)) || form.getFieldValue(namePath); // 处理 dataIndex 为数组的情况
-          if (Array.isArray(recordKey) && recordKey.length > 1) {
-            // 获取 namepath
-            _recordKey = (0, _toArray2.default)(recordKey), recordKeyPath = _recordKey.slice(1); // 将目标值获取出来并设置到 fields 当中
-            curValue = (0, _util.get)(fields, recordKeyPath);
-            (0, _util.set)(fields, recordKeyPath, curValue);
-          }
-          data = isMapEditor ? (0, _util.set)({}, namePath, fields) : fields; // 获取数据并保存
-          _context.next = 18;
-          return onSave === null || onSave === void 0 ? void 0 : onSave(recordKey,
-          // 如果是 map 模式，fields 就是一个值，所以需要set 到对象中
-          // 数据模式 fields 是一个对象，所以不需要
-          (0, _merge.merge)({}, row, data), row, newLineConfig);
-        case 18:
-          res = _context.sent;
-          setLoading(false);
-          return _context.abrupt("return", res);
-        case 23:
-          _context.prev = 23;
-          _context.t1 = _context["catch"](0);
-          setLoading(false);
-          throw _context.t1;
-        case 27:
-        case "end":
-          return _context.stop();
+function SaveEditableAction({
+  recordKey,
+  onSave,
+  row,
+  children,
+  newLineConfig,
+  editorType,
+  tableName
+}, ref) {
+  const context = (0, _react.useContext)(_ProFormContext.ProFormContext);
+  const form = _antd.Form.useFormInstance();
+  const [loading, setLoading] = (0, _react.useState)(false);
+  const save = (0, _.useRefFunction)(async () => {
+    try {
+      const isMapEditor = editorType === 'Map';
+      // 为了兼容类型为 array 的 dataIndex,当 recordKey 是一个数组时，用于获取表单值的 key 只取第一项，
+      // 从表单中获取回来之后，再根据 namepath 获取具体的某个字段并设置
+      const namePath = normalizeNamePath(tableName, Array.isArray(recordKey) ? recordKey[0] : recordKey);
+      setLoading(true);
+      try {
+        await form.validateFields(namePath, {
+          recursive: true
+        });
+      } catch (error) {
+        setLoading(false);
+        // 重新抛出验证错误，让表单显示错误信息
+        // validateFields 抛出错误时，表单会自动设置错误状态并显示错误
+        // 错误对象包含 errorFields，表单会根据这些字段显示错误
+        // 确保错误被正确传播，这样表单可以正确显示验证错误
+        throw error;
       }
-    }, _callee, null, [[0, 23], [4, 9]]);
-  })));
+      const fields = (() => {
+        // `getFieldFormatValue` will unwrap object results (by returning the first value),
+        // which breaks editable row save when `namePath` points to a row object.
+        // Prefer `getFieldFormatValueObject` and then pick the row by `namePath`.
+        const formattedObject = context?.getFieldFormatValueObject?.(namePath);
+        const formattedRow = formattedObject != null ? (0, _util.get)(formattedObject, namePath) : null;
+        return formattedRow ?? form.getFieldValue(namePath);
+      })();
+      // 处理 dataIndex 为数组的情况
+      if (Array.isArray(recordKey) && recordKey.length > 1) {
+        // 获取 namepath
+        const [, ...recordKeyPath] = recordKey;
+        // 将目标值获取出来并设置到 fields 当中
+        const curValue = (0, _util.get)(fields, recordKeyPath);
+        (0, _util.set)(fields, recordKeyPath, curValue);
+      }
+      const data = isMapEditor ? (0, _util.set)({}, namePath, fields) : fields;
+
+      // 获取数据并保存
+      const res = await onSave?.(recordKey,
+      // 如果是 map 模式，fields 就是一个值，所以需要set 到对象中
+      // 数据模式 fields 是一个对象，所以不需要
+      (0, _merge.merge)({}, row, data), row, newLineConfig);
+      setLoading(false);
+      return res;
+    } catch (error) {
+      setLoading(false);
+      throw error;
+    }
+  });
 
   // 保存数据
-  (0, _react.useImperativeHandle)(ref, function () {
-    return {
-      save: save
-    };
-  }, [save]);
+  (0, _react.useImperativeHandle)(ref, () => ({
+    save
+  }), [save]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("a", {
-    onClick: ( /*#__PURE__*/function () {
-      var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(e) {
-        return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              e.stopPropagation();
-              e.preventDefault();
-              _context2.prev = 2;
-              _context2.next = 5;
-              return save();
-            case 5:
-              _context2.next = 9;
-              break;
-            case 7:
-              _context2.prev = 7;
-              _context2.t0 = _context2["catch"](2);
-            case 9:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, null, [[2, 7]]);
-      }));
-      return function (_x) {
-        return _ref5.apply(this, arguments);
-      };
-    }()),
+    onClick: async e => {
+      e.stopPropagation();
+      e.preventDefault();
+      try {
+        await save();
+      } catch {
+        // 验证错误会被 form.validateFields 抛出，这里不需要处理
+        // 错误会被表单自动显示
+      }
+    },
     children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.LoadingOutlined, {
       style: {
         marginInlineEnd: 8
@@ -329,60 +315,41 @@ function SaveEditableAction(_ref3, ref) {
  *
  * @param ActionRenderConfig
  */
-var DeleteEditableAction = exports.DeleteEditableAction = function DeleteEditableAction(_ref6) {
-  var recordKey = _ref6.recordKey,
-    onDelete = _ref6.onDelete,
-    preEditRowRef = _ref6.preEditRowRef,
-    row = _ref6.row,
-    children = _ref6.children,
-    deletePopconfirmMessage = _ref6.deletePopconfirmMessage;
-  var _useMountMergeState3 = (0, _useMountMergeState5.useMountMergeState)(function () {
-      return false;
-    }),
-    _useMountMergeState4 = (0, _slicedToArray2.default)(_useMountMergeState3, 2),
-    loading = _useMountMergeState4[0],
-    setLoading = _useMountMergeState4[1];
-  var onConfirm = (0, _.useRefFunction)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
-    var res;
-    return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
-        case 0:
-          _context3.prev = 0;
-          setLoading(true);
-          _context3.next = 4;
-          return onDelete === null || onDelete === void 0 ? void 0 : onDelete(recordKey, row);
-        case 4:
-          res = _context3.sent;
-          setLoading(false);
-          // 如果返回 false，阻止删除操作
-          if (!(res === false)) {
-            _context3.next = 8;
-            break;
-          }
-          return _context3.abrupt("return", false);
-        case 8:
-          return _context3.abrupt("return", res);
-        case 11:
-          _context3.prev = 11;
-          _context3.t0 = _context3["catch"](0);
-          setLoading(false);
-          return _context3.abrupt("return", null);
-        case 15:
-          _context3.prev = 15;
-          if (preEditRowRef) preEditRowRef.current = null;
-          return _context3.finish(15);
-        case 18:
-        case "end":
-          return _context3.stop();
+const DeleteEditableAction = ({
+  recordKey,
+  onDelete,
+  preEditRowRef,
+  preEditRowRefs,
+  row,
+  children,
+  deletePopconfirmMessage
+}) => {
+  const [loading, setLoading] = (0, _react.useState)(false);
+  const onConfirm = (0, _.useRefFunction)(async () => {
+    try {
+      setLoading(true);
+      const res = await onDelete?.(recordKey, row);
+      setLoading(false);
+      // 如果返回 false，阻止删除操作
+      if (res === false) {
+        return false;
       }
-    }, _callee3, null, [[0, 11, 15, 18]]);
-  })));
+      return res;
+    } catch {
+      setLoading(false);
+      return null;
+    } finally {
+      const recordKeyStr = recordKeyToString(recordKey)?.toString();
+      if (recordKeyStr) {
+        preEditRowRefs?.current?.delete(recordKeyStr);
+      }
+      if (preEditRowRef) preEditRowRef.current = null;
+    }
+  });
   return children !== false ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Popconfirm, {
     title: deletePopconfirmMessage || '确定要删除这条记录吗？',
     onConfirm: onConfirm,
-    getPopupContainer: function getPopupContainer(triggerNode) {
-      return triggerNode.parentElement || document.body;
-    },
+    getPopupContainer: triggerNode => triggerNode.parentElement || document.body,
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("a", {
       children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.LoadingOutlined, {
         style: {
@@ -392,86 +359,92 @@ var DeleteEditableAction = exports.DeleteEditableAction = function DeleteEditabl
     })
   }, "delete") : null;
 };
-var CancelEditableAction = function CancelEditableAction(props) {
-  var recordKey = props.recordKey,
-    tableName = props.tableName,
-    newLineConfig = props.newLineConfig,
-    editorType = props.editorType,
-    onCancel = props.onCancel,
-    cancelEditable = props.cancelEditable,
-    row = props.row,
-    cancelText = props.cancelText,
-    preEditRowRef = props.preEditRowRef;
-  var context = (0, _react.useContext)(_ProFormContext.ProFormContext);
-  var form = _antd.Form.useFormInstance();
+exports.DeleteEditableAction = DeleteEditableAction;
+const CancelEditableAction = props => {
+  const {
+    recordKey,
+    tableName,
+    newLineConfig,
+    editorType,
+    onCancel,
+    cancelEditable,
+    row,
+    cancelText,
+    preEditRowRef,
+    preEditRowRefs
+  } = props;
+  const context = (0, _react.useContext)(_ProFormContext.ProFormContext);
+  const form = _antd.Form.useFormInstance();
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
-    onClick: ( /*#__PURE__*/function () {
-      var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4(e) {
-        var _context$getFieldForm2;
-        var isMapEditor, namePath, fields, record, res, _props$onDelete;
-        return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
-            case 0:
-              e.stopPropagation();
-              e.preventDefault();
-              isMapEditor = editorType === 'Map';
-              namePath = [tableName, recordKey].flat(1).filter(Boolean);
-              fields = (context === null || context === void 0 || (_context$getFieldForm2 = context.getFieldFormatValue) === null || _context$getFieldForm2 === void 0 ? void 0 : _context$getFieldForm2.call(context, namePath)) || (form === null || form === void 0 ? void 0 : form.getFieldValue(namePath));
-              record = isMapEditor ? (0, _util.set)({}, namePath, fields) : fields;
-              _context4.next = 8;
-              return onCancel === null || onCancel === void 0 ? void 0 : onCancel(recordKey, record, row, newLineConfig);
-            case 8:
-              res = _context4.sent;
-              _context4.next = 11;
-              return cancelEditable(recordKey);
-            case 11:
-              if (!((preEditRowRef === null || preEditRowRef === void 0 ? void 0 : preEditRowRef.current) !== null)) {
-                _context4.next = 15;
-                break;
-              }
-              form.setFieldsValue((0, _util.set)({}, namePath, preEditRowRef === null || preEditRowRef === void 0 ? void 0 : preEditRowRef.current));
-              _context4.next = 17;
-              break;
-            case 15:
-              _context4.next = 17;
-              return (_props$onDelete = props.onDelete) === null || _props$onDelete === void 0 ? void 0 : _props$onDelete.call(props, recordKey, row);
-            case 17:
-              if (preEditRowRef) preEditRowRef.current = null;
-              return _context4.abrupt("return", res);
-            case 19:
-            case "end":
-              return _context4.stop();
-          }
-        }, _callee4);
-      }));
-      return function (_x2) {
-        return _ref8.apply(this, arguments);
-      };
-    }()),
+    onClick: async e => {
+      e.stopPropagation();
+      e.preventDefault();
+      const isMapEditor = editorType === 'Map';
+      const recordKeyStr = recordKeyToString(recordKey)?.toString();
+      const namePath = normalizeNamePath(tableName, recordKey);
+      const fields = (() => {
+        const formattedObject = context?.getFieldFormatValueObject?.(namePath);
+        const formattedRow = formattedObject != null ? (0, _util.get)(formattedObject, namePath) : null;
+        return formattedRow ?? form?.getFieldValue(namePath);
+      })();
+      const record = isMapEditor ? (0, _util.set)({}, namePath, fields) : fields;
+
+      // 在清理编辑态前，先捕获“编辑前快照”（多行编辑时必须按 key 取值）
+      const cachedPreEditRow = recordKeyStr != null ? preEditRowRefs?.current?.get(recordKeyStr) : undefined;
+      const isNewLineKeyMatch = (() => {
+        const newLineKey = newLineConfig?.options?.recordKey;
+        if (newLineKey == null || recordKey == null) return false;
+        const newLineKeyStr = recordKeyToString(newLineKey)?.toString();
+        const currentKeyStr = recordKeyToString(recordKey)?.toString();
+        if (!newLineKeyStr || !currentKeyStr) return false;
+        return newLineKeyStr === currentKeyStr;
+      })();
+      const res = await onCancel?.(recordKey, record, row, newLineConfig);
+      await cancelEditable(recordKey);
+      /** 重置为默认值，不然编辑的行会丢掉 */
+      const restoreRow = cachedPreEditRow ?? preEditRowRef?.current ?? row;
+      const shouldDeleteNewRow = cachedPreEditRow === null || cachedPreEditRow === undefined && preEditRowRef?.current === null && isNewLineKeyMatch;
+      if (shouldDeleteNewRow) {
+        // 如果不存在历史值，说明是新的行，干掉他
+        await props.onDelete?.(recordKey, row);
+      } else if (restoreRow != null) {
+        form.setFieldsValue((0, _util.set)({}, namePath, restoreRow));
+      }
+      if (recordKeyStr) {
+        preEditRowRefs?.current?.delete(recordKeyStr);
+      }
+      if (preEditRowRef) preEditRowRef.current = null;
+      return res;
+    },
     children: cancelText || '取消'
   }, "cancel");
 };
 function defaultActionRender(row, config) {
-  var recordKey = config.recordKey,
-    newLineConfig = config.newLineConfig,
-    saveText = config.saveText,
-    deleteText = config.deleteText;
-  var SaveEditableActionRef = /*#__PURE__*/(0, _react.forwardRef)(SaveEditableAction);
-  var saveRef = /*#__PURE__*/(0, _react.createRef)();
+  const {
+    recordKey,
+    newLineConfig,
+    saveText,
+    deleteText
+  } = config;
+  const SaveEditableActionRef = /*#__PURE__*/(0, _react.forwardRef)(SaveEditableAction);
+  const saveRef = /*#__PURE__*/(0, _react.createRef)();
   return {
-    save: /*#__PURE__*/(0, _jsxRuntime.jsx)(SaveEditableActionRef, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, config), {}, {
+    save: /*#__PURE__*/(0, _jsxRuntime.jsx)(SaveEditableActionRef, {
+      ...config,
       row: row,
       ref: saveRef,
       children: saveText
-    }), 'save' + recordKey),
-    saveRef: saveRef,
-    delete: (newLineConfig === null || newLineConfig === void 0 ? void 0 : newLineConfig.options.recordKey) !== recordKey ? /*#__PURE__*/(0, _jsxRuntime.jsx)(DeleteEditableAction, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, config), {}, {
+    }, 'save' + recordKey),
+    saveRef,
+    delete: newLineConfig?.options.recordKey !== recordKey ? /*#__PURE__*/(0, _jsxRuntime.jsx)(DeleteEditableAction, {
+      ...config,
       row: row,
       children: deleteText
-    }), 'delete' + recordKey) : undefined,
-    cancel: /*#__PURE__*/(0, _jsxRuntime.jsx)(CancelEditableAction, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, config), {}, {
+    }, 'delete' + recordKey) : undefined,
+    cancel: /*#__PURE__*/(0, _jsxRuntime.jsx)(CancelEditableAction, {
+      ...config,
       row: row
-    }), 'cancel' + recordKey)
+    }, 'cancel' + recordKey)
   };
 }
 
@@ -482,26 +455,24 @@ function defaultActionRender(row, config) {
  */
 function useEditableArray(props) {
   // Internationalization
-  var intl = (0, _provider.useIntl)();
+  const intl = (0, _provider.useIntl)();
 
   /**
    * 点击开始编辑之前的保存数据用的
    */
-  var preEditRowRef = (0, _react.useRef)(null);
-  var _useState = (0, _react.useState)(undefined),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    newLineRecordCache = _useState2[0],
-    setNewLineRecordCache = _useState2[1];
+  const preEditRowRef = (0, _react.useRef)(null);
+  const preEditRowRefs = (0, _react.useRef)(new Map());
+  const [newLineRecordCache, setNewLineRecordCache] = (0, _react.useState)(undefined);
 
   /**
    * 构建数据源 key 索引映射表
    */
-  var buildDataSourceKeyIndexMap = (0, _.useRefFunction)(function () {
-    var map = new Map();
-    var traverseRecords = function traverseRecords(records, parentKey) {
-      records === null || records === void 0 || records.forEach(function (record, index) {
-        var indexKey = parentKey == null ? index.toString() : "".concat(parentKey, "_").concat(index);
-        var recordKey = recordKeyToString(props.getRowKey(record, -1));
+  const buildDataSourceKeyIndexMap = (0, _.useRefFunction)(() => {
+    const map = new Map();
+    const traverseRecords = (records, parentKey) => {
+      records?.forEach((record, index) => {
+        const indexKey = parentKey == null ? index.toString() : `${parentKey}_${index}`;
+        const recordKey = recordKeyToString(props.getRowKey(record, -1));
 
         // 如果 recordKey 是 undefined 或 null，跳过
         if (recordKey == null) {
@@ -509,7 +480,7 @@ function useEditableArray(props) {
         }
         map.set(indexKey, recordKey);
         map.set(recordKey.toString(), indexKey);
-        var children = props.childrenColumnName && (record === null || record === void 0 ? void 0 : record[props.childrenColumnName]);
+        const children = props.childrenColumnName && record?.[props.childrenColumnName];
         if (children) {
           traverseRecords(children, indexKey);
         }
@@ -518,72 +489,53 @@ function useEditableArray(props) {
     traverseRecords(props.dataSource);
     return map;
   });
-  var initDataSourceKeyIndexMap = (0, _react.useMemo)(function () {
-    return buildDataSourceKeyIndexMap();
-  }, []);
-  var dataSourceKeyIndexMapRef = (0, _react.useRef)(initDataSourceKeyIndexMap);
-  var newLineRecordRef = (0, _react.useRef)(undefined);
-  (0, _useDeepCompareEffect.useDeepCompareEffectDebounce)(function () {
+  const initDataSourceKeyIndexMap = (0, _react.useMemo)(() => buildDataSourceKeyIndexMap(), []);
+  const dataSourceKeyIndexMapRef = (0, _react.useRef)(initDataSourceKeyIndexMap);
+  const newLineRecordRef = (0, _react.useRef)(undefined);
+  (0, _useDeepCompareEffect.useDeepCompareEffectDebounce)(() => {
     dataSourceKeyIndexMapRef.current = buildDataSourceKeyIndexMap();
   }, [props.dataSource]);
 
   // 这里这么做是为了存上次的状态，不然每次存一下再拿
   newLineRecordRef.current = newLineRecordCache;
-  var editableType = props.type || 'single';
-  var _useLazyKVMap = (0, _useLazyKVMap3.default)(props.dataSource, 'children', props.getRowKey),
-    _useLazyKVMap2 = (0, _slicedToArray2.default)(_useLazyKVMap, 1),
-    getRecordByKey = _useLazyKVMap2[0];
-  var _useMergedState = (0, _util.useMergedState)([], {
-      value: props.editableKeys,
-      onChange: props.onChange ? function (keys) {
-        var _props$onChange, _keys$filter, _keys$map$filter;
-        props === null || props === void 0 || (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, // 计算编辑的key
-        (_keys$filter = keys === null || keys === void 0 ? void 0 : keys.filter(function (key) {
-          return key !== undefined;
-        })) !== null && _keys$filter !== void 0 ? _keys$filter : [], // 计算编辑的行
-        (_keys$map$filter = keys === null || keys === void 0 ? void 0 : keys.map(function (key) {
-          return getRecordByKey(key);
-        }).filter(function (key) {
-          return key !== undefined;
-        })) !== null && _keys$map$filter !== void 0 ? _keys$map$filter : []);
-      } : undefined
-    }),
-    _useMergedState2 = (0, _slicedToArray2.default)(_useMergedState, 2),
-    editableKeys = _useMergedState2[0],
-    setEditableRowKeys = _useMergedState2[1];
-  var editableKeysRef = (0, _usePrevious.usePrevious)(editableKeys);
+  const editableType = props.type || 'single';
+  const [getRecordByKey] = (0, _useLazyKVMap.default)(props.dataSource, 'children', props.getRowKey);
+  const [editableKeys, setEditableRowKeysInner] = (0, _util.useControlledState)([], props.editableKeys);
+  const setEditableRowKeys = (0, _react.useCallback)(updater => {
+    setEditableRowKeysInner(prev => {
+      const next = typeof updater === 'function' ? updater(prev) : updater;
+      props?.onChange?.(next?.filter(key => key !== undefined) ?? [], next?.map(key => getRecordByKey(key)).filter(k => k !== undefined) ?? []);
+      return next;
+    });
+  }, [props.onChange, getRecordByKey]);
+  const editableKeysRef = (0, _usePrevious.usePrevious)(editableKeys);
 
   /**
    * 检查 key 是否在编辑列表中
    */
-  var checkKeyInEditableList = (0, _.useRefFunction)(function (key, keysList) {
+  const checkKeyInEditableList = (0, _.useRefFunction)((key, keysList) => {
     return keysList.includes(key);
   });
 
   /** 这行是不是编辑状态 */
-  var isEditable = (0, _.useRefFunction)(function (row) {
-    var _props$getRowKey, _props$getRowKey2;
-    var recordKeyWithIndex = (_props$getRowKey = props.getRowKey(row, row.index)) === null || _props$getRowKey === void 0 ? void 0 : _props$getRowKey.toString();
-    var recordKey = (_props$getRowKey2 = props.getRowKey(row, -1)) === null || _props$getRowKey2 === void 0 ? void 0 : _props$getRowKey2.toString();
-    var stringEditableKeys = (editableKeys === null || editableKeys === void 0 ? void 0 : editableKeys.map(function (key) {
-      return key === null || key === void 0 ? void 0 : key.toString();
-    })) || [];
-    var stringEditableKeysRef = (editableKeysRef === null || editableKeysRef === void 0 ? void 0 : editableKeysRef.map(function (key) {
-      return key === null || key === void 0 ? void 0 : key.toString();
-    })) || [];
-    var preIsEditable = checkKeyInEditableList(recordKey, stringEditableKeysRef) || checkKeyInEditableList(recordKeyWithIndex, stringEditableKeysRef);
+  const isEditable = (0, _.useRefFunction)(row => {
+    const recordKeyWithIndex = props.getRowKey(row, row.index)?.toString();
+    const recordKey = props.getRowKey(row, -1)?.toString();
+    const stringEditableKeys = editableKeys?.map(key => key?.toString()) || [];
+    const stringEditableKeysRef = editableKeysRef?.map(key => key?.toString()) || [];
+    const preIsEditable = checkKeyInEditableList(recordKey, stringEditableKeysRef) || checkKeyInEditableList(recordKeyWithIndex, stringEditableKeysRef);
     return {
-      recordKey: recordKey,
+      recordKey,
       isEditable: checkKeyInEditableList(recordKey, stringEditableKeys) || checkKeyInEditableList(recordKeyWithIndex, stringEditableKeys),
-      preIsEditable: preIsEditable
+      preIsEditable
     };
   });
 
   /**
    * 验证是否可以开始编辑
    */
-  var validateCanStartEdit = (0, _.useRefFunction)(function () {
-    var hasEditableKeys = editableKeys && editableKeys.length > 0;
+  const validateCanStartEdit = (0, _.useRefFunction)(() => {
+    const hasEditableKeys = editableKeys && editableKeys.length > 0;
     if (hasEditableKeys && editableType === 'single' && props.onlyOneLineEditorAlertMessage !== false) {
       warning(props.onlyOneLineEditorAlertMessage || intl.getMessage('editableTable.onlyOneLineEditor', '只能同时编辑一行'));
       return false;
@@ -594,206 +546,168 @@ function useEditableArray(props) {
   /**
    * 查找记录
    */
-  var findRecordByKey = (0, _.useRefFunction)(function (recordKey) {
-    var _props$dataSource$fin, _props$dataSource;
-    return (_props$dataSource$fin = (_props$dataSource = props.dataSource) === null || _props$dataSource === void 0 ? void 0 : _props$dataSource.find(function (recordData, index) {
+  const findRecordByKey = (0, _.useRefFunction)(recordKey => {
+    return props.dataSource?.find((recordData, index) => {
       return props.getRowKey(recordData, index) === recordKey;
-    })) !== null && _props$dataSource$fin !== void 0 ? _props$dataSource$fin : null;
+    }) ?? null;
   });
 
   /**
    * 进入编辑状态
    */
-  var startEditable = (0, _.useRefFunction)(function (recordKey, record) {
-    var _ref9;
+  const startEditable = (0, _.useRefFunction)((recordKey, record) => {
     if (!validateCanStartEdit()) {
       return false;
     }
-    var isAlreadyEditable = editableKeys === null || editableKeys === void 0 ? void 0 : editableKeys.some(function (key) {
-      return key === recordKey || (key === null || key === void 0 ? void 0 : key.toString()) === (recordKey === null || recordKey === void 0 ? void 0 : recordKey.toString());
-    });
+    const isAlreadyEditable = editableKeys?.some(key => key === recordKey || key?.toString() === recordKey?.toString());
     if (!isAlreadyEditable) {
-      var newKeys = editableKeys ? [].concat((0, _toConsumableArray2.default)(editableKeys), [recordKey]) : [recordKey];
+      const newKeys = editableKeys ? [...editableKeys, recordKey] : [recordKey];
       setEditableRowKeys(newKeys);
     }
-    preEditRowRef.current = (_ref9 = record !== null && record !== void 0 ? record : findRecordByKey(recordKey)) !== null && _ref9 !== void 0 ? _ref9 : null;
+    preEditRowRef.current = record ?? findRecordByKey(recordKey) ?? null;
+    const recordKeyStr = recordKeyToString(recordKey)?.toString();
+    if (recordKeyStr) {
+      preEditRowRefs.current.set(recordKeyStr, preEditRowRef.current);
+    }
     return true;
   });
 
   /**
    * 清理编辑状态
    */
-  var clearEditableState = (0, _.useRefFunction)(function (recordKey) {
-    var _editableKeys$filter;
-    var relayKey = recordKeyToString(recordKey);
-    var relayKeyStr = relayKey != null ? relayKey.toString() : null;
+  const clearEditableState = (0, _.useRefFunction)(recordKey => {
+    const relayKey = recordKeyToString(recordKey);
+    const relayKeyStr = relayKey != null ? relayKey.toString() : null;
     if (relayKeyStr == null) {
       return;
     }
-    var newKeys = (_editableKeys$filter = editableKeys === null || editableKeys === void 0 ? void 0 : editableKeys.filter(function (key) {
-      return (key === null || key === void 0 ? void 0 : key.toString()) !== relayKeyStr && key !== relayKey;
-    })) !== null && _editableKeys$filter !== void 0 ? _editableKeys$filter : [];
+    const newKeys = editableKeys?.filter(key => key?.toString() !== relayKeyStr && key !== relayKey) ?? [];
     setEditableRowKeys(newKeys);
   });
 
   /**
    * 退出编辑状态
    */
-  var cancelEditable = (0, _.useRefFunction)( /*#__PURE__*/function () {
-    var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5(recordKey, needReTry) {
-      var relayKey, relayKeyStr, mappedKey, isInEditableSet, _newLineRecordCache$o, keyForFind, _record3, _originRow, cacheRecordKey, cacheKey, cacheKeyStr, _newLineConfig, _recordKeyToString2, _cacheRecordKey, _cacheKeyStr, originRow, _props$formProps, formRef, _form, namePath, _recordKeyToString3, recordKeyStr;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
-          case 0:
-            relayKey = recordKeyToString(recordKey);
-            relayKeyStr = relayKey != null ? relayKey.toString() : null;
-            mappedKey = relayKeyStr != null ? dataSourceKeyIndexMapRef.current.get(relayKeyStr) : undefined;
-            isInEditableSet = editableKeys === null || editableKeys === void 0 ? void 0 : editableKeys.some(function (key) {
-              if (relayKeyStr == null) return false;
-              return (key === null || key === void 0 ? void 0 : key.toString()) === relayKeyStr || key === relayKey;
-            });
-            if (!(!isInEditableSet && mappedKey && (needReTry !== null && needReTry !== void 0 ? needReTry : true) && props.tableName)) {
-              _context5.next = 8;
-              break;
-            }
-            _context5.next = 7;
-            return cancelEditable(mappedKey, false);
-          case 7:
-            return _context5.abrupt("return", _context5.sent);
-          case 8:
-            if (!(props.onCancel && isInEditableSet)) {
-              _context5.next = 24;
-              break;
-            }
-            keyForFind = Array.isArray(recordKey) ? recordKey[0] : recordKey;
-            _record3 = findRecordByKey(keyForFind);
-            _originRow = preEditRowRef.current; // 比较 recordKey 时需要考虑类型转换
-            // newLineRecordCache.options.recordKey 是 addEditRecord 时设置的 recordKey
-            // 而 recordKey 是 cancelEditable 的参数，需要确保它们匹配
-            cacheRecordKey = newLineRecordCache === null || newLineRecordCache === void 0 || (_newLineRecordCache$o = newLineRecordCache.options) === null || _newLineRecordCache$o === void 0 ? void 0 : _newLineRecordCache$o.recordKey;
-            cacheKey = cacheRecordKey != null ? recordKeyToString(cacheRecordKey) : null;
-            cacheKeyStr = cacheKey != null ? cacheKey.toString() : null; // 检查 newLineRecordCache 是否匹配当前的 recordKey
-            _newLineConfig = newLineRecordCache != null && cacheRecordKey != null && (cacheRecordKey === recordKey || cacheKeyStr != null && relayKeyStr != null && cacheKeyStr === relayKeyStr || (cacheRecordKey === null || cacheRecordKey === void 0 ? void 0 : cacheRecordKey.toString()) === (recordKey === null || recordKey === void 0 ? void 0 : recordKey.toString()) || String(cacheRecordKey) === String(recordKey)) ? newLineRecordCache : undefined; // 调用 onCancel，即使找不到记录（新行编辑场景）
-            // 对于新行编辑，record 可能为 null，但 newLineConfig 应该包含 defaultValue
-            _context5.prev = 16;
-            _context5.next = 19;
-            return props.onCancel(recordKey, _record3 || (_newLineConfig === null || _newLineConfig === void 0 ? void 0 : _newLineConfig.defaultValue) || {}, _originRow || _record3 || (_newLineConfig === null || _newLineConfig === void 0 ? void 0 : _newLineConfig.defaultValue) || {}, _newLineConfig);
-          case 19:
-            _context5.next = 24;
-            break;
-          case 21:
-            _context5.prev = 21;
-            _context5.t0 = _context5["catch"](16);
-            // 如果 onCancel 抛出异常，仍然继续清理状态
-            console.error('onCancel error:', _context5.t0);
-          case 24:
-            // 清理 newLineRecordCache，需要比较 recordKey（考虑类型转换）
-            if (newLineRecordCache) {
-              _cacheRecordKey = newLineRecordCache.options.recordKey; // 重用之前计算的 relayKeyStr
-              _cacheKeyStr = _cacheRecordKey != null ? (_recordKeyToString2 = recordKeyToString(_cacheRecordKey)) === null || _recordKeyToString2 === void 0 ? void 0 : _recordKeyToString2.toString() : null;
-              if (_cacheRecordKey === recordKey || _cacheKeyStr != null && relayKeyStr != null && _cacheKeyStr === relayKeyStr || (_cacheRecordKey === null || _cacheRecordKey === void 0 ? void 0 : _cacheRecordKey.toString()) === (recordKey === null || recordKey === void 0 ? void 0 : recordKey.toString()) || String(_cacheRecordKey) === String(recordKey)) {
-                setNewLineRecordCache(undefined);
-              }
-            }
+  const cancelEditable = (0, _.useRefFunction)(async (recordKey, needReTry) => {
+    const relayKey = recordKeyToString(recordKey);
+    const relayKeyStr = relayKey != null ? relayKey.toString() : null;
+    const mappedKey = relayKeyStr != null ? dataSourceKeyIndexMapRef.current.get(relayKeyStr) : undefined;
+    const isInEditableSet = editableKeys?.some(key => {
+      if (relayKeyStr == null) return false;
+      return key?.toString() === relayKeyStr || key === relayKey;
+    });
+    if (!isInEditableSet && mappedKey && (needReTry ?? true) && props.tableName) {
+      return await cancelEditable(mappedKey, false);
+    }
 
-            // 先清理 preEditRowRef 并重置表单字段，然后再清除编辑状态
-            // 这样在清除编辑状态前，表单字段已经被清除，表格重新渲染时就不会显示输入框
-            originRow = preEditRowRef.current;
-            if (originRow && props.getRowKey(originRow, -1) === recordKey && isInEditableSet) {
-              try {
-                // 尝试通过 formProps.formRef 访问 form
-                formRef = (_props$formProps = props.formProps) === null || _props$formProps === void 0 ? void 0 : _props$formProps.formRef;
-                _form = (formRef === null || formRef === void 0 ? void 0 : formRef.current) || props.form;
-                if (_form) {
-                  if (props.tableName) {
-                    // name 模式：重置为原始值
-                    namePath = [props.tableName, recordKey].flat(1).filter(Boolean);
-                    _form.setFieldsValue((0, _util.set)({}, namePath, originRow));
-                  } else {
-                    // 非 name 模式：清除该行的所有表单字段
-                    // 在非 name 模式下，表单字段路径是 [recordKey, columnDataIndex]
-                    // 如 [624748504, 'title']，需要清除所有以 recordKey 开头的字段
-                    recordKeyStr = (_recordKeyToString3 = recordKeyToString(recordKey)) === null || _recordKeyToString3 === void 0 ? void 0 : _recordKeyToString3.toString();
-                    if (recordKeyStr) {
-                      try {
-                        // 在非 name 模式下，表单字段以嵌套对象的形式存储
-                        // 比如 { '624748504': { 'title': 'value', 'state': 'value' } }
-                        // 需要清除整个嵌套对象
-                        // 先使用 resetFields 清除字段状态
-                        _form.resetFields([[recordKeyStr]]);
+    // 如果提供了 onCancel，尝试调用它（用于测试场景）
+    // 注意：在实际使用中，onCancel 应该在 CancelEditableAction 中被调用
+    if (props.onCancel && isInEditableSet) {
+      const keyForFind = Array.isArray(recordKey) ? recordKey[0] : recordKey;
+      const record = findRecordByKey(keyForFind);
+      const originRow = preEditRowRef.current;
+      // 比较 recordKey 时需要考虑类型转换
+      // newLineRecordCache.options.recordKey 是 addEditRecord 时设置的 recordKey
+      // 而 recordKey 是 cancelEditable 的参数，需要确保它们匹配
+      const cacheRecordKey = newLineRecordCache?.options?.recordKey;
+      const cacheKey = cacheRecordKey != null ? recordKeyToString(cacheRecordKey) : null;
+      const cacheKeyStr = cacheKey != null ? cacheKey.toString() : null;
+      // 检查 newLineRecordCache 是否匹配当前的 recordKey
+      const newLineConfig = newLineRecordCache != null && cacheRecordKey != null && (cacheRecordKey === recordKey || cacheKeyStr != null && relayKeyStr != null && cacheKeyStr === relayKeyStr || cacheRecordKey?.toString() === recordKey?.toString() || String(cacheRecordKey) === String(recordKey)) ? newLineRecordCache : undefined;
+
+      // 调用 onCancel，即使找不到记录（新行编辑场景）
+      // 对于新行编辑，record 可能为 null，但 newLineConfig 应该包含 defaultValue
+      try {
+        await props.onCancel(recordKey, record || newLineConfig?.defaultValue || {}, originRow || record || newLineConfig?.defaultValue || {}, newLineConfig);
+      } catch (error) {
+        // 如果 onCancel 抛出异常，仍然继续清理状态
+        console.error('onCancel error:', error);
+      }
+    }
 
-                        // 然后使用 setFieldsValue 清除字段值
-                        // 这样可以确保字段被完全清除，表格重新渲染时不会显示输入框
-                        _form.setFieldsValue((0, _defineProperty2.default)({}, recordKeyStr, undefined));
-                      } catch (error) {
-                        // 如果清除失败，忽略错误
-                        console.warn('Failed to clear form fields in cancelEditable:', error);
-                      }
-                    }
-                  }
-                }
+    // 清理 newLineRecordCache，需要比较 recordKey（考虑类型转换）
+    if (newLineRecordCache) {
+      const cacheRecordKey = newLineRecordCache.options.recordKey;
+      // 重用之前计算的 relayKeyStr
+      const cacheKeyStr = cacheRecordKey != null ? recordKeyToString(cacheRecordKey)?.toString() : null;
+      if (cacheRecordKey === recordKey || cacheKeyStr != null && relayKeyStr != null && cacheKeyStr === relayKeyStr || cacheRecordKey?.toString() === recordKey?.toString() || String(cacheRecordKey) === String(recordKey)) {
+        setNewLineRecordCache(undefined);
+      }
+    }
+
+    // 先清理 preEditRowRef 并重置表单字段，然后再清除编辑状态
+    // 这样在清除编辑状态前，表单字段已经被清除，表格重新渲染时就不会显示输入框
+    const originRow = preEditRowRef.current;
+    if (originRow && props.getRowKey(originRow, -1) === recordKey && isInEditableSet) {
+      try {
+        // 尝试通过 formProps.formRef 访问 form
+        const formRef = props.formProps?.formRef;
+        const form = formRef?.current || props.form;
+        if (form) {
+          if (props.tableName) {
+            // name 模式：重置为原始值
+            const namePath = normalizeNamePath(props.tableName, recordKey);
+            form.setFieldsValue((0, _util.set)({}, namePath, originRow));
+          } else {
+            // 非 name 模式：清除该行的所有表单字段
+            // 在非 name 模式下，表单字段路径是 [recordKey, columnDataIndex]
+            // 如 [624748504, 'title']，需要清除所有以 recordKey 开头的字段
+            const recordKeyStr = recordKeyToString(recordKey)?.toString();
+            if (recordKeyStr) {
+              try {
+                // 在非 name 模式下，表单字段以嵌套对象的形式存储
+                // 比如 { '624748504': { 'title': 'value', 'state': 'value' } }
+                // 需要清除整个嵌套对象
+                // 先使用 resetFields 清除字段状态
+                form.resetFields([[recordKeyStr]]);
+
+                // 然后使用 setFieldsValue 清除字段值
+                // 这样可以确保字段被完全清除，表格重新渲染时不会显示输入框
+                form.setFieldsValue({
+                  [recordKeyStr]: undefined
+                });
               } catch (error) {
-                // 如果访问 form 失败，忽略错误
-                console.warn('Failed to reset form fields in cancelEditable:', error);
+                // 如果清除失败，忽略错误
+                console.warn('Failed to clear form fields in cancelEditable:', error);
               }
-              preEditRowRef.current = null;
             }
-
-            // 最后清除编辑状态，这样表格会重新渲染，输入框会消失
-            clearEditableState(recordKey);
-            return _context5.abrupt("return", true);
-          case 29:
-          case "end":
-            return _context5.stop();
-        }
-      }, _callee5, null, [[16, 21]]);
-    }));
-    return function (_x3, _x4) {
-      return _ref10.apply(this, arguments);
-    };
-  }());
-  var propsOnValuesChange = (0, _.useDebounceFn)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee6() {
-    var _props$onValuesChange;
-    var _len,
-      rest,
-      _key,
-      _args6 = arguments;
-    return (0, _regeneratorRuntime2.default)().wrap(function _callee6$(_context6) {
-      while (1) switch (_context6.prev = _context6.next) {
-        case 0:
-          for (_len = _args6.length, rest = new Array(_len), _key = 0; _key < _len; _key++) {
-            rest[_key] = _args6[_key];
           }
-          //@ts-ignore
-          (_props$onValuesChange = props.onValuesChange) === null || _props$onValuesChange === void 0 || _props$onValuesChange.call.apply(_props$onValuesChange, [props].concat(rest));
-        case 2:
-        case "end":
-          return _context6.stop();
+        }
+      } catch (error) {
+        // 如果访问 form 失败，忽略错误
+        console.warn('Failed to reset form fields in cancelEditable:', error);
       }
-    }, _callee6);
-  })), 64);
+      preEditRowRef.current = null;
+    }
+
+    // 最后清除编辑状态，这样表格会重新渲染，输入框会消失
+    clearEditableState(recordKey);
+    return true;
+  });
+  const propsOnValuesChange = (0, _.useDebounceFn)(async (...rest) => {
+    //@ts-ignore
+    props.onValuesChange?.(...rest);
+  }, 64);
 
   /**
    * 构建表单字段路径
    */
-  var buildFormFieldPath = (0, _.useRefFunction)(function (recordKey) {
-    return [props.tableName || '', recordKey].flat(1).filter(function (key) {
-      return key || key === 0;
-    });
+  const buildFormFieldPath = (0, _.useRefFunction)(recordKey => {
+    return [props.tableName || '', recordKey].flat(1).filter(key => key || key === 0);
   });
 
   /**
    * 更新数据源中的编辑行
    */
-  var updateDataSourceWithEditableRows = (0, _.useRefFunction)(function (dataSource, values) {
-    var updatedDataSource = dataSource;
-    editableKeys === null || editableKeys === void 0 || editableKeys.forEach(function (eachRecordKey) {
-      if ((newLineRecordCache === null || newLineRecordCache === void 0 ? void 0 : newLineRecordCache.options.recordKey) === eachRecordKey) {
+  const updateDataSourceWithEditableRows = (0, _.useRefFunction)((dataSource, values) => {
+    let updatedDataSource = dataSource;
+    editableKeys?.forEach(eachRecordKey => {
+      if (newLineRecordCache?.options.recordKey === eachRecordKey) {
         return;
       }
-      var recordKey = eachRecordKey.toString();
-      var fieldPath = buildFormFieldPath(recordKey);
-      var editRow = (0, _util.get)(values, fieldPath);
+      const recordKey = eachRecordKey.toString();
+      const fieldPath = buildFormFieldPath(recordKey);
+      const editRow = (0, _util.get)(values, fieldPath);
       if (!editRow) {
         return;
       }
@@ -811,45 +725,43 @@ function useEditableArray(props) {
   /**
    * 获取当前编辑的行数据
    */
-  var getCurrentEditRow = (0, _.useRefFunction)(function (value, values, dataSource) {
-    var _valueKeys$pop;
-    var valueKeys = Object.keys(value || {});
+  const getCurrentEditRow = (0, _.useRefFunction)((value, values, dataSource) => {
+    const valueKeys = Object.keys(value || {});
     if (valueKeys.length === 0) {
-      return (newLineRecordCache === null || newLineRecordCache === void 0 ? void 0 : newLineRecordCache.defaultValue) || {};
+      return newLineRecordCache?.defaultValue || {};
     }
-    var recordKey = ((_valueKeys$pop = valueKeys.pop()) === null || _valueKeys$pop === void 0 ? void 0 : _valueKeys$pop.toString()) || '';
+    const recordKey = valueKeys.pop()?.toString() || '';
     if (!recordKey) {
-      return (newLineRecordCache === null || newLineRecordCache === void 0 ? void 0 : newLineRecordCache.defaultValue) || {};
+      return newLineRecordCache?.defaultValue || {};
     }
-    var fieldPath = buildFormFieldPath(recordKey);
-    var newLineRecordData = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, newLineRecordCache === null || newLineRecordCache === void 0 ? void 0 : newLineRecordCache.defaultValue), (0, _util.get)(values, fieldPath));
-    var existsInDataSource = dataSourceKeyIndexMapRef.current.has(recordKeyToString(recordKey));
+    const fieldPath = buildFormFieldPath(recordKey);
+    const newLineRecordData = {
+      ...newLineRecordCache?.defaultValue,
+      ...(0, _util.get)(values, fieldPath)
+    };
+    const existsInDataSource = dataSourceKeyIndexMapRef.current.has(recordKeyToString(recordKey));
     if (existsInDataSource) {
-      var foundRow = dataSource.find(function (item, index) {
-        var _props$getRowKey3;
-        var key = (_props$getRowKey3 = props.getRowKey(item, index)) === null || _props$getRowKey3 === void 0 ? void 0 : _props$getRowKey3.toString();
+      const foundRow = dataSource.find((item, index) => {
+        const key = props.getRowKey(item, index)?.toString();
         return key === recordKey;
       });
       return foundRow || newLineRecordData;
     }
     return newLineRecordData;
   });
-  var onValuesChange = (0, _.useRefFunction)(function (value, values) {
+  const onValuesChange = (0, _.useRefFunction)((value, values) => {
     if (!props.onValuesChange) {
       return;
     }
-    var updatedDataSource = updateDataSourceWithEditableRows(props.dataSource, values);
-    var editRow = getCurrentEditRow(value, values, updatedDataSource);
+    const updatedDataSource = updateDataSourceWithEditableRows(props.dataSource, values);
+    const editRow = getCurrentEditRow(value, values, updatedDataSource);
     propsOnValuesChange.run(editRow, updatedDataSource);
   });
-  var saveRefsMap = (0, _react.useRef)(new Map());
-  (0, _react.useEffect)(function () {
-    var _editableKeys$map;
-    var editableKeysSet = new Set((_editableKeys$map = editableKeys === null || editableKeys === void 0 ? void 0 : editableKeys.map(function (key) {
-      return key === null || key === void 0 ? void 0 : key.toString();
-    })) !== null && _editableKeys$map !== void 0 ? _editableKeys$map : []);
-    saveRefsMap.current.forEach(function (ref, key) {
-      if (!editableKeysSet.has(key === null || key === void 0 ? void 0 : key.toString())) {
+  const saveRefsMap = (0, _react.useRef)(new Map());
+  (0, _react.useEffect)(() => {
+    const editableKeysSet = new Set(editableKeys?.map(key => key?.toString()) ?? []);
+    saveRefsMap.current.forEach((ref, key) => {
+      if (!editableKeysSet.has(key?.toString())) {
         saveRefsMap.current.delete(key);
       }
     });
@@ -858,64 +770,37 @@ function useEditableArray(props) {
   /**
    * 获取保存引用
    */
-  var getSaveRef = (0, _.useRefFunction)(function (recordKey) {
-    var relayKey = recordKeyToString(recordKey);
+  const getSaveRef = (0, _.useRefFunction)(recordKey => {
+    const relayKey = recordKeyToString(recordKey);
     return saveRefsMap.current.get(relayKey) || saveRefsMap.current.get(relayKey.toString());
   });
 
   /**
    * 保存编辑行
    */
-  var saveEditable = (0, _.useRefFunction)( /*#__PURE__*/function () {
-    var _ref12 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee7(recordKey, needReTry) {
-      var relayKey, relayKeyStr, mappedKey, isInEditableSet, saveRef;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
-          case 0:
-            relayKey = recordKeyToString(recordKey);
-            relayKeyStr = relayKey.toString();
-            mappedKey = dataSourceKeyIndexMapRef.current.get(relayKeyStr);
-            isInEditableSet = editableKeys === null || editableKeys === void 0 ? void 0 : editableKeys.some(function (key) {
-              return (key === null || key === void 0 ? void 0 : key.toString()) === relayKeyStr || key === relayKey;
-            });
-            if (!(!isInEditableSet && mappedKey && (needReTry !== null && needReTry !== void 0 ? needReTry : true) && props.tableName)) {
-              _context7.next = 8;
-              break;
-            }
-            _context7.next = 7;
-            return saveEditable(mappedKey, false);
-          case 7:
-            return _context7.abrupt("return", _context7.sent);
-          case 8:
-            saveRef = getSaveRef(recordKey);
-            if (saveRef !== null && saveRef !== void 0 && saveRef.current) {
-              _context7.next = 11;
-              break;
-            }
-            return _context7.abrupt("return", false);
-          case 11:
-            _context7.next = 13;
-            return saveRef.current.save();
-          case 13:
-            clearEditableState(recordKey);
-            return _context7.abrupt("return", true);
-          case 15:
-          case "end":
-            return _context7.stop();
-        }
-      }, _callee7);
-    }));
-    return function (_x5, _x6) {
-      return _ref12.apply(this, arguments);
-    };
-  }());
+  const saveEditable = (0, _.useRefFunction)(async (recordKey, needReTry) => {
+    const relayKey = recordKeyToString(recordKey);
+    const relayKeyStr = relayKey.toString();
+    const mappedKey = dataSourceKeyIndexMapRef.current.get(relayKeyStr);
+    const isInEditableSet = editableKeys?.some(key => key?.toString() === relayKeyStr || key === relayKey);
+    if (!isInEditableSet && mappedKey && (needReTry ?? true) && props.tableName) {
+      return await saveEditable(mappedKey, false);
+    }
+    const saveRef = getSaveRef(recordKey);
+    if (!saveRef?.current) {
+      return false;
+    }
+    await saveRef.current.save();
+    clearEditableState(recordKey);
+    return true;
+  });
 
   /**
    * 验证是否可以新增记录
    */
-  var validateCanAddRecord = (0, _.useRefFunction)(function (options) {
-    if (options !== null && options !== void 0 && options.parentKey && !dataSourceKeyIndexMapRef.current.has(recordKeyToString(options === null || options === void 0 ? void 0 : options.parentKey).toString())) {
-      console.warn("can't find record by key", options === null || options === void 0 ? void 0 : options.parentKey);
+  const validateCanAddRecord = (0, _.useRefFunction)(options => {
+    if (options?.parentKey && !dataSourceKeyIndexMapRef.current.has(recordKeyToString(options?.parentKey).toString())) {
+      console.warn("can't find record by key", options?.parentKey);
       return false;
     }
     if (newLineRecordRef.current && props.onlyAddOneLineAlertMessage !== false) {
@@ -931,7 +816,7 @@ function useEditableArray(props) {
   /**
    * 验证记录 key 是否有效
    */
-  var validateRecordKey = (0, _.useRefFunction)(function (recordKey) {
+  const validateRecordKey = (0, _.useRefFunction)(recordKey => {
     if (recordKey == null && recordKey !== 0 && recordKey !== '') {
       noteOnce(false, '请设置 recordCreatorProps.record 并返回一个唯一的key  \n  https://procomponents.ant.design/components/editable-table#editable-%E6%96%B0%E5%BB%BA%E8%A1%8C');
       throw new Error('请设置 recordCreatorProps.record 并返回一个唯一的key');
@@ -941,183 +826,145 @@ function useEditableArray(props) {
   /**
    * 增加新的行
    */
-  var addEditRecord = (0, _.useRefFunction)(function (row, options) {
+  const addEditRecord = (0, _.useRefFunction)((row, options) => {
     if (!validateCanAddRecord(options)) {
       return false;
     }
-    var recordKey = props.getRowKey(row, -1);
+    const recordKey = props.getRowKey(row, -1);
     validateRecordKey(recordKey);
-    var isAlreadyEditable = editableKeys === null || editableKeys === void 0 ? void 0 : editableKeys.some(function (key) {
-      return key === recordKey || (key === null || key === void 0 ? void 0 : key.toString()) === (recordKey === null || recordKey === void 0 ? void 0 : recordKey.toString());
-    });
+    const recordKeyStr = recordKeyToString(recordKey)?.toString();
+    if (recordKeyStr) {
+      // 新建行：用 null 作为快照标记，避免多行编辑取消时误删其他行
+      preEditRowRefs.current.set(recordKeyStr, null);
+    }
+    const isAlreadyEditable = editableKeys?.some(key => key === recordKey || key?.toString() === recordKey?.toString());
     if (!isAlreadyEditable) {
-      var newKeys = editableKeys ? [].concat((0, _toConsumableArray2.default)(editableKeys), [recordKey]) : [recordKey];
+      const newKeys = editableKeys ? [...editableKeys, recordKey] : [recordKey];
       setEditableRowKeys(newKeys);
     }
 
     // 处理 parentKey：如果是函数，调用它
-    var parentKeyValue = typeof (options === null || options === void 0 ? void 0 : options.parentKey) === 'function' ? options.parentKey() : options === null || options === void 0 ? void 0 : options.parentKey;
-    var isDataSourceMode = (options === null || options === void 0 ? void 0 : options.newRecordType) === 'dataSource' || props.tableName && (options === null || options === void 0 ? void 0 : options.newRecordType) !== 'cache';
+    const parentKeyValue = typeof options?.parentKey === 'function' ? options.parentKey() : options?.parentKey;
+    const isDataSourceMode = options?.newRecordType === 'dataSource' || props.tableName && options?.newRecordType !== 'cache';
     if (isDataSourceMode) {
-      var _recordKeyToString4;
-      var actionProps = {
+      const actionProps = {
         data: props.dataSource,
         getRowKey: props.getRowKey,
-        row: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, row), {}, {
-          map_row_parentKey: parentKeyValue ? (_recordKeyToString4 = recordKeyToString(parentKeyValue)) === null || _recordKeyToString4 === void 0 ? void 0 : _recordKeyToString4.toString() : undefined
-        }),
+        row: {
+          ...row,
+          map_row_parentKey: parentKeyValue ? recordKeyToString(parentKeyValue)?.toString() : undefined
+        },
         key: recordKey,
         childrenColumnName: props.childrenColumnName || 'children'
       };
-      props.setDataSource(editableRowByKey(actionProps, (options === null || options === void 0 ? void 0 : options.position) === 'top' ? 'top' : 'update'));
+      props.setDataSource(editableRowByKey(actionProps, options?.position === 'top' ? 'top' : 'update'));
     } else {
       setNewLineRecordCache({
         defaultValue: row,
-        options: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, options), {}, {
+        options: {
+          ...options,
           parentKey: parentKeyValue,
-          recordKey: recordKey
-        })
+          recordKey
+        }
       });
     }
     return true;
   });
-  var saveText = (props === null || props === void 0 ? void 0 : props.saveText) || intl.getMessage('editableTable.action.save', '保存');
-  var deleteText = (props === null || props === void 0 ? void 0 : props.deleteText) || intl.getMessage('editableTable.action.delete', '删除');
-  var cancelText = (props === null || props === void 0 ? void 0 : props.cancelText) || intl.getMessage('editableTable.action.cancel', '取消');
-  var actionSaveRef = (0, _.useRefFunction)( /*#__PURE__*/function () {
-    var _ref13 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee8(recordKey, editRow, originRow, newLine) {
-      var _props$onSave;
-      var res, _ref14, options, isNewLine, _recordKeyToString5, _options$parentKey, actionProps;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
-          case 0:
-            _context8.next = 2;
-            return props === null || props === void 0 || (_props$onSave = props.onSave) === null || _props$onSave === void 0 ? void 0 : _props$onSave.call(props, recordKey, editRow, originRow, newLine);
-          case 2:
-            res = _context8.sent;
-            _ref14 = newLine || newLineRecordRef.current || {}, options = _ref14.options;
-            isNewLine = !(options !== null && options !== void 0 && options.parentKey) && (options === null || options === void 0 ? void 0 : options.recordKey) === recordKey;
-            if (isNewLine) {
-              if ((options === null || options === void 0 ? void 0 : options.position) === 'top') {
-                props.setDataSource([editRow].concat((0, _toConsumableArray2.default)(props.dataSource)));
-              } else {
-                props.setDataSource([].concat((0, _toConsumableArray2.default)(props.dataSource), [editRow]));
-              }
-            } else {
-              actionProps = {
-                data: props.dataSource,
-                getRowKey: props.getRowKey,
-                row: options ? (0, _objectSpread4.default)((0, _objectSpread4.default)({}, editRow), {}, {
-                  map_row_parentKey: (_recordKeyToString5 = recordKeyToString((_options$parentKey = options === null || options === void 0 ? void 0 : options.parentKey) !== null && _options$parentKey !== void 0 ? _options$parentKey : '')) === null || _recordKeyToString5 === void 0 ? void 0 : _recordKeyToString5.toString()
-                }) : editRow,
-                key: recordKey,
-                childrenColumnName: props.childrenColumnName || 'children'
-              };
-              props.setDataSource(editableRowByKey(actionProps, (options === null || options === void 0 ? void 0 : options.position) === 'top' ? 'top' : 'update'));
-            }
+  const saveText = props?.saveText || intl.getMessage('editableTable.action.save', '保存');
+  const deleteText = props?.deleteText || intl.getMessage('editableTable.action.delete', '删除');
+  const cancelText = props?.cancelText || intl.getMessage('editableTable.action.cancel', '取消');
+  const actionSaveRef = (0, _.useRefFunction)(async (recordKey, editRow, originRow, newLine) => {
+    const res = await props?.onSave?.(recordKey, editRow, originRow, newLine);
+
+    // 如果 onSave 返回 false，阻止保存：不更新 dataSource，不触发 onChange
+    if (res === false) {
+      return res;
+    }
+    const {
+      options
+    } = newLine || newLineRecordRef.current || {};
+    const isNewLine = !options?.parentKey && options?.recordKey === recordKey;
+    if (isNewLine) {
+      if (options?.position === 'top') {
+        props.setDataSource([editRow, ...props.dataSource]);
+      } else {
+        props.setDataSource([...props.dataSource, editRow]);
+      }
+    } else {
+      const actionProps = {
+        data: props.dataSource,
+        getRowKey: props.getRowKey,
+        row: options ? {
+          ...editRow,
+          map_row_parentKey: recordKeyToString(options?.parentKey ?? '')?.toString()
+        } : editRow,
+        key: recordKey,
+        childrenColumnName: props.childrenColumnName || 'children'
+      };
+      props.setDataSource(editableRowByKey(actionProps, options?.position === 'top' ? 'top' : 'update'));
+    }
 
-            // 保存时解除编辑模式，统一在这里调用一次
-            _context8.next = 8;
-            return cancelEditable(recordKey);
-          case 8:
-            return _context8.abrupt("return", res);
-          case 9:
-          case "end":
-            return _context8.stop();
-        }
-      }, _callee8);
-    }));
-    return function (_x7, _x8, _x9, _x10) {
-      return _ref13.apply(this, arguments);
-    };
-  }());
-  var actionDeleteRef = (0, _.useRefFunction)( /*#__PURE__*/function () {
-    var _ref15 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee9(recordKey, editRow) {
-      var _props$onDelete2;
-      var actionProps, res;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
-          case 0:
-            actionProps = {
-              data: props.dataSource,
-              getRowKey: props.getRowKey,
-              row: editRow,
-              key: recordKey,
-              childrenColumnName: props.childrenColumnName || 'children'
-            };
-            _context9.next = 3;
-            return props === null || props === void 0 || (_props$onDelete2 = props.onDelete) === null || _props$onDelete2 === void 0 ? void 0 : _props$onDelete2.call(props, recordKey, editRow);
-          case 3:
-            res = _context9.sent;
-            if (!(res === false)) {
-              _context9.next = 6;
-              break;
-            }
-            return _context9.abrupt("return", false);
-          case 6:
-            _context9.next = 8;
-            return cancelEditable(recordKey, false);
-          case 8:
-            props.setDataSource(editableRowByKey(actionProps, 'delete'));
-            return _context9.abrupt("return", res);
-          case 10:
-          case "end":
-            return _context9.stop();
-        }
-      }, _callee9);
-    }));
-    return function (_x11, _x12) {
-      return _ref15.apply(this, arguments);
-    };
-  }());
-  var actionCancelRef = (0, _.useRefFunction)( /*#__PURE__*/function () {
-    var _ref16 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee10(recordKey, editRow, originRow, newLine) {
-      var _props$onCancel;
-      var res;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
-          case 0:
-            _context10.next = 2;
-            return props === null || props === void 0 || (_props$onCancel = props.onCancel) === null || _props$onCancel === void 0 ? void 0 : _props$onCancel.call(props, recordKey, editRow, originRow, newLine);
-          case 2:
-            res = _context10.sent;
-            return _context10.abrupt("return", res);
-          case 4:
-          case "end":
-            return _context10.stop();
-        }
-      }, _callee10);
-    }));
-    return function (_x13, _x14, _x15, _x16) {
-      return _ref16.apply(this, arguments);
+    // 保存时解除编辑模式，统一在这里调用一次
+    await cancelEditable(recordKey);
+    const recordKeyStr = recordKeyToString(recordKey)?.toString();
+    if (recordKeyStr) {
+      preEditRowRefs.current.delete(recordKeyStr);
+    }
+    return res;
+  });
+  const actionDeleteRef = (0, _.useRefFunction)(async (recordKey, editRow) => {
+    const actionProps = {
+      data: props.dataSource,
+      getRowKey: props.getRowKey,
+      row: editRow,
+      key: recordKey,
+      childrenColumnName: props.childrenColumnName || 'children'
     };
-  }());
+    const res = await props?.onDelete?.(recordKey, editRow);
+    // 如果 onDelete 返回 false，阻止删除操作
+    if (res === false) {
+      return false;
+    }
+    // 不传递 false时，重新form.setFieldsValue同一份静态数据，会导致该行始终处于不可编辑状态
+    await cancelEditable(recordKey, false);
+    props.setDataSource(editableRowByKey(actionProps, 'delete'));
+    const recordKeyStr = recordKeyToString(recordKey)?.toString();
+    if (recordKeyStr) {
+      preEditRowRefs.current.delete(recordKeyStr);
+    }
+    return res;
+  });
+  const actionCancelRef = (0, _.useRefFunction)(async (recordKey, editRow, originRow, newLine) => {
+    const res = await props?.onCancel?.(recordKey, editRow, originRow, newLine);
+    return res;
+  });
 
   // 如果传入了自定义的actionRender，使用useRefFunction以确保内部的事件处理函数可以访问最新的state
-  var existCustomActionRender = props.actionRender && typeof props.actionRender === 'function';
-  var customActionRender = existCustomActionRender ? props.actionRender : function () {};
-  var customActionRenderRef = (0, _.useRefFunction)(customActionRender);
-  var actionRender = function actionRender(row) {
-    var key = props.getRowKey(row, row.index);
-    var config = {
-      saveText: saveText,
-      cancelText: cancelText,
-      deleteText: deleteText,
-      addEditRecord: addEditRecord,
+  const existCustomActionRender = props.actionRender && typeof props.actionRender === 'function';
+  const customActionRender = existCustomActionRender ? props.actionRender : () => {};
+  const customActionRenderRef = (0, _.useRefFunction)(customActionRender);
+  const actionRender = row => {
+    const key = props.getRowKey(row, row.index);
+    const config = {
+      saveText,
+      cancelText,
+      deleteText,
+      addEditRecord,
       recordKey: key,
-      cancelEditable: cancelEditable,
+      cancelEditable,
       index: row.index,
       tableName: props.tableName,
       newLineConfig: newLineRecordCache,
       onCancel: actionCancelRef,
       onDelete: actionDeleteRef,
       onSave: actionSaveRef,
-      editableKeys: editableKeys,
-      setEditableRowKeys: setEditableRowKeys,
-      preEditRowRef: preEditRowRef,
-      deletePopconfirmMessage: props.deletePopconfirmMessage || "".concat(intl.getMessage('deleteThisLine', '删除此项'), "?")
+      editableKeys,
+      setEditableRowKeys,
+      preEditRowRef,
+      preEditRowRefs,
+      deletePopconfirmMessage: props.deletePopconfirmMessage || `${intl.getMessage('deleteThisLine', '删除此项')}?`
     };
-    var renderResult = defaultActionRender(row, config);
+    const renderResult = defaultActionRender(row, config);
     // 缓存一下saveRef
     if (props.tableName) {
       saveRefsMap.current.set(dataSourceKeyIndexMapRef.current.get(recordKeyToString(key)) || recordKeyToString(key), renderResult.saveRef);
@@ -1132,17 +979,17 @@ function useEditableArray(props) {
     return [renderResult.save, renderResult.delete, renderResult.cancel];
   };
   return {
-    editableKeys: editableKeys,
-    setEditableRowKeys: setEditableRowKeys,
-    isEditable: isEditable,
-    actionRender: actionRender,
-    startEditable: startEditable,
-    cancelEditable: cancelEditable,
-    addEditRecord: addEditRecord,
-    saveEditable: saveEditable,
+    editableKeys,
+    setEditableRowKeys,
+    isEditable,
+    actionRender,
+    startEditable,
+    cancelEditable,
+    addEditRecord,
+    saveEditable,
     newLineRecord: newLineRecordCache,
     preEditableKeys: editableKeysRef,
-    onValuesChange: onValuesChange,
+    onValuesChange,
     getRealIndex: props.getRealIndex
   };
 }