@ant-design/pro-components 3.0.1-0 → 3.1.0-0

package/lib/utils/useEditableArray/index.js

@@ -18,7 +18,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 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 _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+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");
@@ -34,7 +34,7 @@ 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"],
+  _excluded2 = ["map_row_parentKey", "map_row_key", "isNewRecord"],
   _excluded3 = ["map_row_key"];
 /* eslint-disable react-hooks/exhaustive-deps */
 var noteOnce = _util.warning.noteOnce;
@@ -50,11 +50,132 @@ var recordKeyToString = exports.recordKeyToString = function recordKeyToString(r
   if (Array.isArray(rowKey)) return rowKey.join(',');
   return rowKey;
 };
+/**
+ * 扁平化记录树结构为 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;
+    if (hasChildren) {
+      var children = record[childrenColumnName] || [];
+      var childrenMap = flattenRecordsToMap(children, getRowKey, childrenColumnName, recordKey, eachIndex);
+      childrenMap.forEach(function (value, key) {
+        return kvMap.set(key, value);
+      });
+    }
+    var newRecord = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, record), {}, {
+      map_row_key: recordKey,
+      map_row_parentKey: parentKey
+    });
+    delete newRecord.children;
+    if (!parentKey) {
+      delete newRecord.map_row_parentKey;
+    }
+    kvMap.set(recordKey, newRecord);
+  });
+  return kvMap;
+}
+
+/**
+ * 重建树结构
+ */
+function rebuildTreeStructure(map, childrenColumnName, action) {
+  var childrenMap = new Map();
+  var result = [];
+  var addNewRecordToChildren = function addNewRecordToChildren(fillChildren) {
+    map.forEach(function (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);
+        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);
+        }
+      }
+    });
+  };
+  addNewRecordToChildren(action === 'top');
+
+  // 第一步：将所有有 parentKey 的节点添加到 childrenMap
+  // 这一步不获取 children，只是添加节点到对应的父节点下
+  map.forEach(function (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
+      });
+      // 确保 parentKey 的类型转换与 flattenRecordsToMap 中的 recordKey 一致
+      // 在 flattenRecordsToMap 中，recordKey 被转换为字符串：getRowKey(record, eachIndex).toString()
+      // 所以这里也需要确保 parentKey 被转换为字符串，并且类型一致
+      var parentKeyStr = map_row_parentKey != null ? String(map_row_parentKey) : null;
+      if (!parentKeyStr) {
+        return;
+      }
+      if (!childrenMap.has(parentKeyStr)) {
+        childrenMap.set(parentKeyStr, []);
+      }
+
+      // 如果是新记录且 action 为 'top'，添加到数组开头；否则添加到末尾
+      if (isNewRecord && action === 'top') {
+        var _childrenMap$get2;
+        (_childrenMap$get2 = childrenMap.get(parentKeyStr)) === null || _childrenMap$get2 === void 0 || _childrenMap$get2.unshift(_record);
+      } else {
+        var _childrenMap$get3;
+        (_childrenMap$get3 = childrenMap.get(parentKeyStr)) === null || _childrenMap$get3 === void 0 || _childrenMap$get3.push(_record);
+      }
+    }
+  });
+
+  // 第二步：为所有节点获取 children
+  // 这一步确保所有子节点都已经被添加到 childrenMap，所以可以正确获取 children
+  map.forEach(function (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;
+      if (!parentKeyStr) {
+        return;
+      }
+      var children = childrenMap.get(parentKeyStr);
+      if (children && children.length > 0) {
+        // 找到对应的 record 并添加 children
+        var recordIndex = children.findIndex(function (r) {
+          // 比较时需要确保类型一致
+          var 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)));
+        }
+      }
+    }
+  });
+  addNewRecordToChildren(action === 'update');
+  map.forEach(function (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);
+    }
+  });
+  return result;
+}
+
 /**
  * 使用map 来删除数据，性能一般 但是准确率比较高
- *
- * @param keyProps
- * @param action
  */
 function editableRowByKey(keyProps, action) {
   var _recordKeyToString;
@@ -64,95 +185,25 @@ function editableRowByKey(keyProps, action) {
     _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 = new Map();
-
-  /**
-   * 打平这个数组
-   *
-   * @param records
-   * @param parentKey
-   */
-  function dig(records, map_row_parentKey, map_row_index) {
-    records.forEach(function (record, index) {
-      var eachIndex = (map_row_index || 0) * 10 + index;
-      var recordKey = getRowKey(record, eachIndex).toString();
-      // children 取在前面方便拼的时候按照反顺序放回去
-      if (record && (0, _typeof2.default)(record) === 'object' && childrenColumnName in record) {
-        dig(record[childrenColumnName] || [], recordKey, eachIndex);
-      }
-      var newRecord = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, record), {}, {
-        map_row_key: recordKey,
-        children: undefined,
-        map_row_parentKey: map_row_parentKey
-      });
-      delete newRecord.children;
-      if (!map_row_parentKey) {
-        delete newRecord.map_row_parentKey;
-      }
-      kvMap.set(recordKey, newRecord);
-    });
-  }
-  if (action === 'top') {
-    kvMap.set(key, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, kvMap.get(key)), row));
-  }
-  dig(data);
-  if (action === 'update') {
-    kvMap.set(key, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, kvMap.get(key)), row));
-  }
+  var kvMap = flattenRecordsToMap(data, getRowKey, childrenColumnName);
   if (action === 'delete') {
     kvMap.delete(key);
+  } else if (action === 'top' || action === 'update') {
+    var existingRecord = kvMap.get(key);
+    if (existingRecord) {
+      kvMap.set(key, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, existingRecord), row));
+    } else {
+      // 如果记录不存在，创建一个新记录（用于新增场景）
+      // 保留 map_row_parentKey 以便正确处理嵌套子节点
+      // 添加标记以便在 rebuildTreeStructure 中识别新记录
+      kvMap.set(key, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, row), {}, {
+        map_row_key: key,
+        map_row_parentKey: row.map_row_parentKey,
+        isNewRecord: true
+      }));
+    }
   }
-  var fill = function fill(map) {
-    var kvArrayMap = new Map();
-    var kvSource = [];
-    var fillNewRecord = function fillNewRecord() {
-      var fillChildren = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-      map.forEach(function (value) {
-        if (value.map_row_parentKey && !value.map_row_key) {
-          var map_row_parentKey = value.map_row_parentKey,
-            rest = (0, _objectWithoutProperties2.default)(value, _excluded);
-          if (!kvArrayMap.has(map_row_parentKey)) {
-            kvArrayMap.set(map_row_parentKey, []);
-          }
-          if (fillChildren) {
-            var _kvArrayMap$get;
-            (_kvArrayMap$get = kvArrayMap.get(map_row_parentKey)) === null || _kvArrayMap$get === void 0 || _kvArrayMap$get.push(rest);
-          }
-        }
-      });
-    };
-    fillNewRecord(action === 'top');
-    map.forEach(function (value) {
-      if (value.map_row_parentKey && value.map_row_key) {
-        var _kvArrayMap$get2;
-        var map_row_parentKey = value.map_row_parentKey,
-          map_row_key = value.map_row_key,
-          rest = (0, _objectWithoutProperties2.default)(value, _excluded2);
-        if (kvArrayMap.has(map_row_key)) {
-          rest[childrenColumnName] = kvArrayMap.get(map_row_key);
-        }
-        if (!kvArrayMap.has(map_row_parentKey)) {
-          kvArrayMap.set(map_row_parentKey, []);
-        }
-        (_kvArrayMap$get2 = kvArrayMap.get(map_row_parentKey)) === null || _kvArrayMap$get2 === void 0 || _kvArrayMap$get2.push(rest);
-      }
-    });
-    fillNewRecord(action === 'update');
-    map.forEach(function (value) {
-      if (!value.map_row_parentKey) {
-        var map_row_key = value.map_row_key,
-          rest = (0, _objectWithoutProperties2.default)(value, _excluded3);
-        if (map_row_key && kvArrayMap.has(map_row_key)) {
-          var item = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, rest), {}, (0, _defineProperty2.default)({}, childrenColumnName, kvArrayMap.get(map_row_key)));
-          kvSource.push(item);
-          return;
-        }
-        kvSource.push(rest);
-      }
-    });
-    return kvSource;
-  };
-  return fill(kvMap);
+  return rebuildTreeStructure(kvMap, childrenColumnName, action);
 }
 
 /**
@@ -160,14 +211,14 @@ function editableRowByKey(keyProps, action) {
  *
  * @param ActionRenderConfig
  */
-function SaveEditableAction(_ref, ref) {
-  var recordKey = _ref.recordKey,
-    onSave = _ref.onSave,
-    row = _ref.row,
-    children = _ref.children,
-    newLineConfig = _ref.newLineConfig,
-    editorType = _ref.editorType,
-    tableName = _ref.tableName;
+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),
@@ -186,11 +237,24 @@ function SaveEditableAction(_ref, ref) {
             return key === null || key === void 0 ? void 0 : key.toString();
           }).flat(1).filter(Boolean);
           setLoading(true);
-          _context.next = 6;
+          _context.prev = 4;
+          _context.next = 7;
           return form.validateFields(namePath, {
             recursive: true
           });
-        case 6:
+        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
@@ -199,25 +263,25 @@ function SaveEditableAction(_ref, ref) {
             (0, _util.set)(fields, recordKeyPath, curValue);
           }
           data = isMapEditor ? (0, _util.set)({}, namePath, fields) : fields; // 获取数据并保存
-          _context.next = 11;
+          _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 11:
+        case 18:
           res = _context.sent;
           setLoading(false);
           return _context.abrupt("return", res);
-        case 16:
-          _context.prev = 16;
-          _context.t0 = _context["catch"](0);
+        case 23:
+          _context.prev = 23;
+          _context.t1 = _context["catch"](0);
           setLoading(false);
-          throw _context.t0;
-        case 20:
+          throw _context.t1;
+        case 27:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0, 16]]);
+    }, _callee, null, [[0, 23], [4, 9]]);
   })));
 
   // 保存数据
@@ -228,7 +292,7 @@ function SaveEditableAction(_ref, ref) {
   }, [save]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("a", {
     onClick: ( /*#__PURE__*/function () {
-      var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(e) {
+      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:
@@ -250,7 +314,7 @@ function SaveEditableAction(_ref, ref) {
         }, _callee2, null, [[2, 7]]);
       }));
       return function (_x) {
-        return _ref3.apply(this, arguments);
+        return _ref5.apply(this, arguments);
       };
     }()),
     children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.LoadingOutlined, {
@@ -265,20 +329,20 @@ function SaveEditableAction(_ref, ref) {
  *
  * @param ActionRenderConfig
  */
-var DeleteEditableAction = exports.DeleteEditableAction = function DeleteEditableAction(_ref4) {
-  var recordKey = _ref4.recordKey,
-    onDelete = _ref4.onDelete,
-    preEditRowRef = _ref4.preEditRowRef,
-    row = _ref4.row,
-    children = _ref4.children,
-    deletePopconfirmMessage = _ref4.deletePopconfirmMessage;
+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 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) {
@@ -290,26 +354,34 @@ var DeleteEditableAction = exports.DeleteEditableAction = function DeleteEditabl
         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 9:
-          _context3.prev = 9;
+        case 11:
+          _context3.prev = 11;
           _context3.t0 = _context3["catch"](0);
           setLoading(false);
           return _context3.abrupt("return", null);
-        case 13:
-          _context3.prev = 13;
+        case 15:
+          _context3.prev = 15;
           if (preEditRowRef) preEditRowRef.current = null;
-          return _context3.finish(13);
-        case 16:
+          return _context3.finish(15);
+        case 18:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[0, 9, 13, 16]]);
+    }, _callee3, null, [[0, 11, 15, 18]]);
   })));
   return children !== false ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Popconfirm, {
-    title: deletePopconfirmMessage,
-    onConfirm: function onConfirm() {
-      return _onConfirm();
+    title: deletePopconfirmMessage || '确定要删除这条记录吗？',
+    onConfirm: onConfirm,
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentElement || document.body;
     },
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("a", {
       children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.LoadingOutlined, {
@@ -334,7 +406,7 @@ var CancelEditableAction = function CancelEditableAction(props) {
   var form = _antd.Form.useFormInstance();
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
     onClick: ( /*#__PURE__*/function () {
-      var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4(e) {
+      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) {
@@ -373,7 +445,7 @@ var CancelEditableAction = function CancelEditableAction(props) {
         }, _callee4);
       }));
       return function (_x2) {
-        return _ref6.apply(this, arguments);
+        return _ref8.apply(this, arguments);
       };
     }()),
     children: cancelText || '取消'
@@ -387,17 +459,17 @@ function defaultActionRender(row, config) {
   var SaveEditableActionRef = /*#__PURE__*/(0, _react.forwardRef)(SaveEditableAction);
   var saveRef = /*#__PURE__*/(0, _react.createRef)();
   return {
-    save: /*#__PURE__*/(0, _jsxRuntime.jsx)(SaveEditableActionRef, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, config), {}, {
+    save: /*#__PURE__*/(0, _jsxRuntime.jsx)(SaveEditableActionRef, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, 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, _objectSpread3.default)((0, _objectSpread3.default)({}, config), {}, {
+    delete: (newLineConfig === null || newLineConfig === void 0 ? void 0 : newLineConfig.options.recordKey) !== recordKey ? /*#__PURE__*/(0, _jsxRuntime.jsx)(DeleteEditableAction, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, config), {}, {
       row: row,
       children: deleteText
     }), 'delete' + recordKey) : undefined,
-    cancel: /*#__PURE__*/(0, _jsxRuntime.jsx)(CancelEditableAction, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, config), {}, {
+    cancel: /*#__PURE__*/(0, _jsxRuntime.jsx)(CancelEditableAction, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, config), {}, {
       row: row
     }), 'cancel' + recordKey)
   };
@@ -420,30 +492,39 @@ function useEditableArray(props) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     newLineRecordCache = _useState2[0],
     setNewLineRecordCache = _useState2[1];
-  var resetMapRef = function resetMapRef() {
+
+  /**
+   * 构建数据源 key 索引映射表
+   */
+  var buildDataSourceKeyIndexMap = (0, _.useRefFunction)(function () {
     var map = new Map();
-    //存在children时会覆盖Map的key,导致使用数组索引查找key错误
-    var loopGetKey = function loopGetKey(dataSource, parentKey) {
-      dataSource === null || dataSource === void 0 || dataSource.forEach(function (record, index) {
-        var _recordKeyToString2;
-        var key = parentKey === undefined || parentKey === null ? index.toString() : parentKey + '_' + index.toString();
-        map.set(key, recordKeyToString(props.getRowKey(record, -1)));
-        map.set((_recordKeyToString2 = recordKeyToString(props.getRowKey(record, -1))) === null || _recordKeyToString2 === void 0 ? void 0 : _recordKeyToString2.toString(), key);
-        if (props.childrenColumnName && record !== null && record !== void 0 && record[props.childrenColumnName]) {
-          loopGetKey(record[props.childrenColumnName], key);
+    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));
+
+        // 如果 recordKey 是 undefined 或 null，跳过
+        if (recordKey == null) {
+          return;
+        }
+        map.set(indexKey, recordKey);
+        map.set(recordKey.toString(), indexKey);
+        var children = props.childrenColumnName && (record === null || record === void 0 ? void 0 : record[props.childrenColumnName]);
+        if (children) {
+          traverseRecords(children, indexKey);
         }
       });
     };
-    loopGetKey(props.dataSource);
+    traverseRecords(props.dataSource);
     return map;
-  };
+  });
   var initDataSourceKeyIndexMap = (0, _react.useMemo)(function () {
-    return resetMapRef();
+    return buildDataSourceKeyIndexMap();
   }, []);
   var dataSourceKeyIndexMapRef = (0, _react.useRef)(initDataSourceKeyIndexMap);
   var newLineRecordRef = (0, _react.useRef)(undefined);
   (0, _useDeepCompareEffect.useDeepCompareEffectDebounce)(function () {
-    dataSourceKeyIndexMapRef.current = resetMapRef();
+    dataSourceKeyIndexMapRef.current = buildDataSourceKeyIndexMap();
   }, [props.dataSource]);
 
   // 这里这么做是为了存上次的状态，不然每次存一下再拿
@@ -470,96 +551,205 @@ function useEditableArray(props) {
     _useMergedState2 = (0, _slicedToArray2.default)(_useMergedState, 2),
     editableKeys = _useMergedState2[0],
     setEditableRowKeys = _useMergedState2[1];
-
-  /** 一个用来标志的set 提供了方便的 api 来去重什么的 */
-  var editableKeysSet = (0, _react.useMemo)(function () {
-    var keys = editableType === 'single' ? editableKeys === null || editableKeys === void 0 ? void 0 : editableKeys.slice(0, 1) : editableKeys;
-    return new Set(keys);
-  }, [(editableKeys || []).join(','), editableType]);
   var editableKeysRef = (0, _usePrevious.usePrevious)(editableKeys);
 
+  /**
+   * 检查 key 是否在编辑列表中
+   */
+  var checkKeyInEditableList = (0, _.useRefFunction)(function (key, keysList) {
+    return keysList.includes(key);
+  });
+
   /** 这行是不是编辑状态 */
   var isEditable = (0, _.useRefFunction)(function (row) {
-    var _props$getRowKey, _props$getRowKey$toSt, _props$getRowKey2, _props$getRowKey2$toS;
-    // 为了兼容一下name 模式的 indexKey，所以需要判断两次，一次是index，一次是没有 index 的
-    var recordKeyOrIndex = (_props$getRowKey = props.getRowKey(row, row.index)) === null || _props$getRowKey === void 0 || (_props$getRowKey$toSt = _props$getRowKey.toString) === null || _props$getRowKey$toSt === void 0 ? void 0 : _props$getRowKey$toSt.call(_props$getRowKey);
-    // 这里是不设置 index 的地方
-    var recordKey = (_props$getRowKey2 = props.getRowKey(row, -1)) === null || _props$getRowKey2 === void 0 || (_props$getRowKey2$toS = _props$getRowKey2.toString) === null || _props$getRowKey2$toS === void 0 ? void 0 : _props$getRowKey2$toS.call(_props$getRowKey2);
-
-    // 都转化为了字符串，不然 number 和 string
-    var stringEditableKeys = editableKeys === null || editableKeys === void 0 ? void 0 : editableKeys.map(function (key) {
+    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 = props.tableName && !!(stringEditableKeysRef !== null && stringEditableKeysRef !== void 0 && stringEditableKeysRef.includes(recordKey)) || !!(stringEditableKeysRef !== null && stringEditableKeysRef !== void 0 && stringEditableKeysRef.includes(recordKeyOrIndex));
+    var preIsEditable = checkKeyInEditableList(recordKey, stringEditableKeysRef) || checkKeyInEditableList(recordKeyWithIndex, stringEditableKeysRef);
     return {
       recordKey: recordKey,
-      isEditable: props.tableName && (stringEditableKeys === null || stringEditableKeys === void 0 ? void 0 : stringEditableKeys.includes(recordKey)) || (stringEditableKeys === null || stringEditableKeys === void 0 ? void 0 : stringEditableKeys.includes(recordKeyOrIndex)),
+      isEditable: checkKeyInEditableList(recordKey, stringEditableKeys) || checkKeyInEditableList(recordKeyWithIndex, stringEditableKeys),
       preIsEditable: preIsEditable
     };
   });
 
   /**
-   * 进入编辑状态
-   *
-   * @param recordKey
+   * 验证是否可以开始编辑
    */
-  var startEditable = (0, _.useRefFunction)(function (recordKey, record) {
-    var _ref7, _props$dataSource;
-    // 如果是单行的话，不允许多行编辑
-    if (editableKeysSet.size > 0 && editableType === 'single' && props.onlyOneLineEditorAlertMessage !== false) {
+  var validateCanStartEdit = (0, _.useRefFunction)(function () {
+    var hasEditableKeys = editableKeys && editableKeys.length > 0;
+    if (hasEditableKeys && editableType === 'single' && props.onlyOneLineEditorAlertMessage !== false) {
       warning(props.onlyOneLineEditorAlertMessage || intl.getMessage('editableTable.onlyOneLineEditor', '只能同时编辑一行'));
       return false;
     }
-    editableKeysSet.add(recordKey);
-    setEditableRowKeys(Array.from(editableKeysSet));
+    return true;
+  });
 
-    // 这里是为了存上次的状态,不然取消的时候就丢掉了
-    preEditRowRef.current = (_ref7 = record !== null && record !== void 0 ? record : (_props$dataSource = props.dataSource) === null || _props$dataSource === void 0 ? void 0 : _props$dataSource.find(function (recordData, index) {
+  /**
+   * 查找记录
+   */
+  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) {
       return props.getRowKey(recordData, index) === recordKey;
-    })) !== null && _ref7 !== void 0 ? _ref7 : null;
+    })) !== null && _props$dataSource$fin !== void 0 ? _props$dataSource$fin : null;
+  });
+
+  /**
+   * 进入编辑状态
+   */
+  var startEditable = (0, _.useRefFunction)(function (recordKey, record) {
+    var _ref9;
+    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());
+    });
+    if (!isAlreadyEditable) {
+      var newKeys = editableKeys ? [].concat((0, _toConsumableArray2.default)(editableKeys), [recordKey]) : [recordKey];
+      setEditableRowKeys(newKeys);
+    }
+    preEditRowRef.current = (_ref9 = record !== null && record !== void 0 ? record : findRecordByKey(recordKey)) !== null && _ref9 !== void 0 ? _ref9 : null;
     return true;
   });
 
+  /**
+   * 清理编辑状态
+   */
+  var clearEditableState = (0, _.useRefFunction)(function (recordKey) {
+    var _editableKeys$filter;
+    var relayKey = recordKeyToString(recordKey);
+    var 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 : [];
+    setEditableRowKeys(newKeys);
+  });
+
   /**
    * 退出编辑状态
-   *
-   * @param recordKey
    */
   var cancelEditable = (0, _.useRefFunction)( /*#__PURE__*/function () {
-    var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5(recordKey, needReTry) {
-      var relayKey, key;
+    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).toString();
-            key = dataSourceKeyIndexMapRef.current.get(relayKey);
-            /** 如果没找到key，转化一下再去找 */
-            if (!(!editableKeysSet.has(relayKey) && key && (needReTry !== null && needReTry !== void 0 ? needReTry : true) && props.tableName)) {
-              _context5.next = 5;
+            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;
             }
-            cancelEditable(key, false);
-            return _context5.abrupt("return");
-          case 5:
-            /** 如果这个是 new Line 直接删除 */
-            if (newLineRecordCache && newLineRecordCache.options.recordKey === recordKey) {
-              setNewLineRecordCache(undefined);
+            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);
+              }
+            }
+
+            // 先清理 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]]);
+
+                        // 然后使用 setFieldsValue 清除字段值
+                        // 这样可以确保字段被完全清除，表格重新渲染时不会显示输入框
+                        _form.setFieldsValue((0, _defineProperty2.default)({}, recordKeyStr, undefined));
+                      } catch (error) {
+                        // 如果清除失败，忽略错误
+                        console.warn('Failed to clear form fields in cancelEditable:', error);
+                      }
+                    }
+                  }
+                }
+              } catch (error) {
+                // 如果访问 form 失败，忽略错误
+                console.warn('Failed to reset form fields in cancelEditable:', error);
+              }
+              preEditRowRef.current = null;
             }
-            editableKeysSet.delete(relayKey);
-            editableKeysSet.delete(recordKeyToString(recordKey));
-            setEditableRowKeys(Array.from(editableKeysSet));
+
+            // 最后清除编辑状态，这样表格会重新渲染，输入框会消失
+            clearEditableState(recordKey);
             return _context5.abrupt("return", true);
-          case 10:
+          case 29:
           case "end":
             return _context5.stop();
         }
-      }, _callee5);
+      }, _callee5, null, [[16, 21]]);
     }));
     return function (_x3, _x4) {
-      return _ref8.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }());
   var propsOnValuesChange = (0, _.useDebounceFn)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee6() {
@@ -582,149 +772,199 @@ function useEditableArray(props) {
       }
     }, _callee6);
   })), 64);
-  var onValuesChange = (0, _.useRefFunction)(function (value, values) {
-    var _Object$keys$pop;
-    if (!props.onValuesChange) {
-      return;
-    }
-    var dataSource = props.dataSource;
 
-    // 这里是把正在编辑中的所有表单数据都修改掉
-    // 不然会用 props 里面的 dataSource，数据只有正在编辑中的
-    // Object.keys(get(values, [props.tableName || ''].flat(1)) || values).forEach((recordKey) => {
+  /**
+   * 构建表单字段路径
+   */
+  var buildFormFieldPath = (0, _.useRefFunction)(function (recordKey) {
+    return [props.tableName || '', recordKey].flat(1).filter(function (key) {
+      return 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) return;
+      if ((newLineRecordCache === null || newLineRecordCache === void 0 ? void 0 : newLineRecordCache.options.recordKey) === eachRecordKey) {
+        return;
+      }
       var recordKey = eachRecordKey.toString();
-      // 如果数据在这个 form 中没有展示，也不显示
-      var editRow = (0, _util.get)(values, [props.tableName || '', recordKey].flat(1).filter(function (key) {
-        return key || key === 0;
-      }));
-      if (!editRow) return;
-      dataSource = editableRowByKey({
-        data: dataSource,
+      var fieldPath = buildFormFieldPath(recordKey);
+      var editRow = (0, _util.get)(values, fieldPath);
+      if (!editRow) {
+        return;
+      }
+      updatedDataSource = editableRowByKey({
+        data: updatedDataSource,
         getRowKey: props.getRowKey,
         row: editRow,
         key: recordKey,
         childrenColumnName: props.childrenColumnName || 'children'
       }, 'update');
     });
-    var relayValue = value;
-    var recordKey = (_Object$keys$pop = Object.keys(relayValue || {}).pop()) === null || _Object$keys$pop === void 0 ? void 0 : _Object$keys$pop.toString();
+    return updatedDataSource;
+  });
 
-    //从form 和 cache 中取得数据
-    var newLineRecordData = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, newLineRecordCache === null || newLineRecordCache === void 0 ? void 0 : newLineRecordCache.defaultValue), (0, _util.get)(values, [props.tableName || '', recordKey.toString()].flat(1).filter(function (key) {
-      return key || key === 0;
-    })));
-
-    /** 如果已经在 dataSource 中存在了，直接 find */
-    var editRow = dataSourceKeyIndexMapRef.current.has(recordKeyToString(recordKey)) ? 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();
-      return key === recordKey;
-    }) : newLineRecordData;
-    propsOnValuesChange.run(editRow || newLineRecordData, dataSource);
+  /**
+   * 获取当前编辑的行数据
+   */
+  var getCurrentEditRow = (0, _.useRefFunction)(function (value, values, dataSource) {
+    var _valueKeys$pop;
+    var valueKeys = Object.keys(value || {});
+    if (valueKeys.length === 0) {
+      return (newLineRecordCache === null || newLineRecordCache === void 0 ? void 0 : newLineRecordCache.defaultValue) || {};
+    }
+    var recordKey = ((_valueKeys$pop = valueKeys.pop()) === null || _valueKeys$pop === void 0 ? void 0 : _valueKeys$pop.toString()) || '';
+    if (!recordKey) {
+      return (newLineRecordCache === null || newLineRecordCache === void 0 ? void 0 : 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));
+    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();
+        return key === recordKey;
+      });
+      return foundRow || newLineRecordData;
+    }
+    return newLineRecordData;
+  });
+  var onValuesChange = (0, _.useRefFunction)(function (value, values) {
+    if (!props.onValuesChange) {
+      return;
+    }
+    var updatedDataSource = updateDataSourceWithEditableRows(props.dataSource, values);
+    var 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)) {
+      if (!editableKeysSet.has(key === null || key === void 0 ? void 0 : key.toString())) {
         saveRefsMap.current.delete(key);
       }
     });
-  }, [saveRefsMap, editableKeysSet]);
+  }, [editableKeys]);
+
+  /**
+   * 获取保存引用
+   */
+  var getSaveRef = (0, _.useRefFunction)(function (recordKey) {
+    var relayKey = recordKeyToString(recordKey);
+    return saveRefsMap.current.get(relayKey) || saveRefsMap.current.get(relayKey.toString());
+  });
+
   /**
    * 保存编辑行
-   *
-   * @param recordKey
-   * @param needReTry
    */
   var saveEditable = (0, _.useRefFunction)( /*#__PURE__*/function () {
-    var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee7(recordKey, needReTry) {
-      var relayKey, key, saveRef, _saveRef$current;
+    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);
-            key = dataSourceKeyIndexMapRef.current.get(recordKey.toString());
-            /** 如果没找到key，转化一下再去找 */
-            if (!(!editableKeysSet.has(relayKey) && key && (needReTry !== null && needReTry !== void 0 ? needReTry : true) && props.tableName)) {
-              _context7.next = 6;
+            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 = 5;
-            return saveEditable(key, false);
-          case 5:
+            _context7.next = 7;
+            return saveEditable(mappedKey, false);
+          case 7:
             return _context7.abrupt("return", _context7.sent);
-          case 6:
-            saveRef = saveRefsMap.current.get(relayKey) || saveRefsMap.current.get(relayKey.toString());
-            _context7.prev = 7;
-            _context7.next = 10;
-            return saveRef === null || saveRef === void 0 || (_saveRef$current = saveRef.current) === null || _saveRef$current === void 0 ? void 0 : _saveRef$current.save();
-          case 10:
-            _context7.next = 15;
-            break;
-          case 12:
-            _context7.prev = 12;
-            _context7.t0 = _context7["catch"](7);
+          case 8:
+            saveRef = getSaveRef(recordKey);
+            if (saveRef !== null && saveRef !== void 0 && saveRef.current) {
+              _context7.next = 11;
+              break;
+            }
             return _context7.abrupt("return", false);
-          case 15:
-            editableKeysSet.delete(relayKey);
-            editableKeysSet.delete(relayKey.toString());
-            setEditableRowKeys(Array.from(editableKeysSet));
+          case 11:
+            _context7.next = 13;
+            return saveRef.current.save();
+          case 13:
+            clearEditableState(recordKey);
             return _context7.abrupt("return", true);
-          case 19:
+          case 15:
           case "end":
             return _context7.stop();
         }
-      }, _callee7, null, [[7, 12]]);
+      }, _callee7);
     }));
     return function (_x5, _x6) {
-      return _ref10.apply(this, arguments);
+      return _ref12.apply(this, arguments);
     };
   }());
 
   /**
-   * 同时只能支持一行,取消之后数据消息，不会触发 dataSource
-   *
-   * @param row
-   * @param options
-   * @name 增加新的行
+   * 验证是否可以新增记录
    */
-  var addEditRecord = (0, _.useRefFunction)(function (row, options) {
+  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);
       return false;
     }
-    // 暂时不支持多行新增
     if (newLineRecordRef.current && props.onlyAddOneLineAlertMessage !== false) {
       warning(props.onlyAddOneLineAlertMessage || intl.getMessage('editableTable.onlyAddOneLine', '只能新增一行'));
       return false;
     }
-    // 如果是单行的话，不允许多行编辑
-    if (editableKeysSet.size > 0 && editableType === 'single' && props.onlyOneLineEditorAlertMessage !== false) {
-      warning(props.onlyOneLineEditorAlertMessage || intl.getMessage('editableTable.onlyOneLineEditor', '只能同时编辑一行'));
+    if (!validateCanStartEdit()) {
       return false;
     }
-    // 防止多次渲染
-    var recordKey = props.getRowKey(row, -1);
-    if (!recordKey && recordKey !== 0) {
-      noteOnce(!!recordKey, '请设置 recordCreatorProps.record 并返回一个唯一的key  \n  https://procomponents.ant.design/components/editable-table#editable-%E6%96%B0%E5%BB%BA%E8%A1%8C');
+    return true;
+  });
+
+  /**
+   * 验证记录 key 是否有效
+   */
+  var validateRecordKey = (0, _.useRefFunction)(function (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');
     }
-    editableKeysSet.add(recordKey);
-    setEditableRowKeys(Array.from(editableKeysSet));
-
-    // 如果是dataSource 新增模式的话，取消再开始编辑，
-    // 这样就可以把新增到 dataSource的数据进入编辑模式了
-    // [a,b,cache] => [a,b,c]
-    if ((options === null || options === void 0 ? void 0 : options.newRecordType) === 'dataSource' || props.tableName) {
-      var _recordKeyToString3;
+  });
+
+  /**
+   * 增加新的行
+   */
+  var addEditRecord = (0, _.useRefFunction)(function (row, options) {
+    if (!validateCanAddRecord(options)) {
+      return false;
+    }
+    var 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());
+    });
+    if (!isAlreadyEditable) {
+      var newKeys = editableKeys ? [].concat((0, _toConsumableArray2.default)(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';
+    if (isDataSourceMode) {
+      var _recordKeyToString4;
       var actionProps = {
         data: props.dataSource,
         getRowKey: props.getRowKey,
-        row: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, row), {}, {
-          map_row_parentKey: options !== null && options !== void 0 && options.parentKey ? (_recordKeyToString3 = recordKeyToString(options === null || options === void 0 ? void 0 : options.parentKey)) === null || _recordKeyToString3 === void 0 ? void 0 : _recordKeyToString3.toString() : undefined
+        row: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, row), {}, {
+          map_row_parentKey: parentKeyValue ? (_recordKeyToString4 = recordKeyToString(parentKeyValue)) === null || _recordKeyToString4 === void 0 ? void 0 : _recordKeyToString4.toString() : undefined
         }),
         key: recordKey,
         childrenColumnName: props.childrenColumnName || 'children'
@@ -733,7 +973,8 @@ function useEditableArray(props) {
     } else {
       setNewLineRecordCache({
         defaultValue: row,
-        options: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, options), {}, {
+        options: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, options), {}, {
+          parentKey: parentKeyValue,
           recordKey: recordKey
         })
       });
@@ -744,9 +985,9 @@ function useEditableArray(props) {
   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 _ref11 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee8(recordKey, editRow, originRow, newLine) {
-      var _props$onSave, _recordKeyToString4, _options$parentKey;
-      var res, _ref12, options, actionProps;
+    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:
@@ -754,47 +995,44 @@ function useEditableArray(props) {
             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;
-            _context8.next = 5;
-            return cancelEditable(recordKey);
-          case 5:
-            _ref12 = newLine || newLineRecordRef.current || {}, options = _ref12.options;
-            if (!(!(options !== null && options !== void 0 && options.parentKey) && (options === null || options === void 0 ? void 0 : options.recordKey) === recordKey)) {
-              _context8.next = 9;
-              break;
-            }
-            if ((options === null || options === void 0 ? void 0 : options.position) === 'top') {
-              props.setDataSource([editRow].concat((0, _toConsumableArray2.default)(props.dataSource)));
+            _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 {
-              props.setDataSource([].concat((0, _toConsumableArray2.default)(props.dataSource), [editRow]));
+              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'));
             }
-            return _context8.abrupt("return", res);
-          case 9:
-            actionProps = {
-              data: props.dataSource,
-              getRowKey: props.getRowKey,
-              row: options ? (0, _objectSpread3.default)((0, _objectSpread3.default)({}, editRow), {}, {
-                map_row_parentKey: (_recordKeyToString4 = recordKeyToString((_options$parentKey = options === null || options === void 0 ? void 0 : options.parentKey) !== null && _options$parentKey !== void 0 ? _options$parentKey : '')) === null || _recordKeyToString4 === void 0 ? void 0 : _recordKeyToString4.toString()
-              }) : editRow,
-              key: recordKey,
-              childrenColumnName: props.childrenColumnName || 'children'
-            };
-            props.setDataSource(editableRowByKey(actionProps, (options === null || options === void 0 ? void 0 : options.position) === 'top' ? 'top' : 'update'));
-            _context8.next = 13;
+
+            // 保存时解除编辑模式，统一在这里调用一次
+            _context8.next = 8;
             return cancelEditable(recordKey);
-          case 13:
+          case 8:
             return _context8.abrupt("return", res);
-          case 14:
+          case 9:
           case "end":
             return _context8.stop();
         }
       }, _callee8);
     }));
     return function (_x7, _x8, _x9, _x10) {
-      return _ref11.apply(this, arguments);
+      return _ref13.apply(this, arguments);
     };
   }());
   var actionDeleteRef = (0, _.useRefFunction)( /*#__PURE__*/function () {
-    var _ref13 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee9(recordKey, editRow) {
+    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) {
@@ -811,23 +1049,29 @@ function useEditableArray(props) {
             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;
-            _context9.next = 6;
-            return cancelEditable(recordKey, false);
+            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 8:
+          case 10:
           case "end":
             return _context9.stop();
         }
       }, _callee9);
     }));
     return function (_x11, _x12) {
-      return _ref13.apply(this, arguments);
+      return _ref15.apply(this, arguments);
     };
   }());
   var actionCancelRef = (0, _.useRefFunction)( /*#__PURE__*/function () {
-    var _ref14 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee10(recordKey, editRow, originRow, newLine) {
+    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) {
@@ -845,7 +1089,7 @@ function useEditableArray(props) {
       }, _callee10);
     }));
     return function (_x13, _x14, _x15, _x16) {
-      return _ref14.apply(this, arguments);
+      return _ref16.apply(this, arguments);
     };
   }());