@zat-design/sisyphus-react 4.2.0-beta.2 → 4.2.0-beta.3

package/es/ProForm/components/combination/FormList/components/ActionButton.js

@@ -1,17 +1,6 @@
-var _excluded = ["label", "onClick", "onHandle", "type", "needConfirm", "confirmProps", "title"],
-  _excluded2 = ["onClick", "label"];
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == typeof h && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(typeof e + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import _omit from "lodash/omit";
+import _isFunction from "lodash/isFunction";
 import { Button, Popconfirm, Space } from 'antd';
-import { isFunction, omit } from 'lodash';
 import classNames from 'classnames';
 import React, { useMemo, createElement as _createElement } from 'react';
 import { CopyOutlined, PlusSquareOutlined, ArrowUpOutlined, ArrowDownOutlined } from '@ant-design/icons';
@@ -20,26 +9,32 @@ import locale from "../../../../../locale";
 import deleteSvg from "../../../../../assets/delete.svg";
 import close2Svg from "../../../../../assets/close2.svg";
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-var filterKeys = ['actionType'];
-var getDefaultActions = mode => {
-  var originActions = {
+const filterKeys = ['actionType'];
+const getDefaultActions = mode => {
+  const originActions = {
     add: {
-      onClick: (record, _ref) => {
-        var namePath = _ref.namePath,
-          index = _ref.index,
-          operation = _ref.operation;
-        var add = operation.add;
+      onClick: (record, {
+        namePath,
+        index,
+        operation
+      }) => {
+        const {
+          add
+        } = operation;
         add(undefined, index + 1);
       },
       label: `${locale.ProForm.formListActions[0]}`,
       icon: /*#__PURE__*/_jsx(PlusSquareOutlined, {})
     },
     delete: {
-      onClick: (record, _ref2) => {
-        var namePath = _ref2.namePath,
-          index = _ref2.index,
-          operation = _ref2.operation;
-        var remove = operation.remove;
+      onClick: (record, {
+        namePath,
+        index,
+        operation
+      }) => {
+        const {
+          remove
+        } = operation;
         remove(index);
       },
       label: locale.ProForm.formListActions[1],
@@ -55,33 +50,42 @@ var getDefaultActions = mode => {
       })
     },
     copy: {
-      onClick: (record, _ref3) => {
-        var namePath = _ref3.namePath,
-          index = _ref3.index,
-          operation = _ref3.operation;
-        var add = operation.add;
+      onClick: (record, {
+        namePath,
+        index,
+        operation
+      }) => {
+        const {
+          add
+        } = operation;
         add(record, index + 1);
       },
       label: locale.ProForm.formListActions[2],
       icon: /*#__PURE__*/_jsx(CopyOutlined, {})
     },
     moveUp: {
-      onClick: (record, _ref4) => {
-        var namePath = _ref4.namePath,
-          index = _ref4.index,
-          operation = _ref4.operation;
-        var move = operation.move;
+      onClick: (record, {
+        namePath,
+        index,
+        operation
+      }) => {
+        const {
+          move
+        } = operation;
         move(index, index - 1);
       },
       label: locale.ProForm.formListActions[3],
       icon: /*#__PURE__*/_jsx(ArrowUpOutlined, {})
     },
     moveDown: {
-      onClick: (record, _ref5) => {
-        var namePath = _ref5.namePath,
-          index = _ref5.index,
-          operation = _ref5.operation;
-        var move = operation.move;
+      onClick: (record, {
+        namePath,
+        index,
+        operation
+      }) => {
+        const {
+          move
+        } = operation;
         move(index, index + 1);
       },
       label: locale.ProForm.formListActions[4],
@@ -106,124 +110,109 @@ var getDefaultActions = mode => {
   }
   return originActions;
 };
-var defaultActionProps = [{
+const defaultActionProps = [{
   type: 'delete'
 }];
-var ActionButton = props => {
-  var namePath = props.namePath,
-    form = props.form,
-    field = props.field,
-    operation = props.operation,
-    index = props.index,
-    length = props.length,
-    disabled = props.disabled,
-    fields = props.fields,
-    min = props.min,
-    max = props.max,
-    mode = props.mode,
-    isView = props.isView,
-    hideStartEndActionProps = props.hideStartEndActionProps;
+const ActionButton = props => {
+  const {
+    namePath,
+    form,
+    field,
+    operation,
+    index,
+    length,
+    disabled,
+    fields,
+    min,
+    max,
+    mode,
+    isView,
+    hideStartEndActionProps
+  } = props;
 
   // 默认显示一个delete
-  var actionProps = useMemo(() => {
-    var _props$actionProps;
+  const actionProps = useMemo(() => {
     // 兼容 actionType 和 type
-    var _actionProps = (_props$actionProps = props.actionProps) === null || _props$actionProps === void 0 ? void 0 : _props$actionProps.map(item => {
-      return _objectSpread(_objectSpread({}, item), {}, {
+    const _actionProps = props.actionProps?.map(item => {
+      return {
+        ...item,
         // @ts-ignore
         type: item.actionType || item.type
-      });
+      };
     });
-    if (!(_actionProps !== null && _actionProps !== void 0 && _actionProps.find(item => item.type === 'delete'))) {
+    if (!_actionProps?.find(item => item.type === 'delete')) {
       return _actionProps ? [..._actionProps, ...defaultActionProps] : defaultActionProps;
     }
     return _actionProps;
   }, [props.actionProps]);
-  var handleClick = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, index, item) {
-      var value, data;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            value = form.getFieldValue(namePath);
-            _context.next = 3;
-            return callback === null || callback === void 0 ? void 0 : callback(value, {
-              namePath,
-              index,
-              operation,
-              form
-            });
-          case 3:
-            data = _context.sent;
-            if (!(!callback || data === true)) {
-              _context.next = 7;
-              break;
-            }
-            defaultCallback === null || defaultCallback === void 0 || defaultCallback(value, {
-              namePath,
-              index,
-              operation,
-              form
-            });
-            return _context.abrupt("return");
-          case 7:
-            if ((item === null || item === void 0 ? void 0 : item.type) === 'add') {
-              operation.add(data, index !== undefined ? index + 1 : undefined);
-            }
-          case 8:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function handleClick(_x, _x2, _x3, _x4) {
-      return _ref6.apply(this, arguments);
-    };
-  }();
-  var customClick = (callback, index) => {
-    var value = form.getFieldValue(namePath);
-    callback === null || callback === void 0 || callback(value, {
+  const handleClick = async (defaultCallback, callback, index, item) => {
+    const value = form.getFieldValue(namePath);
+    const data = await callback?.(value, {
+      namePath,
+      index,
+      operation,
+      form
+    });
+    if (!callback || data === true) {
+      defaultCallback?.(value, {
+        namePath,
+        index,
+        operation,
+        form
+      });
+      return;
+    }
+    if (item?.type === 'add') {
+      operation.add(data, index !== undefined ? index + 1 : undefined);
+    }
+  };
+  const customClick = (callback, index) => {
+    const value = form.getFieldValue(namePath);
+    callback?.(value, {
       namePath,
       index,
       operation,
       form
     });
   };
-  var defaultActions = useMemo(() => getDefaultActions(mode), [mode]);
+  const defaultActions = useMemo(() => getDefaultActions(mode), [mode]);
 
   // 整体隐藏首尾 ActionButton
-  if (hideStartEndActionProps !== null && hideStartEndActionProps !== void 0 && hideStartEndActionProps[0] && index === 0) return null;
-  if (hideStartEndActionProps !== null && hideStartEndActionProps !== void 0 && hideStartEndActionProps[1] && index === fields.length - 1) return null;
+  if (hideStartEndActionProps?.[0] && index === 0) return null;
+  if (hideStartEndActionProps?.[1] && index === fields.length - 1) return null;
   return /*#__PURE__*/_jsx(Space, {
     align: "start",
     className: "pro-form-list-action",
-    children: actionProps === null || actionProps === void 0 ? void 0 : actionProps.map(item => {
-      if (item.show === false) return /*#__PURE__*/_jsx("span", {}, `${item === null || item === void 0 ? void 0 : item.type}${index}`);
-      if (isFunction(item.show) && !item.show(form.getFieldValue(namePath), {
+    children: actionProps?.map(item => {
+      if (item.show === false) return /*#__PURE__*/_jsx("span", {}, `${item?.type}${index}`);
+      if (_isFunction(item.show) && !item.show(form.getFieldValue(namePath), {
         namePath,
         index,
         form
       })) {
-        return /*#__PURE__*/_jsx("span", {}, `${item === null || item === void 0 ? void 0 : item.type}${index}`);
+        return /*#__PURE__*/_jsx("span", {}, `${item?.type}${index}`);
       }
-      var label = item.label,
-        onClick = item.onClick,
-        onHandle = item.onHandle,
-        type = item.type,
-        needConfirm = item.needConfirm,
-        confirmProps = item.confirmProps,
-        title = item.title,
-        rest = _objectWithoutProperties(item, _excluded);
-      var _needConfirm = needConfirm || confirmProps;
-      var _confirmProps = !confirmProps || confirmProps === true ? {} : confirmProps;
-      var _onClick = onClick || onHandle;
+      const {
+        label,
+        onClick,
+        onHandle,
+        type,
+        needConfirm,
+        confirmProps,
+        title,
+        ...rest
+      } = item;
+      const _needConfirm = needConfirm || confirmProps;
+      const _confirmProps = !confirmProps || confirmProps === true ? {} : confirmProps;
+      const _onClick = onClick || onHandle;
       if (['add', 'delete', 'copy', 'moveUp', 'moveDown'].includes(type)) {
         // 禁用状态默认隐藏内置操作按钮
         if (disabled || isView) return /*#__PURE__*/_jsx(_Fragment, {});
-        var _defaultActions$type = defaultActions[type],
-          internalOnClick = _defaultActions$type.onClick,
-          defaultLabel = _defaultActions$type.label,
-          defaultRest = _objectWithoutProperties(_defaultActions$type, _excluded2);
+        const {
+          onClick: internalOnClick,
+          label: defaultLabel,
+          ...defaultRest
+        } = defaultActions[type];
         // 小于min不可删除
         if (min && min >= fields.length && ['delete'].includes(type)) {
           return false;
@@ -244,74 +233,54 @@ var ActionButton = props => {
         }
 
         // 移动限制：防止将项移动到隐藏的首尾位置
-        if (hideStartEndActionProps !== null && hideStartEndActionProps !== void 0 && hideStartEndActionProps[0] && index === 1 && ['moveUp'].includes(type)) {
+        if (hideStartEndActionProps?.[0] && index === 1 && ['moveUp'].includes(type)) {
           return false;
         }
-        if (hideStartEndActionProps !== null && hideStartEndActionProps !== void 0 && hideStartEndActionProps[1] && index === fields.length - 2 && type === 'moveDown') {
+        if (hideStartEndActionProps?.[1] && index === fields.length - 2 && type === 'moveDown') {
           return false;
         }
 
         // 处理 add 操作的插入位置
-        var handleAddClick = /*#__PURE__*/function () {
-          var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-            var value, data, insertIndex, _insertIndex;
-            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-              while (1) switch (_context2.prev = _context2.next) {
-                case 0:
-                  value = form.getFieldValue(namePath);
-                  _context2.next = 3;
-                  return _onClick === null || _onClick === void 0 ? void 0 : _onClick(value, {
-                    namePath,
-                    index,
-                    operation,
-                    form
-                  });
-                case 3:
-                  data = _context2.sent;
-                  if (!(!_onClick || data === true)) {
-                    _context2.next = 7;
-                    break;
-                  }
-                  // 如果有 addIndex 配置，使用它计算插入位置
-                  if (item.addIndex) {
-                    insertIndex = typeof item.addIndex === 'function' ? item.addIndex(value, {
-                      index,
-                      namePath,
-                      form,
-                      operation
-                    }) : item.addIndex;
-                    operation.add(data, insertIndex);
-                  } else {
-                    operation.add(data, index + 1); // 默认插入到下一位置
-                  }
-                  return _context2.abrupt("return");
-                case 7:
-                  if ((item === null || item === void 0 ? void 0 : item.type) === 'add') {
-                    // 如果有 addIndex 配置，使用它计算插入位置
-                    if (item.addIndex) {
-                      _insertIndex = typeof item.addIndex === 'function' ? item.addIndex(value, {
-                        index,
-                        namePath,
-                        form,
-                        operation
-                      }) : item.addIndex;
-                      operation.add(data, _insertIndex);
-                    } else {
-                      operation.add(data, index + 1); // 默认插入到下一位置
-                    }
-                  }
-                case 8:
-                case "end":
-                  return _context2.stop();
-              }
-            }, _callee2);
-          }));
-          return function handleAddClick() {
-            return _ref7.apply(this, arguments);
-          };
-        }();
-        return _needConfirm ? /*#__PURE__*/_jsx(Popconfirm, _objectSpread(_objectSpread({
-          title: title !== null && title !== void 0 ? title : `${locale.ProForm.formListConfirmMessage}`,
+        const handleAddClick = async () => {
+          const value = form.getFieldValue(namePath);
+          const data = await _onClick?.(value, {
+            namePath,
+            index,
+            operation,
+            form
+          });
+          if (!_onClick || data === true) {
+            // 如果有 addIndex 配置，使用它计算插入位置
+            if (item.addIndex) {
+              const insertIndex = typeof item.addIndex === 'function' ? item.addIndex(value, {
+                index,
+                namePath,
+                form,
+                operation
+              }) : item.addIndex;
+              operation.add(data, insertIndex);
+            } else {
+              operation.add(data, index + 1); // 默认插入到下一位置
+            }
+            return;
+          }
+          if (item?.type === 'add') {
+            // 如果有 addIndex 配置，使用它计算插入位置
+            if (item.addIndex) {
+              const insertIndex = typeof item.addIndex === 'function' ? item.addIndex(value, {
+                index,
+                namePath,
+                form,
+                operation
+              }) : item.addIndex;
+              operation.add(data, insertIndex);
+            } else {
+              operation.add(data, index + 1); // 默认插入到下一位置
+            }
+          }
+        };
+        return _needConfirm ? /*#__PURE__*/_jsx(Popconfirm, {
+          title: title ?? `${locale.ProForm.formListConfirmMessage}`,
           onCancel: e => e.stopPropagation(),
           onConfirm: e => {
             if (type === 'add') {
@@ -319,20 +288,23 @@ var ActionButton = props => {
             } else {
               handleClick(internalOnClick, _onClick, index, item);
             }
-          }
-        }, _confirmProps), {}, {
-          children: /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread(_objectSpread({}, defaultRest), omit(rest, filterKeys)), {}, {
+          },
+          ..._confirmProps,
+          children: /*#__PURE__*/_jsx(Button, {
+            ...defaultRest,
+            ..._omit(rest, filterKeys),
             type: "text",
             onClick: e => e.stopPropagation(),
             children: label || defaultLabel
-          }))
-        }), `${item === null || item === void 0 ? void 0 : item.type}${index}`) : /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread(_objectSpread({
+          })
+        }, `${item?.type}${index}`) : /*#__PURE__*/_jsx(Button, {
           className: classNames({
             'pro-form-list-tool-btn': mode === 'line',
             'pro-form-list-tool-btn-block': mode === 'block',
             'pro-form-list-tool-btn-less': mode === 'less'
-          })
-        }, defaultRest), omit(rest, filterKeys)), {}, {
+          }),
+          ...defaultRest,
+          ..._omit(rest, filterKeys),
           type: "text",
           onClick: e => {
             e.stopPropagation();
@@ -343,26 +315,28 @@ var ActionButton = props => {
             }
           },
           children: label || defaultLabel
-        }), `${item === null || item === void 0 ? void 0 : item.type}${index}`);
+        }, `${item?.type}${index}`);
       }
-      return needConfirm ? /*#__PURE__*/_jsx(Popconfirm, _objectSpread(_objectSpread({
-        title: title !== null && title !== void 0 ? title : `${locale.ProForm.formListConfirmMessage}`,
+      return needConfirm ? /*#__PURE__*/_jsx(Popconfirm, {
+        title: title ?? `${locale.ProForm.formListConfirmMessage}`,
         onCancel: e => e.stopPropagation(),
-        onConfirm: () => customClick(_onClick, index)
-      }, _confirmProps), {}, {
-        children: /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({}, omit(rest, filterKeys)), {}, {
+        onConfirm: () => customClick(_onClick, index),
+        ..._confirmProps,
+        children: /*#__PURE__*/_jsx(Button, {
+          ..._omit(rest, filterKeys),
           type: "text",
           onClick: e => e.stopPropagation(),
           children: label
-        }))
-      }), `${item === null || item === void 0 ? void 0 : item.type}${index}`) : /*#__PURE__*/_createElement(Button, _objectSpread(_objectSpread({}, omit(rest, filterKeys)), {}, {
-        key: `${item === null || item === void 0 ? void 0 : item.type}${index}`,
+        })
+      }, `${item?.type}${index}`) : /*#__PURE__*/_createElement(Button, {
+        ..._omit(rest, filterKeys),
+        key: `${item?.type}${index}`,
         type: "text",
         onClick: e => {
           e.stopPropagation();
           customClick(_onClick, index);
         }
-      }), label);
+      }, label);
     })
   });
 };

package/es/ProForm/components/combination/FormList/components/BlockFields.js

@@ -1,44 +1,45 @@
+import _isFunction from "lodash/isFunction";
 import { Row, Space } from 'antd';
 import React, { useMemo } from 'react';
-import { isFunction } from 'lodash';
 import classNames from 'classnames';
 import ActionButton from "./ActionButton";
 import RenderFields from "../../../render/RenderFields";
 import ProCollapse from "../../../../../ProLayout/components/ProCollapse";
 import { memoWith } from "../utils";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-var MemoRenderFields = /*#__PURE__*/React.memo(RenderFields, memoWith);
-var BlockFields = props => {
-  var title = props.title,
-    mode = props.mode,
-    index = props.index,
-    form = props.form,
-    namePath = props.namePath,
-    min = props.min,
-    max = props.max,
-    fields = props.fields,
-    operation = props.operation,
-    field = props.field,
-    actionProps = props.actionProps,
-    columns = props.columns,
-    colProps = props.colProps,
-    disabled = props.disabled,
-    isView = props.isView,
-    _props$level = props.level,
-    level = _props$level === void 0 ? '2' : _props$level,
-    towCollapse = props.towCollapse,
-    id = props.id,
-    diffConfig = props.diffConfig,
-    hideStartEndActionProps = props.hideStartEndActionProps,
-    titlePosition = props.titlePosition;
-  var _title = useMemo(() => {
-    if (isFunction(title)) {
-      var record = form.getFieldValue(namePath);
+const MemoRenderFields = /*#__PURE__*/React.memo(RenderFields, memoWith);
+const BlockFields = props => {
+  const {
+    title,
+    mode,
+    index,
+    form,
+    namePath,
+    min,
+    max,
+    fields,
+    operation,
+    field,
+    actionProps,
+    columns,
+    colProps,
+    disabled,
+    isView,
+    level = '2',
+    towCollapse,
+    id,
+    diffConfig,
+    hideStartEndActionProps,
+    titlePosition
+  } = props;
+  const _title = useMemo(() => {
+    if (_isFunction(title)) {
+      const record = form.getFieldValue(namePath);
       return title(record, index, form);
     }
     return title;
   }, [title, index]);
-  var cls = classNames({
+  const cls = classNames({
     [`pro-form-list-mode-${mode}`]: mode === 'block' || mode === 'line' || mode === 'less',
     'pro-form-list-title-left': titlePosition === 'left'
   });

package/es/ProForm/components/combination/FormList/components/BlockTitle.js

@@ -1,12 +1,14 @@
+import _isFunction from "lodash/isFunction";
 import React from 'react';
-import { isFunction } from 'lodash';
 import { jsx as _jsx } from "react/jsx-runtime";
-var BlockTitle = props => {
-  var mode = props.mode,
-    namePath = props.namePath,
-    index = props.index,
-    form = props.form,
-    title = props.title;
+const BlockTitle = props => {
+  const {
+    mode,
+    namePath,
+    index,
+    form,
+    title
+  } = props;
   if (mode !== 'block') {
     return null;
   }
@@ -16,9 +18,9 @@ var BlockTitle = props => {
   if ( /*#__PURE__*/React.isValidElement(title)) {
     return title;
   }
-  var titleContent = title;
-  if (isFunction(title)) {
-    var record = form.getFieldValue(namePath);
+  let titleContent = title;
+  if (_isFunction(title)) {
+    const record = form.getFieldValue(namePath);
     titleContent = title(record, index, form);
   }
   return /*#__PURE__*/_jsx("div", {