@ant-design/pro-components 3.0.0-beta.1 → 3.0.0-beta.3

package/lib/utils/useEditableArray/index.js

@@ -1,130 +1,89 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
+"use strict";
 
-// src/utils/useEditableArray/index.tsx
-var useEditableArray_exports = {};
-__export(useEditableArray_exports, {
-  DeleteEditableAction: () => DeleteEditableAction,
-  SaveEditableAction: () => SaveEditableAction,
-  defaultActionRender: () => defaultActionRender,
-  editableRowByKey: () => editableRowByKey,
-  recordKeyToString: () => recordKeyToString,
-  useEditableArray: () => useEditableArray
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(useEditableArray_exports);
-var import_icons = require("@ant-design/icons");
-var import_antd = require("antd");
-var import_useLazyKVMap = __toESM(require("antd/lib/table/hooks/useLazyKVMap"));
-var import_useMergedState = __toESM(require("rc-util/lib/hooks/useMergedState"));
-var import_get = __toESM(require("rc-util/lib/utils/get"));
-var import_set = __toESM(require("rc-util/lib/utils/set"));
-var import_warning = require("rc-util/lib/warning");
-var import_react = __toESM(require("react"));
-var import__ = require("..");
-var import_provider = require("../../provider");
-var import_ProFormContext = require("../components/ProFormContext");
-var import_useDeepCompareEffect = require("../hooks/useDeepCompareEffect");
-var import_usePrevious = require("../hooks/usePrevious");
-var import_merge = require("../merge");
-var import_useMountMergeState = require("../useMountMergeState");
-var warning = (messageStr) => {
-  return (import_antd.message.warn || import_antd.message.warning)(messageStr);
+exports.DeleteEditableAction = void 0;
+exports.SaveEditableAction = SaveEditableAction;
+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 _objectSpread3 = _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 _react = _interopRequireWildcard(require("react"));
+var _ = require("..");
+var _provider = require("../../provider");
+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"],
+  _excluded3 = ["map_row_key"];
+/* eslint-disable react-hooks/exhaustive-deps */
+var noteOnce = _util.warning.noteOnce;
+
+/**
+ * 显示警告信息
+ * @param messageStr
+ */
+var warning = function warning(messageStr) {
+  return _antd.message.warning(messageStr);
 };
-var recordKeyToString = (rowKey) => {
-  if (Array.isArray(rowKey))
-    return rowKey.join(",");
+var recordKeyToString = exports.recordKeyToString = function recordKeyToString(rowKey) {
+  if (Array.isArray(rowKey)) return rowKey.join(',');
   return rowKey;
 };
+/**
+ * 使用map 来删除数据，性能一般 但是准确率比较高
+ *
+ * @param keyProps
+ * @param action
+ */
 function editableRowByKey(keyProps, action) {
-  var _a;
-  const { getRowKey, row, data, childrenColumnName = "children" } = keyProps;
-  const key = (_a = recordKeyToString(keyProps.key)) == null ? void 0 : _a.toString();
-  const kvMap = /* @__PURE__ */ new Map();
+  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 = new Map();
+
+  /**
+   * 打平这个数组
+   *
+   * @param records
+   * @param parentKey
+   */
   function dig(records, map_row_parentKey, map_row_index) {
-    records.forEach((record, index) => {
-      const eachIndex = (map_row_index || 0) * 10 + index;
-      const recordKey = getRowKey(record, eachIndex).toString();
-      if (record && typeof record === "object" && childrenColumnName in record) {
+    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);
       }
-      const newRecord = __spreadProps(__spreadValues({}, record), {
+      var newRecord = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, record), {}, {
         map_row_key: recordKey,
-        children: void 0,
-        map_row_parentKey
+        children: undefined,
+        map_row_parentKey: map_row_parentKey
       });
       delete newRecord.children;
       if (!map_row_parentKey) {
@@ -133,55 +92,58 @@ function editableRowByKey(keyProps, action) {
       kvMap.set(recordKey, newRecord);
     });
   }
-  if (action === "top") {
-    kvMap.set(key, __spreadValues(__spreadValues({}, kvMap.get(key)), row));
+  if (action === 'top') {
+    kvMap.set(key, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, kvMap.get(key)), row));
   }
   dig(data);
-  if (action === "update") {
-    kvMap.set(key, __spreadValues(__spreadValues({}, kvMap.get(key)), row));
+  if (action === 'update') {
+    kvMap.set(key, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, kvMap.get(key)), row));
   }
-  if (action === "delete") {
+  if (action === 'delete') {
     kvMap.delete(key);
   }
-  const fill = (map) => {
-    const kvArrayMap = /* @__PURE__ */ new Map();
-    const kvSource = [];
-    const fillNewRecord = (fillChildren = false) => {
-      map.forEach((value) => {
-        var _b;
+  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) {
-          const _a2 = value, { map_row_parentKey } = _a2, rest = __objRest(_a2, ["map_row_parentKey"]);
+          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) {
-            (_b = kvArrayMap.get(map_row_parentKey)) == null ? void 0 : _b.push(rest);
+            var _kvArrayMap$get;
+            (_kvArrayMap$get = kvArrayMap.get(map_row_parentKey)) === null || _kvArrayMap$get === void 0 || _kvArrayMap$get.push(rest);
           }
         }
       });
     };
-    fillNewRecord(action === "top");
-    map.forEach((value) => {
-      var _b;
+    fillNewRecord(action === 'top');
+    map.forEach(function (value) {
       if (value.map_row_parentKey && value.map_row_key) {
-        const _a2 = value, { map_row_parentKey, map_row_key } = _a2, rest = __objRest(_a2, ["map_row_parentKey", "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, []);
         }
-        (_b = kvArrayMap.get(map_row_parentKey)) == null ? void 0 : _b.push(rest);
+        (_kvArrayMap$get2 = kvArrayMap.get(map_row_parentKey)) === null || _kvArrayMap$get2 === void 0 || _kvArrayMap$get2.push(rest);
       }
     });
-    fillNewRecord(action === "update");
-    map.forEach((value) => {
+    fillNewRecord(action === 'update');
+    map.forEach(function (value) {
       if (!value.map_row_parentKey) {
-        const _a2 = value, { map_row_key } = _a2, rest = __objRest(_a2, ["map_row_key"]);
+        var map_row_key = value.map_row_key,
+          rest = (0, _objectWithoutProperties2.default)(value, _excluded3);
         if (map_row_key && kvArrayMap.has(map_row_key)) {
-          const item = __spreadProps(__spreadValues({}, rest), {
-            [childrenColumnName]: kvArrayMap.get(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;
         }
@@ -192,202 +154,282 @@ function editableRowByKey(keyProps, action) {
   };
   return fill(kvMap);
 }
-function SaveEditableAction({
-  recordKey,
-  onSave,
-  row,
-  children,
-  newLineConfig,
-  editorType,
-  tableName
-}, ref) {
-  const context = (0, import_react.useContext)(import_ProFormContext.ProFormContext);
-  const form = import_antd.Form.useFormInstance();
-  const [loading, setLoading] = (0, import_useMountMergeState.useMountMergeState)(false);
-  const save = (0, import__.useRefFunction)(() => __async(this, null, function* () {
-    var _a;
-    try {
-      const isMapEditor = editorType === "Map";
-      const namePath = [
-        tableName,
-        Array.isArray(recordKey) ? recordKey[0] : recordKey
-      ].map((key) => key == null ? void 0 : key.toString()).flat(1).filter(Boolean);
-      setLoading(true);
-      yield form.validateFields(namePath, {
-        recursive: true
-      });
-      const fields = ((_a = context == null ? void 0 : context.getFieldFormatValue) == null ? void 0 : _a.call(context, namePath)) || form.getFieldValue(namePath);
-      if (Array.isArray(recordKey) && recordKey.length > 1) {
-        const [, ...recordKeyPath] = recordKey;
-        const curValue = (0, import_get.default)(fields, recordKeyPath);
-        (0, import_set.default)(fields, recordKeyPath, curValue);
+
+/**
+ * 保存按钮的dom
+ *
+ * @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;
+  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.next = 6;
+          return form.validateFields(namePath, {
+            recursive: true
+          });
+        case 6:
+          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 = 11;
+          return onSave === null || onSave === void 0 ? void 0 : onSave(recordKey,
+          // 如果是 map 模式，fields 就是一个值，所以需要set 到对象中
+          // 数据模式 fields 是一个对象，所以不需要
+          (0, _merge.merge)({}, row, data), row, newLineConfig);
+        case 11:
+          res = _context.sent;
+          setLoading(false);
+          return _context.abrupt("return", res);
+        case 16:
+          _context.prev = 16;
+          _context.t0 = _context["catch"](0);
+          setLoading(false);
+          throw _context.t0;
+        case 20:
+        case "end":
+          return _context.stop();
       }
-      const data = isMapEditor ? (0, import_set.default)({}, namePath, fields) : fields;
-      const res = yield onSave == null ? void 0 : onSave(
-        recordKey,
-        // 如果是 map 模式，fields 就是一个值，所以需要set 到对象中
-        // 数据模式 fields 是一个对象，所以不需要
-        (0, import_merge.merge)({}, row, data),
-        row,
-        newLineConfig
-      );
-      setLoading(false);
-      return res;
-    } catch (error) {
-      setLoading(false);
-      throw error;
-    }
-  }));
-  (0, import_react.useImperativeHandle)(
-    ref,
-    () => ({
-      save
-    }),
-    [save]
-  );
-  return /* @__PURE__ */ import_react.default.createElement(
-    "a",
-    {
-      key: "save",
-      onClick: (e) => __async(this, null, function* () {
-        e.stopPropagation();
-        e.preventDefault();
-        try {
-          yield save();
-        } catch (e2) {
-        }
-      })
-    },
-    loading ? /* @__PURE__ */ import_react.default.createElement(
-      import_icons.LoadingOutlined,
-      {
-        style: {
-          marginInlineEnd: 8
-        }
+    }, _callee, null, [[0, 16]]);
+  })));
+
+  // 保存数据
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      save: save
+    };
+  }, [save]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("a", {
+    onClick: ( /*#__PURE__*/function () {
+      var _ref3 = (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 _ref3.apply(this, arguments);
+      };
+    }()),
+    children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.LoadingOutlined, {
+      style: {
+        marginInlineEnd: 8
       }
-    ) : null,
-    children || "保存"
-  );
+    }) : null, children || '保存']
+  }, "save");
 }
-var DeleteEditableAction = ({
-  recordKey,
-  onDelete,
-  preEditRowRef,
-  row,
-  children,
-  deletePopconfirmMessage
-}) => {
-  const [loading, setLoading] = (0, import_useMountMergeState.useMountMergeState)(() => false);
-  const onConfirm = (0, import__.useRefFunction)(() => __async(void 0, null, function* () {
-    try {
-      setLoading(true);
-      const res = yield onDelete == null ? void 0 : onDelete(recordKey, row);
-      setLoading(false);
-      return res;
-    } catch (e) {
-      setLoading(false);
-      return null;
-    } finally {
-      if (preEditRowRef)
-        preEditRowRef.current = null;
-    }
-  }));
-  return children !== false ? /* @__PURE__ */ import_react.default.createElement(
-    import_antd.Popconfirm,
-    {
-      key: "delete",
-      title: deletePopconfirmMessage,
-      onConfirm: () => onConfirm()
+/**
+ * 删除按钮 dom
+ *
+ * @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 _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);
+          return _context3.abrupt("return", res);
+        case 9:
+          _context3.prev = 9;
+          _context3.t0 = _context3["catch"](0);
+          setLoading(false);
+          return _context3.abrupt("return", null);
+        case 13:
+          _context3.prev = 13;
+          if (preEditRowRef) preEditRowRef.current = null;
+          return _context3.finish(13);
+        case 16:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3, null, [[0, 9, 13, 16]]);
+  })));
+  return children !== false ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Popconfirm, {
+    title: deletePopconfirmMessage,
+    onConfirm: function onConfirm() {
+      return _onConfirm();
     },
-    /* @__PURE__ */ import_react.default.createElement("a", null, loading ? /* @__PURE__ */ import_react.default.createElement(
-      import_icons.LoadingOutlined,
-      {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("a", {
+      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.LoadingOutlined, {
         style: {
           marginInlineEnd: 8
         }
-      }
-    ) : null, children || "删除")
-  ) : null;
+      }) : null, children || '删除']
+    })
+  }, "delete") : null;
 };
-var CancelEditableAction = (props) => {
-  const {
-    recordKey,
-    tableName,
-    newLineConfig,
-    editorType,
-    onCancel,
-    cancelEditable,
-    row,
-    cancelText,
-    preEditRowRef
-  } = props;
-  const context = (0, import_react.useContext)(import_ProFormContext.ProFormContext);
-  const form = import_antd.Form.useFormInstance();
-  return /* @__PURE__ */ import_react.default.createElement(
-    "a",
-    {
-      key: "cancel",
-      onClick: (e) => __async(void 0, null, function* () {
-        var _a, _b;
-        e.stopPropagation();
-        e.preventDefault();
-        const isMapEditor = editorType === "Map";
-        const namePath = [tableName, recordKey].flat(1).filter(Boolean);
-        const fields = ((_a = context == null ? void 0 : context.getFieldFormatValue) == null ? void 0 : _a.call(context, namePath)) || (form == null ? void 0 : form.getFieldValue(namePath));
-        const record = isMapEditor ? (0, import_set.default)({}, namePath, fields) : fields;
-        const res = yield onCancel == null ? void 0 : onCancel(recordKey, record, row, newLineConfig);
-        yield cancelEditable(recordKey);
-        if ((preEditRowRef == null ? void 0 : preEditRowRef.current) !== null) {
-          form.setFieldsValue((0, import_set.default)({}, namePath, preEditRowRef == null ? void 0 : preEditRowRef.current));
-        } else {
-          yield (_b = props.onDelete) == null ? void 0 : _b.call(props, recordKey, row);
-        }
-        if (preEditRowRef)
-          preEditRowRef.current = null;
-        return res;
-      })
-    },
-    cancelText || "取消"
-  );
+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();
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
+    onClick: ( /*#__PURE__*/function () {
+      var _ref6 = (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 _ref6.apply(this, arguments);
+      };
+    }()),
+    children: cancelText || '取消'
+  }, "cancel");
 };
 function defaultActionRender(row, config) {
-  const { recordKey, newLineConfig, saveText, deleteText } = config;
-  const SaveEditableActionRef = (0, import_react.forwardRef)(
-    SaveEditableAction
-  );
-  const saveRef = (0, import_react.createRef)();
+  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)();
   return {
-    save: /* @__PURE__ */ import_react.default.createElement(
-      SaveEditableActionRef,
-      __spreadProps(__spreadValues({
-        key: "save" + recordKey
-      }, config), {
-        row,
-        ref: saveRef
-      }),
-      saveText
-    ),
-    saveRef,
-    delete: (newLineConfig == null ? void 0 : newLineConfig.options.recordKey) !== recordKey ? /* @__PURE__ */ import_react.default.createElement(DeleteEditableAction, __spreadProps(__spreadValues({ key: "delete" + recordKey }, config), { row }), deleteText) : void 0,
-    cancel: /* @__PURE__ */ import_react.default.createElement(CancelEditableAction, __spreadProps(__spreadValues({ key: "cancel" + recordKey }, config), { row }))
+    save: /*#__PURE__*/(0, _jsxRuntime.jsx)(SaveEditableActionRef, (0, _objectSpread3.default)((0, _objectSpread3.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), {}, {
+      row: row,
+      children: deleteText
+    }), 'delete' + recordKey) : undefined,
+    cancel: /*#__PURE__*/(0, _jsxRuntime.jsx)(CancelEditableAction, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, config), {}, {
+      row: row
+    }), 'cancel' + recordKey)
   };
 }
+
+/**
+ * 一个方便的hooks 用于维护编辑的状态
+ *
+ * @param props
+ */
 function useEditableArray(props) {
-  const intl = (0, import_provider.useIntl)();
-  const preEditRowRef = (0, import_react.useRef)(null);
-  const [newLineRecordCache, setNewLineRecordCache] = (0, import_react.useState)(void 0);
-  const resetMapRef = () => {
-    const map = /* @__PURE__ */ new Map();
-    const loopGetKey = (dataSource, parentKey) => {
-      dataSource == null ? void 0 : dataSource.forEach((record, index) => {
-        var _a;
-        const key = parentKey === void 0 || parentKey === null ? index.toString() : parentKey + "_" + index.toString();
+  // Internationalization
+  var 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];
+  var resetMapRef = function resetMapRef() {
+    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(
-          (_a = recordKeyToString(props.getRowKey(record, -1))) == null ? void 0 : _a.toString(),
-          key
-        );
-        if (props.childrenColumnName && (record == null ? void 0 : record[props.childrenColumnName])) {
+        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);
         }
       });
@@ -395,350 +437,468 @@ function useEditableArray(props) {
     loopGetKey(props.dataSource);
     return map;
   };
-  const initDataSourceKeyIndexMap = (0, import_react.useMemo)(() => resetMapRef(), []);
-  const dataSourceKeyIndexMapRef = (0, import_react.useRef)(
-    initDataSourceKeyIndexMap
-  );
-  const newLineRecordRef = (0, import_react.useRef)(
-    void 0
-  );
-  (0, import_useDeepCompareEffect.useDeepCompareEffectDebounce)(() => {
+  var initDataSourceKeyIndexMap = (0, _react.useMemo)(function () {
+    return resetMapRef();
+  }, []);
+  var dataSourceKeyIndexMapRef = (0, _react.useRef)(initDataSourceKeyIndexMap);
+  var newLineRecordRef = (0, _react.useRef)(undefined);
+  (0, _useDeepCompareEffect.useDeepCompareEffectDebounce)(function () {
     dataSourceKeyIndexMapRef.current = resetMapRef();
   }, [props.dataSource]);
+
+  // 这里这么做是为了存上次的状态，不然每次存一下再拿
   newLineRecordRef.current = newLineRecordCache;
-  const editableType = props.type || "single";
-  const [getRecordByKey] = (0, import_useLazyKVMap.default)(
-    props.dataSource,
-    "children",
-    props.getRowKey
-  );
-  const [editableKeys, setEditableRowKeys] = (0, import_useMergedState.default)([], {
-    value: props.editableKeys,
-    onChange: props.onChange ? (keys) => {
-      var _a, _b, _c;
-      (_c = props == null ? void 0 : props.onChange) == null ? void 0 : _c.call(
-        props,
-        // 计算编辑的key
-        (_a = keys == null ? void 0 : keys.filter((key) => key !== void 0)) != null ? _a : [],
-        // 计算编辑的行
-        (_b = keys == null ? void 0 : keys.map((key) => getRecordByKey(key)).filter((key) => key !== void 0)) != null ? _b : []
-      );
-    } : void 0
-  });
-  const editableKeysSet = (0, import_react.useMemo)(() => {
-    const keys = editableType === "single" ? editableKeys == null ? void 0 : editableKeys.slice(0, 1) : editableKeys;
+  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];
+
+  /** 一个用来标志的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]);
-  const editableKeysRef = (0, import_usePrevious.usePrevious)(editableKeys);
-  const isEditable = (0, import__.useRefFunction)((row) => {
-    var _a, _b, _c, _d;
-    const recordKeyOrIndex = (_b = (_a = props.getRowKey(row, row.index)) == null ? void 0 : _a.toString) == null ? void 0 : _b.call(_a);
-    const recordKey = (_d = (_c = props.getRowKey(row, -1)) == null ? void 0 : _c.toString) == null ? void 0 : _d.call(_c);
-    const stringEditableKeys = editableKeys == null ? void 0 : editableKeys.map((key) => key == null ? void 0 : key.toString());
-    const stringEditableKeysRef = (editableKeysRef == null ? void 0 : editableKeysRef.map((key) => key == null ? void 0 : key.toString())) || [];
-    const preIsEditable = props.tableName && !!(stringEditableKeysRef == null ? void 0 : stringEditableKeysRef.includes(recordKey)) || !!(stringEditableKeysRef == null ? void 0 : stringEditableKeysRef.includes(recordKeyOrIndex));
+  }, [(editableKeys || []).join(','), editableType]);
+  var editableKeysRef = (0, _usePrevious.usePrevious)(editableKeys);
+
+  /** 这行是不是编辑状态 */
+  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) {
+      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));
     return {
-      recordKey,
-      isEditable: props.tableName && (stringEditableKeys == null ? void 0 : stringEditableKeys.includes(recordKey)) || (stringEditableKeys == null ? void 0 : stringEditableKeys.includes(recordKeyOrIndex)),
-      preIsEditable
+      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)),
+      preIsEditable: preIsEditable
     };
   });
-  const startEditable = (0, import__.useRefFunction)(
-    (recordKey, record) => {
-      var _a, _b;
-      if (editableKeysSet.size > 0 && editableType === "single" && props.onlyOneLineEditorAlertMessage !== false) {
-        warning(
-          props.onlyOneLineEditorAlertMessage || intl.getMessage(
-            "editableTable.onlyOneLineEditor",
-            "只能同时编辑一行"
-          )
-        );
-        return false;
-      }
-      editableKeysSet.add(recordKey);
-      setEditableRowKeys(Array.from(editableKeysSet));
-      preEditRowRef.current = (_b = record != null ? record : (_a = props.dataSource) == null ? void 0 : _a.find((recordData, index) => {
-        return props.getRowKey(recordData, index) === recordKey;
-      })) != null ? _b : null;
-      return true;
+
+  /**
+   * 进入编辑状态
+   *
+   * @param recordKey
+   */
+  var startEditable = (0, _.useRefFunction)(function (recordKey, record) {
+    var _ref7, _props$dataSource;
+    // 如果是单行的话，不允许多行编辑
+    if (editableKeysSet.size > 0 && editableType === 'single' && props.onlyOneLineEditorAlertMessage !== false) {
+      warning(props.onlyOneLineEditorAlertMessage || intl.getMessage('editableTable.onlyOneLineEditor', '只能同时编辑一行'));
+      return false;
     }
-  );
-  const cancelEditable = (0, import__.useRefFunction)(
-    (recordKey, needReTry) => __async(this, null, function* () {
-      const relayKey = recordKeyToString(recordKey).toString();
-      const key = dataSourceKeyIndexMapRef.current.get(relayKey);
-      if (!editableKeysSet.has(relayKey) && key && (needReTry != null ? needReTry : true) && props.tableName) {
-        cancelEditable(key, false);
-        return;
-      }
-      if (newLineRecordCache && newLineRecordCache.options.recordKey === recordKey) {
-        setNewLineRecordCache(void 0);
-      }
-      editableKeysSet.delete(relayKey);
-      editableKeysSet.delete(recordKeyToString(recordKey));
-      setEditableRowKeys(Array.from(editableKeysSet));
-      return true;
-    })
-  );
-  const propsOnValuesChange = (0, import__.useDebounceFn)((...rest) => __async(this, null, function* () {
-    var _a;
-    (_a = props.onValuesChange) == null ? void 0 : _a.call(props, ...rest);
-  }), 64);
-  const onValuesChange = (0, import__.useRefFunction)(
-    (value, values) => {
-      var _a;
-      if (!props.onValuesChange) {
-        return;
+    editableKeysSet.add(recordKey);
+    setEditableRowKeys(Array.from(editableKeysSet));
+
+    // 这里是为了存上次的状态,不然取消的时候就丢掉了
+    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) {
+      return props.getRowKey(recordData, index) === recordKey;
+    })) !== null && _ref7 !== void 0 ? _ref7 : null;
+    return true;
+  });
+
+  /**
+   * 退出编辑状态
+   *
+   * @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;
+      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;
+              break;
+            }
+            cancelEditable(key, false);
+            return _context5.abrupt("return");
+          case 5:
+            /** 如果这个是 new Line 直接删除 */
+            if (newLineRecordCache && newLineRecordCache.options.recordKey === recordKey) {
+              setNewLineRecordCache(undefined);
+            }
+            editableKeysSet.delete(relayKey);
+            editableKeysSet.delete(recordKeyToString(recordKey));
+            setEditableRowKeys(Array.from(editableKeysSet));
+            return _context5.abrupt("return", true);
+          case 10:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5);
+    }));
+    return function (_x3, _x4) {
+      return _ref8.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();
       }
-      let { dataSource } = props;
-      editableKeys == null ? void 0 : editableKeys.forEach((eachRecordKey) => {
-        if ((newLineRecordCache == null ? void 0 : newLineRecordCache.options.recordKey) === eachRecordKey)
-          return;
-        const recordKey2 = eachRecordKey.toString();
-        const editRow2 = (0, import_get.default)(
-          values,
-          [props.tableName || "", recordKey2].flat(1).filter((key) => key || key === 0)
-        );
-        if (!editRow2)
-          return;
-        dataSource = editableRowByKey(
-          {
-            data: dataSource,
-            getRowKey: props.getRowKey,
-            row: editRow2,
-            key: recordKey2,
-            childrenColumnName: props.childrenColumnName || "children"
-          },
-          "update"
-        );
-      });
-      const relayValue = value;
-      const recordKey = (_a = Object.keys(relayValue || {}).pop()) == null ? void 0 : _a.toString();
-      const newLineRecordData = __spreadValues(__spreadValues({}, newLineRecordCache == null ? void 0 : newLineRecordCache.defaultValue), (0, import_get.default)(
-        values,
-        [props.tableName || "", recordKey.toString()].flat(1).filter((key) => key || key === 0)
-      ));
-      const editRow = dataSourceKeyIndexMapRef.current.has(
-        recordKeyToString(recordKey)
-      ) ? dataSource.find((item, index) => {
-        var _a2;
-        const key = (_a2 = props.getRowKey(item, index)) == null ? void 0 : _a2.toString();
-        return key === recordKey;
-      }) : newLineRecordData;
-      propsOnValuesChange.run(editRow || newLineRecordData, dataSource);
+    }, _callee6);
+  })), 64);
+  var onValuesChange = (0, _.useRefFunction)(function (value, values) {
+    var _Object$keys$pop;
+    if (!props.onValuesChange) {
+      return;
     }
-  );
-  const saveRefsMap = (0, import_react.useRef)(/* @__PURE__ */ new Map());
-  (0, import_react.useEffect)(() => {
-    saveRefsMap.current.forEach((ref, key) => {
+    var dataSource = props.dataSource;
+
+    // 这里是把正在编辑中的所有表单数据都修改掉
+    // 不然会用 props 里面的 dataSource，数据只有正在编辑中的
+    // Object.keys(get(values, [props.tableName || ''].flat(1)) || values).forEach((recordKey) => {
+    editableKeys === null || editableKeys === void 0 || editableKeys.forEach(function (eachRecordKey) {
+      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,
+        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();
+
+    //从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 saveRefsMap = (0, _react.useRef)(new Map());
+  (0, _react.useEffect)(function () {
+    // 确保只保留编辑状态的，其它的都删除掉
+    saveRefsMap.current.forEach(function (ref, key) {
       if (!editableKeysSet.has(key)) {
         saveRefsMap.current.delete(key);
       }
     });
   }, [saveRefsMap, editableKeysSet]);
-  const saveEditable = (0, import__.useRefFunction)(
-    (recordKey, needReTry) => __async(this, null, function* () {
-      var _a;
-      const relayKey = recordKeyToString(recordKey);
-      const key = dataSourceKeyIndexMapRef.current.get(recordKey.toString());
-      if (!editableKeysSet.has(relayKey) && key && (needReTry != null ? needReTry : true) && props.tableName) {
-        return yield saveEditable(key, false);
-      }
-      const saveRef = saveRefsMap.current.get(relayKey) || saveRefsMap.current.get(relayKey.toString());
-      try {
-        yield (_a = saveRef == null ? void 0 : saveRef.current) == null ? void 0 : _a.save();
-      } catch (e) {
-        return false;
-      }
-      editableKeysSet.delete(relayKey);
-      editableKeysSet.delete(relayKey.toString());
-      setEditableRowKeys(Array.from(editableKeysSet));
-      return true;
-    })
-  );
-  const addEditRecord = (0, import__.useRefFunction)(
-    (row, options) => {
-      var _a;
-      if ((options == null ? void 0 : options.parentKey) && !dataSourceKeyIndexMapRef.current.has(
-        recordKeyToString(options == null ? void 0 : options.parentKey).toString()
-      )) {
-        console.warn("can't find record by key", options == null ? 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",
-            "只能同时编辑一行"
-          )
-        );
-        return false;
-      }
-      const recordKey = props.getRowKey(row, -1);
-      if (!recordKey && recordKey !== 0) {
-        (0, import_warning.noteOnce)(
-          !!recordKey,
-          "请设置 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));
-      if ((options == null ? void 0 : options.newRecordType) === "dataSource" || props.tableName) {
-        const actionProps = {
-          data: props.dataSource,
-          getRowKey: props.getRowKey,
-          row: __spreadProps(__spreadValues({}, row), {
-            map_row_parentKey: (options == null ? void 0 : options.parentKey) ? (_a = recordKeyToString(options == null ? void 0 : options.parentKey)) == null ? void 0 : _a.toString() : void 0
-          }),
-          key: recordKey,
-          childrenColumnName: props.childrenColumnName || "children"
-        };
-        props.setDataSource(
-          editableRowByKey(
-            actionProps,
-            (options == null ? void 0 : options.position) === "top" ? "top" : "update"
-          )
-        );
-      } else {
-        setNewLineRecordCache({
-          defaultValue: row,
-          options: __spreadProps(__spreadValues({}, options), {
-            recordKey
-          })
-        });
-      }
-      return true;
-    }
-  );
-  const saveText = (props == null ? void 0 : props.saveText) || intl.getMessage("editableTable.action.save", "保存");
-  const deleteText = (props == null ? void 0 : props.deleteText) || intl.getMessage("editableTable.action.delete", "删除");
-  const cancelText = (props == null ? void 0 : props.cancelText) || intl.getMessage("editableTable.action.cancel", "取消");
-  const actionSaveRef = (0, import__.useRefFunction)(
-    (recordKey, editRow, originRow, newLine) => __async(this, null, function* () {
-      var _a, _b, _c;
-      const res = yield (_a = props == null ? void 0 : props.onSave) == null ? void 0 : _a.call(props, recordKey, editRow, originRow, newLine);
-      yield cancelEditable(recordKey);
-      const { options } = newLine || newLineRecordRef.current || {};
-      if (!(options == null ? void 0 : options.parentKey) && (options == null ? void 0 : options.recordKey) === recordKey) {
-        if ((options == null ? void 0 : options.position) === "top") {
-          props.setDataSource([editRow, ...props.dataSource]);
-        } else {
-          props.setDataSource([...props.dataSource, editRow]);
+  /**
+   * 保存编辑行
+   *
+   * @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;
+      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;
+              break;
+            }
+            _context7.next = 5;
+            return saveEditable(key, false);
+          case 5:
+            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);
+            return _context7.abrupt("return", false);
+          case 15:
+            editableKeysSet.delete(relayKey);
+            editableKeysSet.delete(relayKey.toString());
+            setEditableRowKeys(Array.from(editableKeysSet));
+            return _context7.abrupt("return", true);
+          case 19:
+          case "end":
+            return _context7.stop();
         }
-        return res;
-      }
-      const actionProps = {
-        data: props.dataSource,
-        getRowKey: props.getRowKey,
-        row: options ? __spreadProps(__spreadValues({}, editRow), {
-          map_row_parentKey: (_c = recordKeyToString(
-            (_b = options == null ? void 0 : options.parentKey) != null ? _b : ""
-          )) == null ? void 0 : _c.toString()
-        }) : editRow,
-        key: recordKey,
-        childrenColumnName: props.childrenColumnName || "children"
-      };
-      props.setDataSource(
-        editableRowByKey(
-          actionProps,
-          (options == null ? void 0 : options.position) === "top" ? "top" : "update"
-        )
-      );
-      yield cancelEditable(recordKey);
-      return res;
-    })
-  );
-  const actionDeleteRef = (0, import__.useRefFunction)(
-    (recordKey, editRow) => __async(this, null, function* () {
-      var _a;
-      const actionProps = {
+      }, _callee7, null, [[7, 12]]);
+    }));
+    return function (_x5, _x6) {
+      return _ref10.apply(this, arguments);
+    };
+  }());
+
+  /**
+   * 同时只能支持一行,取消之后数据消息，不会触发 dataSource
+   *
+   * @param row
+   * @param options
+   * @name 增加新的行
+   */
+  var addEditRecord = (0, _.useRefFunction)(function (row, 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', '只能同时编辑一行'));
+      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');
+      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 actionProps = {
         data: props.dataSource,
         getRowKey: props.getRowKey,
-        row: editRow,
+        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
+        }),
         key: recordKey,
-        childrenColumnName: props.childrenColumnName || "children"
+        childrenColumnName: props.childrenColumnName || 'children'
       };
-      const res = yield (_a = props == null ? void 0 : props.onDelete) == null ? void 0 : _a.call(props, recordKey, editRow);
-      yield cancelEditable(recordKey, false);
-      props.setDataSource(editableRowByKey(actionProps, "delete"));
-      return res;
-    })
-  );
-  const actionCancelRef = (0, import__.useRefFunction)(
-    (recordKey, editRow, originRow, newLine) => __async(this, null, function* () {
-      var _a;
-      const res = yield (_a = props == null ? void 0 : props.onCancel) == null ? void 0 : _a.call(
-        props,
-        recordKey,
-        editRow,
-        originRow,
-        newLine
-      );
-      return res;
-    })
-  );
-  const existCustomActionRender = props.actionRender && typeof props.actionRender === "function";
-  const customActionRender = existCustomActionRender ? props.actionRender : () => {
-  };
-  const customActionRenderRef = (0, import__.useRefFunction)(
-    customActionRender
-  );
-  const actionRender = (row) => {
-    const key = props.getRowKey(row, row.index);
-    const config = {
-      saveText,
-      cancelText,
-      deleteText,
-      addEditRecord,
+      props.setDataSource(editableRowByKey(actionProps, (options === null || options === void 0 ? void 0 : options.position) === 'top' ? 'top' : 'update'));
+    } else {
+      setNewLineRecordCache({
+        defaultValue: row,
+        options: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, options), {}, {
+          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 _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;
+      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;
+            _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)));
+            } else {
+              props.setDataSource([].concat((0, _toConsumableArray2.default)(props.dataSource), [editRow]));
+            }
+            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;
+            return cancelEditable(recordKey);
+          case 13:
+            return _context8.abrupt("return", res);
+          case 14:
+          case "end":
+            return _context8.stop();
+        }
+      }, _callee8);
+    }));
+    return function (_x7, _x8, _x9, _x10) {
+      return _ref11.apply(this, arguments);
+    };
+  }());
+  var actionDeleteRef = (0, _.useRefFunction)( /*#__PURE__*/function () {
+    var _ref13 = (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;
+            _context9.next = 6;
+            return cancelEditable(recordKey, false);
+          case 6:
+            props.setDataSource(editableRowByKey(actionProps, 'delete'));
+            return _context9.abrupt("return", res);
+          case 8:
+          case "end":
+            return _context9.stop();
+        }
+      }, _callee9);
+    }));
+    return function (_x11, _x12) {
+      return _ref13.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 _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 _ref14.apply(this, arguments);
+    };
+  }());
+
+  // 如果传入了自定义的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,
       recordKey: key,
-      cancelEditable,
+      cancelEditable: cancelEditable,
       index: row.index,
       tableName: props.tableName,
       newLineConfig: newLineRecordCache,
       onCancel: actionCancelRef,
       onDelete: actionDeleteRef,
       onSave: actionSaveRef,
-      editableKeys,
-      setEditableRowKeys,
-      preEditRowRef,
-      deletePopconfirmMessage: props.deletePopconfirmMessage || `${intl.getMessage("deleteThisLine", "删除此项")}?`
+      editableKeys: editableKeys,
+      setEditableRowKeys: setEditableRowKeys,
+      preEditRowRef: preEditRowRef,
+      deletePopconfirmMessage: props.deletePopconfirmMessage || "".concat(intl.getMessage('deleteThisLine', '删除此项'), "?")
     };
-    const renderResult = defaultActionRender(row, config);
+    var renderResult = defaultActionRender(row, config);
+    // 缓存一下saveRef
     if (props.tableName) {
-      saveRefsMap.current.set(
-        dataSourceKeyIndexMapRef.current.get(recordKeyToString(key)) || recordKeyToString(key),
-        renderResult.saveRef
-      );
+      saveRefsMap.current.set(dataSourceKeyIndexMapRef.current.get(recordKeyToString(key)) || recordKeyToString(key), renderResult.saveRef);
     } else {
       saveRefsMap.current.set(recordKeyToString(key), renderResult.saveRef);
     }
-    if (existCustomActionRender)
-      return customActionRenderRef(row, config, {
-        save: renderResult.save,
-        delete: renderResult.delete,
-        cancel: renderResult.cancel
-      });
+    if (existCustomActionRender) return customActionRenderRef(row, config, {
+      save: renderResult.save,
+      delete: renderResult.delete,
+      cancel: renderResult.cancel
+    });
     return [renderResult.save, renderResult.delete, renderResult.cancel];
   };
   return {
-    editableKeys,
-    setEditableRowKeys,
-    isEditable,
-    actionRender,
-    startEditable,
-    cancelEditable,
-    addEditRecord,
-    saveEditable,
+    editableKeys: editableKeys,
+    setEditableRowKeys: setEditableRowKeys,
+    isEditable: isEditable,
+    actionRender: actionRender,
+    startEditable: startEditable,
+    cancelEditable: cancelEditable,
+    addEditRecord: addEditRecord,
+    saveEditable: saveEditable,
     newLineRecord: newLineRecordCache,
     preEditableKeys: editableKeysRef,
-    onValuesChange,
+    onValuesChange: onValuesChange,
     getRealIndex: props.getRealIndex
   };
-}
+}