@zat-design/sisyphus-react 4.0.0-beta.8 → 4.0.0

package/lib/ProForm/components/combination/FormList/components/ToolbarButton.js

@@ -1,15 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _antd = require("antd");
 var _icons = require("@ant-design/icons");
 var _lodash = require("lodash");
@@ -18,7 +12,19 @@ var _locale = _interopRequireDefault(require("../../../../../locale"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["label", "onClick", "onHandle", "type"],
   _excluded2 = ["onClick", "label"];
-/* eslint-disable react/no-array-index-key */
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+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); } /* eslint-disable react/no-array-index-key */
 var actions = {
   add: {
     onClick: (value, _ref) => {
@@ -50,7 +56,7 @@ var ToolbarButton = props => {
     var _props$toolbarProps;
     // 兼容 actionType 和 type
     var _toolbarProps = (_props$toolbarProps = props.toolbarProps) === null || _props$toolbarProps === void 0 ? void 0 : _props$toolbarProps.map(item => {
-      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+      return _objectSpread(_objectSpread({}, item), {}, {
         // @ts-ignore
         type: item.actionType || item.type
       });
@@ -61,9 +67,9 @@ var ToolbarButton = props => {
     return _toolbarProps;
   }, [props.toolbarProps]);
   var handleClick = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(defaultCallback, callback, item) {
-      var value, data;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, item) {
+      var value, data, insertIndex, _insertIndex;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             value = form.getFieldValue(namePath);
@@ -71,7 +77,8 @@ var ToolbarButton = props => {
             return callback === null || callback === void 0 ? void 0 : callback(value, {
               operation,
               form,
-              namePath
+              namePath,
+              index: (value === null || value === void 0 ? void 0 : value.length) || 0
             });
           case 3:
             data = _context.sent;
@@ -79,15 +86,42 @@ var ToolbarButton = props => {
               _context.next = 7;
               break;
             }
-            defaultCallback === null || defaultCallback === void 0 || defaultCallback(value, {
-              operation,
-              form,
-              namePath
-            });
+            if ((item === null || item === void 0 ? void 0 : item.type) === 'add') {
+              // 如果有 addIndex 配置，使用它计算插入位置
+              if (item.addIndex) {
+                insertIndex = typeof item.addIndex === 'function' ? item.addIndex(value, {
+                  namePath,
+                  form,
+                  operation,
+                  index: (value === null || value === void 0 ? void 0 : value.length) || 0
+                }) : item.addIndex;
+                operation.add(data, insertIndex);
+              } else {
+                operation.add(data); // 默认插入到末尾
+              }
+            } else {
+              defaultCallback === null || defaultCallback === void 0 || defaultCallback(value, {
+                operation,
+                form,
+                namePath,
+                index: (value === null || value === void 0 ? void 0 : value.length) || 0
+              });
+            }
             return _context.abrupt("return");
           case 7:
             if ((item === null || item === void 0 ? void 0 : item.type) === 'add' && data) {
-              operation.add(data);
+              // 如果有 addIndex 配置，使用它计算插入位置
+              if (item.addIndex) {
+                _insertIndex = typeof item.addIndex === 'function' ? item.addIndex(value, {
+                  namePath,
+                  form,
+                  operation,
+                  index: (value === null || value === void 0 ? void 0 : value.length) || 0
+                }) : item.addIndex;
+                operation.add(data, _insertIndex);
+              } else {
+                operation.add(data); // 默认插入到末尾
+              }
             }
           case 8:
           case "end":
@@ -104,7 +138,8 @@ var ToolbarButton = props => {
     callback === null || callback === void 0 || callback(value, {
       operation,
       form,
-      namePath
+      namePath,
+      index: 0
     });
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
@@ -122,25 +157,25 @@ var ToolbarButton = props => {
         _onClick2 = item.onClick,
         onHandle = item.onHandle,
         type = item.type,
-        rest = (0, _objectWithoutProperties2.default)(item, _excluded);
+        rest = _objectWithoutProperties(item, _excluded);
       var _onClick = _onClick2 || onHandle;
       if (type === 'add') {
         if (disabled || isView) return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
         var _actions$type = actions[type],
           internalOnClick = _actions$type.onClick,
           defaultLabel = _actions$type.label,
-          defaultRest = (0, _objectWithoutProperties2.default)(_actions$type, _excluded2);
+          defaultRest = _objectWithoutProperties(_actions$type, _excluded2);
         // 大于等于max不可新增
         if (max && max <= fields.length && type === 'add') {
           return false;
         }
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, actions[type]), (0, _lodash.omit)(rest, filterKeys)), {}, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, _objectSpread(_objectSpread(_objectSpread({}, actions[type]), (0, _lodash.omit)(rest, filterKeys)), {}, {
           type: "link",
           onClick: () => handleClick(internalOnClick, _onClick, item),
           children: label || defaultLabel
         }), `${type}${index}`);
       }
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(rest, filterKeys)), {}, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, _objectSpread(_objectSpread({}, (0, _lodash.omit)(rest, filterKeys)), {}, {
         type: "link",
         onClick: () => customClick(_onClick2, item),
         children: label

package/lib/ProForm/components/combination/FormList/index.js

@@ -1,12 +1,9 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
 var _core = require("@dnd-kit/core");
@@ -21,6 +18,14 @@ var _Empty = _interopRequireDefault(require("./components/Empty"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+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); }
 var FormList = (props, ref) => {
   var columns = props.columns,
     min = props.min,
@@ -34,32 +39,69 @@ var FormList = (props, ref) => {
     _props$span = props.span,
     span = _props$span === void 0 ? 8 : _props$span,
     disabled = props.disabled,
-    emptyBtnText = props.emptyBtnText;
-  var _fields = fields.map(item => (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+    emptyBtnText = props.emptyBtnText,
+    hideStartEndActionProps = props.hideStartEndActionProps,
+    titlePosition = props.titlePosition,
+    className = props.className;
+  var _fields = fields.map(item => _objectSpread(_objectSpread({}, item), {}, {
     key: String(item.key)
   }));
   var _ref = _ProForm.default.useFieldProps() || {},
     form = _ref.form,
     name = _ref.name,
     isView = _ref.isView,
-    diffConfig = _ref.diffConfig;
+    diffConfig = _ref.diffConfig,
+    namePath = _ref.namePath;
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
   var errors = meta.errors;
-  var _namePath = (0, _utils.toArray)(name);
+  var _namePath = namePath ? [...namePath.slice(0, -1), ...(0, _utils.toArray)(name)] : (0, _utils.toArray)(name);
   var orgValues = (0, _lodash.get)(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues, name);
-  var _diffConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, diffConfig), {}, {
+  var _diffConfig = _objectSpread(_objectSpread({}, diffConfig), {}, {
     originalValues: diffConfig !== null && diffConfig !== void 0 && diffConfig.originalValues && isDiffAll ? orgValues || [] : orgValues
   });
   var processColumns = (0, _react.useCallback)((fieldName, namePath) => {
     return columns.map(item => {
+      // 如果是灵活模式的 Group，需要给 children 添加参数
+      if (!(0, _utils2.isLegacyMode)(item) && (item === null || item === void 0 ? void 0 : item.type) === 'Group') {
+        var fieldProps = item === null || item === void 0 ? void 0 : item.fieldProps;
+        var children = fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.children;
+        if (children) {
+          var childrenArray = Array.isArray(children) ? children : [children];
+          // 给每个 child 添加 index、name、namePath、listName 参数
+          var processedChildren = childrenArray.map(child => {
+            var childName = child === null || child === void 0 ? void 0 : child.name;
+            return _objectSpread(_objectSpread({}, child), {}, {
+              index: fieldName,
+              name: [fieldName, ...(0, _utils.toArray)(childName)],
+              namePath,
+              listName: childName ? [...namePath, ...(0, _utils.toArray)(childName)] : undefined,
+              source: 'FormList'
+            });
+          });
+
+          // 创建新的 fieldProps，包含处理后的 children
+          var newFieldProps = _objectSpread(_objectSpread({}, fieldProps), {}, {
+            children: Array.isArray(children) ? processedChildren : processedChildren[0]
+          });
+
+          // 创建新的 column，使用新的 fieldProps
+          var _column = _objectSpread(_objectSpread({}, item), {}, {
+            fieldProps: newFieldProps,
+            index: fieldName,
+            label: mode === 'less' ? undefined : item.label
+          });
+          return _column;
+        }
+      }
+
       // names的name处理
       var _name = Array.isArray(item === null || item === void 0 ? void 0 : item.names) ? [fieldName, (0, _utils2.namesPathTransform)({
         names: item === null || item === void 0 ? void 0 : item.names,
         prefixNamePath: namePath,
         type: item.type
       })] : [fieldName, ...(0, _utils.toArray)(item.name)];
-      var column = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+      var column = _objectSpread(_objectSpread({}, item), {}, {
         name: _name,
         names: item !== null && item !== void 0 && item.names ? item.names.map(nameItem => {
           // 传给Group的names会被渲染成真实FormItem 不能传完整name
@@ -67,12 +109,12 @@ var FormList = (props, ref) => {
         }) : item.names,
         index: fieldName,
         namePath,
-        listName: [...namePath, item.name],
+        listName: item.name ? [...namePath, ...(0, _utils.toArray)(item.name)] : undefined,
         label: mode === 'less' ? undefined : item.label
       });
       return column;
     });
-  }, [columns]);
+  }, [columns, mode]);
   (0, _react.useImperativeHandle)(ref, () => {
     return {
       operation
@@ -87,65 +129,71 @@ var FormList = (props, ref) => {
       props.operation.move(activeIndex, overIndex);
     }
   };
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_core.DndContext, {
-    onDragEnd: handleDragEnd,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_sortable.SortableContext, {
-      items: _fields.map(item => ({
-        id: item.key
-      })),
-      strategy: _sortable.verticalListSortingStrategy,
-      children: [_fields.map((field, index) => {
-        var namePath = [..._namePath, field.name];
-        var _columns = processColumns(index, namePath);
-        return mode === 'block' ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_BlockFields.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-          columns: _columns,
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    className: className,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_core.DndContext, {
+      onDragEnd: handleDragEnd,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_sortable.SortableContext, {
+        items: _fields.map(item => ({
+          id: item.key
+        })),
+        strategy: _sortable.verticalListSortingStrategy,
+        children: [_fields.map((field, index) => {
+          var namePath = [..._namePath, field.name];
+          var _columns = processColumns(index, namePath);
+          return mode === 'block' ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_BlockFields.default, _objectSpread(_objectSpread({}, props), {}, {
+            columns: _columns,
+            disabled: disabled,
+            isView: isView,
+            namePath: namePath,
+            index: index,
+            field: field,
+            colProps: {
+              span
+            },
+            form: form,
+            diffConfig: _diffConfig,
+            hideStartEndActionProps: hideStartEndActionProps,
+            titlePosition: titlePosition
+          }), field.key) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_LineFields.default, _objectSpread(_objectSpread({
+            className: _fields.length === index + 1 ? 'pro-form-list-last' : ''
+          }, props), {}, {
+            mode: mode,
+            columns: _columns,
+            disabled: disabled,
+            isView: isView,
+            namePath: namePath,
+            index: index,
+            field: field,
+            colProps: {
+              span: mode === 'less' ? 24 : span
+            },
+            form: form,
+            diffConfig: _diffConfig,
+            hideStartEndActionProps: hideStartEndActionProps
+          }), field.key);
+        }), _fields.length === 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Empty.default, {
           disabled: disabled,
-          isView: isView,
-          namePath: namePath,
-          index: index,
-          field: field,
-          colProps: {
-            span
-          },
+          toolbarProps: toolbarProps,
+          operation: operation,
           form: form,
-          diffConfig: _diffConfig
-        }), field.key) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_LineFields.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-          className: _fields.length === index + 1 ? 'pro-form-list-last' : ''
-        }, props), {}, {
-          mode: mode,
-          columns: _columns,
+          namePath: _namePath,
+          emptyBtnText: emptyBtnText
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.ErrorList, {
+          errors: errors
+        }), toolbarProps !== false && _fields.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToolbarButton.default, {
           disabled: disabled,
           isView: isView,
-          namePath: namePath,
-          index: index,
-          field: field,
-          colProps: {
-            span: mode === 'less' ? 24 : span
-          },
+          min: min,
+          max: max,
+          length: fields.length,
+          operation: operation,
+          namePath: _namePath,
           form: form,
-          diffConfig: _diffConfig
-        }), field.key);
-      }), _fields.length === 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Empty.default, {
-        disabled: disabled,
-        toolbarProps: toolbarProps,
-        operation: operation,
-        form: form,
-        namePath: _namePath,
-        emptyBtnText: emptyBtnText
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.ErrorList, {
-        errors: errors
-      }), toolbarProps !== false && _fields.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToolbarButton.default, {
-        disabled: disabled,
-        isView: isView,
-        min: min,
-        max: max,
-        length: fields.length,
-        operation: operation,
-        namePath: _namePath,
-        form: form,
-        fields: fields,
-        toolbarProps: toolbarProps
-      })]
+          fields: fields,
+          toolbarProps: toolbarProps
+        })]
+      })
     })
   });
 };

package/lib/ProForm/components/combination/FormList/propsType.d.ts

@@ -7,9 +7,9 @@ import type { ProFormColumnType, ProFormOtherType } from '../../../propsType';
 export type TitleRender = (record: Record<string, any>, index: number, form: FormInstance) => any;
 export type TitleType = string | React.ReactNode | TitleRender;
 type Callback = (record: any, option: Pick<Option, 'namePath' | 'index' | 'operation' | 'form'>) => any | void;
-export type ToolbarCallback = (record: any, option: Pick<Option, 'namePath' | 'form' | 'operation'>) => any | void;
+export type ToolbarCallback = (record: any, option: Pick<Option, 'index' | 'namePath' | 'form' | 'operation'>) => any | void;
 export interface Option {
-    index: number;
+    index: number | undefined;
     namePath: InternalNamePath;
     form: FormInstance;
     operation: FormListOperation;
@@ -23,12 +23,14 @@ export interface ActionType extends Omit<ButtonProps, 'onClick' | 'type'> {
     confirmProps?: boolean | PopconfirmProps;
     title?: string;
     show?: boolean | ((record: any, option: Pick<Option, 'index' | 'form' | 'namePath'>) => boolean);
+    addIndex?: number | ((record: any, option: Pick<Option, 'index' | 'form' | 'namePath' | 'operation'>) => number);
 }
 export interface ToolbarActionType extends Omit<ActionType, 'actionType' | 'onHandle' | 'onClick' | 'show' | 'type'> {
     type?: 'add';
     onHandle?: ToolbarCallback;
     onClick?: ToolbarCallback;
     show?: boolean | ((record: any, option: Pick<Option, 'form' | 'namePath'>) => boolean);
+    addIndex?: number | ((record: any, option: Pick<Option, 'index' | 'form' | 'namePath' | 'operation'>) => number);
 }
 export type FormListMode = 'block' | 'line' | 'less';
 export interface FormListType {
@@ -56,6 +58,9 @@ export interface FormListType {
     draggable?: boolean;
     id?: string;
     emptyBtnText?: string;
+    hideStartEndActionProps?: [boolean, boolean];
+    titlePosition?: 'top' | 'left';
+    className?: string;
 }
 export type TypeWithRef = FormListType & React.RefAttributes<FormListRefType>;
 export interface FormListRefType {

package/lib/ProForm/components/combination/FormList/style/index.less

@@ -127,3 +127,44 @@
     }
   }
 }
+
+// 左侧标题布局样式
+.pro-form-list-mode-block.pro-form-list-title-left {
+  .@{ant-prefix}-collapse-title{
+    display: none;
+  }
+  .pro-form-list-left-title-wrapper {
+    display: flex;
+    gap: 16px;
+    align-items: flex-start;
+
+    .pro-form-list-left-title {
+      flex: 0 0 80px;
+      font-weight: 600;
+      font-size: 14px;
+      line-height: 1.4;
+      color: @zaui-text;
+      padding-top: 8px;
+    }
+
+    .pro-form-list-left-content {
+      flex: 1;
+      min-width: 0;
+    }
+  }
+
+  // 移动端响应式
+  @media (max-width: 768px) {
+    .pro-form-list-left-title-wrapper {
+      flex-direction: column;
+      gap: 8px;
+
+      .pro-form-list-left-title {
+        flex: none;
+        width: 100%;
+        padding-top: 0;
+        margin-bottom: 8px;
+      }
+    }
+  }
+}

package/lib/ProForm/components/combination/FormList/utils.d.ts

@@ -1,3 +1,9 @@
+/**
+ * 判断 Group 组件是否为传统模式（LegacyMode）
+ * @param item column 配置项
+ * @returns true 表示传统模式，false 表示灵活模式
+ */
+export declare const isLegacyMode: (item: any) => boolean;
 /**
  * namesPath生产 [['list', 0, 'min'], ['list', 0, 'max']] => list_0_min-list_0_max
  * @param names  name的集合

package/lib/ProForm/components/combination/FormList/utils.js

@@ -1,18 +1,36 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.namesPathTransform = exports.memoWith = void 0;
+exports.namesPathTransform = exports.memoWith = exports.isLegacyMode = void 0;
 var _lodash = require("lodash");
 var _react = _interopRequireDefault(require("react"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * 判断 Group 组件是否为传统模式（LegacyMode）
+ * @param item column 配置项
+ * @returns true 表示传统模式，false 表示灵活模式
+ */
+var isLegacyMode = item => {
+  var _item$otherProps;
+  if ((item === null || item === void 0 ? void 0 : item.type) !== 'Group') {
+    return true; // 非 Group 类型，不需要特殊处理，返回 true 表示按原样处理
+  }
+  // names 可能在 item.names 或 item.otherProps.names 中（参考 Group/index.tsx 的实现）
+  var names = (item === null || item === void 0 ? void 0 : item.names) || (item === null || item === void 0 || (_item$otherProps = item.otherProps) === null || _item$otherProps === void 0 ? void 0 : _item$otherProps.names);
+  // 传统模式：有 names 属性且为非空数组
+  // 灵活模式：无 names 属性或 names 为空
+  return Array.isArray(names) && names.length > 0;
+};
+
 /**
  * namesPath生产 [['list', 0, 'min'], ['list', 0, 'max']] => list_0_min-list_0_max
  * @param names  name的集合
  * @param prefixNamePath formList的name前缀
  * @returns list_0_min-list_0_max
  */
+exports.isLegacyMode = isLegacyMode;
 var namesPathTransform = _ref => {
   var names = _ref.names,
     prefixNamePath = _ref.prefixNamePath,

package/lib/ProForm/components/combination/Group/component/AddonWrapper/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -8,6 +7,7 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 require("./index.less");
 var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var AddonWrapper = props => {
   var before = props.before,
     after = props.after,

package/lib/ProForm/components/combination/Group/component/ComRender.d.ts

@@ -17,6 +17,9 @@ interface Props {
     isView?: boolean;
     getValueProps?: (value: any) => Record<string, unknown>;
     viewRender?: (props: any) => any;
+    formItemClassName?: string;
+    formItemStyle?: React.CSSProperties;
+    dependencies?: NamePath[];
 }
 /** 渲染组件 */
 declare const ComRender: React.FC<Props>;