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

package/lib/ProForm/components/render/CustomComponentViewWrapper.js

@@ -0,0 +1,127 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _antd = require("antd");
+var _lodash = require("lodash");
+var _Container = _interopRequireDefault(require("../Container"));
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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); }
+/**
+ * 自定义组件视图模式包装器
+ * 用于处理自定义组件在 isView 模式下的渲染逻辑
+ */
+var CustomComponentViewWrapper = props => {
+  var formItemProps = props.formItemProps,
+    internalItemRender = props.internalItemRender,
+    className = props.className,
+    style = props.style,
+    _props$filterFormItem = props.filterFormItemKey,
+    filterFormItemKey = _props$filterFormItem === void 0 ? [] : _props$filterFormItem,
+    form = props.form,
+    name = props.name,
+    isView = props.isView,
+    viewRender = props.viewRender,
+    originComponent = props.originComponent,
+    viewEmpty = props.viewEmpty,
+    otherProps = props.otherProps,
+    component = props.component,
+    AutoComponent = props.AutoComponent,
+    children = props.children;
+
+  // 判断是否应该使用自定义组件视图渲染
+  var shouldUseViewRender = isView && viewRender && originComponent && (typeof component === 'function' && ! /*#__PURE__*/_react.default.isValidElement(component) || typeof AutoComponent === 'function' && ! /*#__PURE__*/_react.default.isValidElement(AutoComponent));
+
+  // 如果不满足条件，直接返回 children 包装在 Form.Item 中
+  if (!shouldUseViewRender) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, _objectSpread(_objectSpread({}, (0, _lodash.omit)(formItemProps, filterFormItemKey)), {}, {
+      // @ts-ignore
+      _internalItemRender: internalItemRender,
+      className: className,
+      style: style,
+      children: children
+    }));
+  }
+
+  // 满足条件时，创建 child 函数用于视图渲染
+  var createViewRenderChild = formItemValue => {
+    var _otherProps$namePath;
+    // 在 Form.Item 的 children 函数中获取值
+    var value = formItemValue !== undefined ? formItemValue : form.getFieldValue(name);
+    var record = form.getFieldsValue();
+    var index;
+    // FormList场景
+    if (Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.namePath) && otherProps !== null && otherProps !== void 0 && (_otherProps$namePath = otherProps.namePath) !== null && _otherProps$namePath !== void 0 && _otherProps$namePath.length) {
+      var _otherProps$namePath2;
+      index = otherProps === null || otherProps === void 0 ? void 0 : otherProps.namePath[(otherProps === null || otherProps === void 0 || (_otherProps$namePath2 = otherProps.namePath) === null || _otherProps$namePath2 === void 0 ? void 0 : _otherProps$namePath2.length) - 1];
+    }
+    var viewRenderResult = viewRender === null || viewRender === void 0 ? void 0 : viewRender(value, record, {
+      form,
+      index,
+      namePath: otherProps === null || otherProps === void 0 ? void 0 : otherProps.namePath
+    });
+
+    // 如果 viewRender 返回的是 React 元素，直接使用
+    if ( /*#__PURE__*/_react.default.isValidElement(viewRenderResult)) {
+      return viewRenderResult;
+    }
+    if ( /*#__PURE__*/_react.default.isValidElement(originComponent)) {
+      // 如果 viewRender 返回的不是 React 元素（如字符串、数字），但有 originComponent
+      // 使用 Container 组件来显示值，与标准 Input 组件在 isView 模式下的行为一致
+      var viewValue = viewRenderResult !== undefined && viewRenderResult !== null ? viewRenderResult : value;
+      // 使用 Container 组件显示值，这是标准组件在 isView 模式下的做法
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
+        viewEmpty: viewEmpty || '-',
+        children: viewValue
+      });
+    }
+    // 如果都不是，显示 viewRender 的结果（可能是字符串、数字等）
+    return viewRenderResult;
+  };
+
+  // 当 child 是函数且 Form.Item 有 name 时，使用 shouldUpdate 来监听字段值变化
+  if (!name) {
+    // 如果没有 name，直接渲染 child
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, _objectSpread(_objectSpread({}, (0, _lodash.omit)(formItemProps, filterFormItemKey)), {}, {
+      // @ts-ignore
+      _internalItemRender: internalItemRender,
+      className: className,
+      style: style,
+      children: createViewRenderChild(undefined)
+    }));
+  }
+
+  // 外层 Form.Item 用于监听字段值变化
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, {
+    shouldUpdate: (prevValues, currentValues) => {
+      // 监听当前字段的值变化
+      var prevValue = prevValues === null || prevValues === void 0 ? void 0 : prevValues[name];
+      var currentValue = currentValues === null || currentValues === void 0 ? void 0 : currentValues[name];
+      return prevValue !== currentValue;
+    },
+    noStyle: true,
+    children: () => {
+      // 在 shouldUpdate 的 children 函数中获取表单值
+      var value = form.getFieldValue(name);
+      // 调用 child 函数获取渲染结果
+      var renderResult = createViewRenderChild(value);
+      // 返回实际的 Form.Item，包含 name 和其他属性
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, _objectSpread(_objectSpread({}, (0, _lodash.omit)(formItemProps, filterFormItemKey)), {}, {
+        // @ts-ignore
+        _internalItemRender: internalItemRender,
+        className: className,
+        style: style,
+        children: renderResult
+      }));
+    }
+  });
+};
+var _default = exports.default = CustomComponentViewWrapper;

package/lib/ProForm/components/render/Render.js

@@ -1,35 +1,43 @@
 "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 _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _reactSvg = require("react-svg");
+var _icons = require("@ant-design/icons");
 var _lodash = require("lodash");
 var _useShouldUpdate2 = _interopRequireDefault(require("../../utils/useShouldUpdate"));
 var _index = require("../../utils/index");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _transformNames = _interopRequireDefault(require("../../utils/transformNames"));
 var _valueType = _interopRequireDefault(require("../../utils/valueType"));
-var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
 var _useRules = _interopRequireDefault(require("../../utils/useRules"));
 var _ConfirmWrapper = _interopRequireDefault(require("./ConfirmWrapper"));
 var _ChangedWrapper = _interopRequireDefault(require("./ChangedWrapper"));
+var _CustomComponentViewWrapper = _interopRequireDefault(require("./CustomComponentViewWrapper"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip", "validateFirst"];
+var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip", "validateFirst"],
+  _excluded2 = ["width"];
 /* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
+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 _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); }
+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; }
 var Render = props => {
-  var _ref2, _ref3, _ref4, _ref5, _otherProps$names3;
+  var _ref2, _ref3, _ref4, _ref5, _fieldProps$style, _otherProps$names3;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -66,7 +74,7 @@ var Render = props => {
     tooltip = formItemProps.tooltip,
     _formItemProps$valida = formItemProps.validateFirst,
     validateFirst = _formItemProps$valida === void 0 ? true : _formItemProps$valida,
-    otherFormItemProps = (0, _objectWithoutProperties2.default)(formItemProps, _excluded);
+    otherFormItemProps = _objectWithoutProperties(formItemProps, _excluded);
 
   // 更新show & disabled & rules
   var _useShouldUpdate = (0, _useShouldUpdate2.default)({
@@ -133,7 +141,7 @@ var Render = props => {
     if (!valueType) {
       return {};
     }
-    var params = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), otherFormItemProps);
+    var params = _objectSpread(_objectSpread({}, otherProps), otherFormItemProps);
     return (0, _lodash.isFunction)(_valueType.default[valueType]) ? _valueType.default[valueType](params) : {};
   };
 
@@ -142,7 +150,7 @@ var Render = props => {
    * 存在names通过transformNames转换平铺处理
    * 没有默认走valueType的处理
    */
-  var transforms = Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.names) ? (0, _transformNames.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherFormItemProps), valueTypeTransform()),
+  var transforms = Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.names) ? (0, _transformNames.default)(_objectSpread(_objectSpread({}, otherFormItemProps), valueTypeTransform()),
   // 合并valueType的transform
   form, otherProps.names, namesStr, otherProps.type) : valueTypeTransform();
 
@@ -160,8 +168,8 @@ var Render = props => {
     required: typeof labelRequired === 'boolean' ? labelRequired : _required || Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.some(item => item === null || item === void 0 ? void 0 : item.required)) || false
   }, otherProps.isView && !requiredOnView ? {
     required: false
-  } : null, (0, _objectSpread2.default)({}, (0, _index.isTrim)(type, trim, (0, _ProConfigProvider.useProConfig)())), // 优先取传进来的，其次取ProConfigProvider配置的
-  (0, _objectSpread2.default)({}, (0, _index.isUpperCase)(type, upperCase)), {
+  } : null, _objectSpread({}, (0, _index.isTrim)(type, trim, (0, _ProConfigProvider.useProConfig)())), // 优先取传进来的，其次取ProConfigProvider配置的
+  _objectSpread({}, (0, _index.isUpperCase)(type, upperCase)), {
     validateFirst
   },
   // 当某一规则校验不通过时，是否停止剩下的规则的校验
@@ -182,7 +190,17 @@ var Render = props => {
   /**
    * 最新fieldProps: 更新后的组件Props
    */
-  var lastComponentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), _fieldProps), {}, {
+  // 灵活模式：当存在 flexibleGroupProps 时，从 _fieldProps.style 中移除 width，避免透传到组件
+  var flexibleGroupProps = otherProps === null || otherProps === void 0 ? void 0 : otherProps.flexibleGroupProps;
+  var adjustedFieldProps = flexibleGroupProps && _fieldProps !== null && _fieldProps !== void 0 && (_fieldProps$style = _fieldProps.style) !== null && _fieldProps$style !== void 0 && _fieldProps$style.width ? _objectSpread(_objectSpread({}, _fieldProps), {}, {
+    style: (() => {
+      var _fieldProps$style2 = _fieldProps.style,
+        width = _fieldProps$style2.width,
+        restStyle = _objectWithoutProperties(_fieldProps$style2, _excluded2);
+      return restStyle;
+    })()
+  }) : _fieldProps;
+  var lastComponentProps = _objectSpread(_objectSpread(_objectSpread({}, componentProps), adjustedFieldProps), {}, {
     disabled: lastDisabled,
     desensitization: _desensitization
   });
@@ -320,13 +338,13 @@ var Render = props => {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _len3,
         args,
         _key3,
         _args,
         _args3 = arguments;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             for (_len3 = _args3.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
@@ -355,7 +373,7 @@ var Render = props => {
     var lastComponentPropsFilter = ['onFieldChange', 'disabledStrictly'];
 
     // 表单渲染 start
-    var childProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props), (0, _lodash.omit)(lastComponentProps, lastComponentPropsFilter)), {}, {
+    var childProps = _objectSpread(_objectSpread(_objectSpread({}, AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props), (0, _lodash.omit)(lastComponentProps, lastComponentPropsFilter)), {}, {
       // @ts-ignore
       otherProps,
       onChange: handleChange,
@@ -409,8 +427,10 @@ var Render = props => {
     if (originComponent) {
       delete childProps.otherProps;
     }
-    var child = /*#__PURE__*/_react.default.isValidElement(AutoComponent) ? ( /*#__PURE__*/_react.default.cloneElement(AutoComponent, childProps)) : /*#__PURE__*/(0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, [...lastComponentPropsFilter, 'debounceWait'])), {}, {
-      otherProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
+
+    // 正常渲染逻辑
+    var child = /*#__PURE__*/_react.default.isValidElement(AutoComponent) ? ( /*#__PURE__*/_react.default.cloneElement(AutoComponent, childProps)) : /*#__PURE__*/(0, _jsxRuntime.jsx)(AutoComponent, _objectSpread(_objectSpread({}, (0, _lodash.omit)(lastComponentProps, [...lastComponentPropsFilter, 'debounceWait'])), {}, {
+      otherProps: _objectSpread(_objectSpread({}, otherProps), {}, {
         show,
         disabled: lastDisabled,
         required
@@ -419,7 +439,7 @@ var Render = props => {
       onBlur: handleBlur
     }));
     if (confirm) {
-      child = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      child = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ConfirmWrapper.default, _objectSpread(_objectSpread({
         confirm: confirm
       }, childProps), {}, {
         children: child
@@ -427,17 +447,16 @@ var Render = props => {
     }
 
     // 表单提示
+
     if (tooltip) {
       _otherFormItemProps.tooltip = (0, _lodash.isString)(tooltip) ? {
         title: tooltip,
-        icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
-          className: "pro-icon-tip",
-          src: _tip.default
+        icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.QuestionCircleOutlined, {
+          className: "pro-icon-tip"
         })
-      } : (0, _objectSpread2.default)({
-        icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
-          className: "pro-icon-tip",
-          src: _tip.default
+      } : _objectSpread({
+        icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.QuestionCircleOutlined, {
+          className: "pro-icon-tip"
         })
       }, tooltip);
     }
@@ -447,18 +466,18 @@ var Render = props => {
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';
-      colProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
+      colProps = _objectSpread(_objectSpread({}, colProps), {}, {
         span: lessMode ? colProps.span : 24 // 默认占一行
       });
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, _objectSpread(_objectSpread({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
         // @ts-ignore
         _internalItemRender: internalItemRender,
         className: _className,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.List, _objectSpread(_objectSpread({
           name: _otherFormItemProps.name
         }, (0, _lodash.omit)(_otherFormItemProps, ['rules'])), {}, {
           children: (fields, operation, meta) => {
-            return /*#__PURE__*/(0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, lastComponentPropsFilter)), {}, {
+            return /*#__PURE__*/(0, _jsxRuntime.jsx)(AutoComponent, _objectSpread(_objectSpread({}, (0, _lodash.omit)(lastComponentProps, lastComponentPropsFilter)), {}, {
               otherProps: otherProps,
               fields: fields,
               operation: operation,
@@ -471,7 +490,7 @@ var Render = props => {
 
     //  默认占据一行
     if (['ProCollapse', 'Container'].includes(type)) {
-      colProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
+      colProps = _objectSpread(_objectSpread({}, colProps), {}, {
         span: 24 // 默认占一行
       });
     }
@@ -501,10 +520,42 @@ var Render = props => {
         children: child
       });
     }
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
+
+    // 灵活模式样式处理：从 flexibleGroupProps 获取样式
+    var flexibleGroupProps = otherProps === null || otherProps === void 0 ? void 0 : otherProps.flexibleGroupProps;
+    var finalClassName = flexibleGroupProps !== null && flexibleGroupProps !== void 0 && flexibleGroupProps.className ? (0, _classnames.default)(_className, flexibleGroupProps.className) : _className;
+    var finalStyle = flexibleGroupProps === null || flexibleGroupProps === void 0 ? void 0 : flexibleGroupProps.style;
+
+    // 判断是否应该使用自定义组件视图包装器
+    var shouldUseCustomViewWrapper = (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView) && (props.viewRender || viewRender) && (props.originComponent || originComponent) && (typeof component === 'function' && ! /*#__PURE__*/_react.default.isValidElement(component) || typeof AutoComponent === 'function' && ! /*#__PURE__*/_react.default.isValidElement(AutoComponent));
+
+    // 如果应该使用自定义组件视图包装器，直接返回
+    if (shouldUseCustomViewWrapper) {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomComponentViewWrapper.default, {
+        formItemProps: _otherFormItemProps,
+        internalItemRender: internalItemRender,
+        className: finalClassName,
+        style: finalStyle,
+        filterFormItemKey: filterFormItemKey,
+        form: form,
+        name: _otherFormItemProps.name,
+        isView: otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView,
+        viewRender: props.viewRender || viewRender,
+        originComponent: props.originComponent || originComponent,
+        viewEmpty: otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewEmpty,
+        otherProps: otherProps,
+        component: component,
+        AutoComponent: AutoComponent,
+        children: child
+      });
+    }
+
+    // 正常情况：使用标准的 Form.Item
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, _objectSpread(_objectSpread({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
-      className: _className,
+      className: finalClassName,
+      style: finalStyle,
       children: child
     }));
   };
@@ -524,10 +575,15 @@ var Render = props => {
       }, name);
     }) : null]
   });
+
+  // 灵活模式：当存在 flexibleGroupProps 时，不包裹 Col，直接返回 FormItem
+  if (otherProps !== null && otherProps !== void 0 && otherProps.flexibleGroupProps) {
+    return FormItem;
+  }
   if (formItemProps !== null && formItemProps !== void 0 && formItemProps.parentNames) {
     return FormItem;
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Col, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Col, _objectSpread(_objectSpread({}, colProps), {}, {
     children: FormItem
   }));
 };

package/lib/ProForm/components/render/RenderFields.js

@@ -1,13 +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 _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _lodash = require("lodash");
 var _Render = _interopRequireDefault(require("./Render"));
@@ -19,6 +15,16 @@ var _locale = _interopRequireDefault(require("../../../locale"));
 var _processDependencies = _interopRequireDefault(require("../../utils/processDependencies"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "onDiff", "clearNotShow", "required", "confirm", "desensitization", "span"];
+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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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); }
+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; }
 var RenderFields = props => {
   var isView = props.isView,
     _props$columns = props.columns,
@@ -87,7 +93,7 @@ var RenderFields = props => {
       confirm = column.confirm,
       desensitization = column.desensitization,
       span = column.span,
-      otherFormItemProps = (0, _objectWithoutProperties2.default)(column, _excluded);
+      otherFormItemProps = _objectWithoutProperties(column, _excluded);
     var component = column.component;
     var _isView = typeof column.isView === 'boolean' ? column.isView : isView;
     var defaultProps = (0, _getDefaultProps.getDefaultProps)(column);
@@ -95,7 +101,7 @@ var RenderFields = props => {
     var processedDeps = (0, _processDependencies.default)(column.dependencies);
 
     // 允许formItem的属性放在column最外层 并优先级高于 formItemProps 内部参数
-    var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), formItemProps), otherFormItemProps), {}, {
+    var _formItemProps = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultProps), formItemProps), otherFormItemProps), {}, {
       required: columnRequired !== null && columnRequired !== void 0 ? columnRequired : required,
       clearNotShow,
       dependencies: processedDeps
@@ -162,11 +168,11 @@ var RenderFields = props => {
     };
 
     // 表单组件Props 兼容2.0版本
-    var _fieldProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formItemChildProps), fieldProps);
+    var _fieldProps = _objectSpread(_objectSpread({}, formItemChildProps), fieldProps);
     if ((0, _lodash.isBoolean)(formDisabled)) {
       _fieldProps.disabled = formDisabled;
     }
-    var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    var componentProps = _objectSpread(_objectSpread({
       placeholder: placeholderHandle()
     }, _fieldProps), {}, {
       disabled: comDisabled
@@ -195,7 +201,7 @@ var RenderFields = props => {
     }
     var _colProps = span ? {
       span
-    } : (0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultColProps), colProps);
+    } : _objectSpread(_objectSpread({}, defaultColProps), colProps);
 
     // 其余参数收进对象里传给子组件 componentProps只包含子组件参数
     var otherProps = {

package/lib/ProForm/index.js

@@ -1,14 +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 = exports.ProFormProvider = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _icons = require("@ant-design/icons");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -27,6 +22,22 @@ var _FormsProvider = _interopRequireWildcard(require("../FormsProvider"));
 var _ProStep = require("../ProStep");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize", "stopOnFirstError", "shouldUpdateDebounce"];
+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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+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; }
 var ProForm = (props, ref) => {
   var _localStorage, _ref3;
   var _props$mode = props.mode,
@@ -74,7 +85,7 @@ var ProForm = (props, ref) => {
     stopOnFirstError = _props$stopOnFirstErr === void 0 ? false : _props$stopOnFirstErr,
     _props$shouldUpdateDe = props.shouldUpdateDebounce,
     shouldUpdateDebounce = _props$shouldUpdateDe === void 0 ? 200 : _props$shouldUpdateDe,
-    otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+    otherProps = _objectWithoutProperties(props, _excluded);
   var config = (0, _ProConfigProvider.useProConfig)('ProForm');
   // source: 用于区分是哪个组件调用，用于错误提示
   var _ref = (0, _ProDrawerForm.useProDrawerFormContext)() || {},
@@ -90,7 +101,7 @@ var ProForm = (props, ref) => {
       formKey,
       source: source || stepSource || 'ProForm'
     }),
-    _useForm2 = (0, _slicedToArray2.default)(_useForm, 1),
+    _useForm2 = _slicedToArray(_useForm, 1),
     form = _useForm2[0];
 
   // 保存内部配置
@@ -105,7 +116,7 @@ var ProForm = (props, ref) => {
       value: expandOpen,
       onChange: expandOpenChange
     }),
-    _useControlled2 = (0, _slicedToArray2.default)(_useControlled, 2),
+    _useControlled2 = _slicedToArray(_useControlled, 2),
     openState = _useControlled2[0],
     setOpenState = _useControlled2[1];
   var _getLayout = (0, _index.getLayout)({
@@ -211,7 +222,7 @@ var ProForm = (props, ref) => {
     // 展开折叠按钮
     var expandEle = expandRender();
     var hasElement = footerEle || expandEle;
-    return hasElement ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Col, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
+    return hasElement ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Col, _objectSpread(_objectSpread({}, colProps), {}, {
       className: footerCls,
       children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
         align: "center",
@@ -230,7 +241,7 @@ var ProForm = (props, ref) => {
       otherProps.layout = otherProps.layout || 'vertical';
     }
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Form, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Form, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
     onKeyPress: event => {
       if (!submitOnEnter) return;
       if (event.key === 'Enter') {
@@ -244,7 +255,7 @@ var ProForm = (props, ref) => {
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,
     initialValues: _initialValues,
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Row, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Row, _objectSpread(_objectSpread({
       gutter: 24
     }, rowProps), {}, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_RenderFields.default, {
@@ -294,7 +305,7 @@ var ProFormProvider = props => {
 
       var prefix = name.slice(0, name.length - 1);
       return namesList.map((nameItem, index) => {
-        return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+        return _objectSpread(_objectSpread({}, item), {}, {
           name: [...prefix, ...nameItem],
           // 拼接前缀 组成完整name
           value: value[index]

package/lib/ProForm/propsType.d.ts

@@ -47,6 +47,11 @@ export interface ProFormOtherType {
     isDiffChange?: boolean;
     diffConfig?: DiffConfigType;
     shouldUpdateDebounce?: number;
+    /** 灵活模式 Group 相关属性，独立管理灵活模式配置 */
+    flexibleGroupProps?: {
+        className?: string;
+        style?: React.CSSProperties;
+    };
 }
 export interface DiffConfigType<Values = any> {
     /** 比对原始数据源 */
@@ -103,6 +108,8 @@ export interface ProFormType<Values = any> extends FormProps<Values> {
     stopOnFirstError?: boolean;
     /** shouldUpdate防抖延迟时间，默认500ms，设置为0则不防抖 */
     shouldUpdateDebounce?: number;
+    /** label 对齐方式 */
+    labelAlign?: 'left' | 'right';
 }
 export interface TransformType<T = any> {
     normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;