@zat-design/sisyphus-react 4.0.0-beta.9 → 4.0.1

package/lib/ProForm/components/combination/Group/utils/index.js

@@ -0,0 +1,444 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createComponentProps = void 0;
+exports.defaultGetValueFromEvent = defaultGetValueFromEvent;
+exports.valueFromEventWrapper = exports.validateChildren = exports.useFormItemProps = exports.transformNamesString = exports.isUpperCase = exports.insertSeparator = exports.getValueTypeTrans = exports.getValueMiddleware = exports.getReactiveProps = void 0;
+var _antd = require("antd");
+var _react = _interopRequireDefault(require("react"));
+var _lodash = require("lodash");
+var _utils = require("@zat-design/utils");
+var _valueType = _interopRequireDefault(require("../../../../utils/valueType"));
+var _locale = _interopRequireDefault(require("../../../../../locale"));
+var _utils2 = require("../../../../utils");
+var _rulesCreator = require("../../../../utils/rulesCreator");
+var _jsxRuntime = require("react/jsx-runtime");
+var _excluded = ["name", "label", "rules", "required", "dependencies", "tooltip", "extra", "validateFirst", "disabled", "type", "fieldProps"],
+  _excluded2 = ["normalize", "getValueProps"];
+/* eslint-disable no-lonely-if */
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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; }
+/**
+ * 插入间隔符
+ * @param columns 表单配置数组
+ * @returns
+ */
+var insertSeparator = (columns, space) => {
+  if (!(space !== null && space !== void 0 && space.separator)) {
+    return columns;
+  }
+  var separatorIndexs = (() => {
+    var reuslt = [];
+    if (_utils.validate.isEmpty(space === null || space === void 0 ? void 0 : space.separatorIndex)) {
+      return reuslt;
+    }
+
+    // 如果 index 是数字，将其转换为数组
+    if (typeof (space === null || space === void 0 ? void 0 : space.separatorIndex) === 'number') {
+      reuslt.push(space.separatorIndex);
+    }
+    if (Array.isArray(space.separatorIndex)) {
+      reuslt = reuslt.concat(space.separatorIndex);
+    }
+    return reuslt;
+  })();
+  return columns.reduce((result, current, index, array) => {
+    // 将当前元素添加到结果数组中
+    result.push(current);
+    if (separatorIndexs !== null && separatorIndexs !== void 0 && separatorIndexs.length) {
+      separatorIndexs.forEach(separatorIndex => {
+        if (index === separatorIndex) {
+          result.push({
+            separator: true,
+            component: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
+              className: "group-separator",
+              children: space.separator
+            }),
+            fieldProps: {
+              disabled: true
+            }
+          });
+        }
+      });
+    } else {
+      // 如果当前元素不是最后一个元素，则添加间隔符
+      if (index < array.length - 1) {
+        result.push({
+          separator: true,
+          component: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
+            className: "group-separator",
+            children: space.separator
+          }),
+          fieldProps: {
+            disabled: true
+          }
+        });
+      }
+    }
+    return result;
+  }, []);
+};
+
+/** 带出event的组件默认取值方法 */
+exports.insertSeparator = insertSeparator;
+function defaultGetValueFromEvent(valuePropName) {
+  var event = arguments.length <= 1 ? undefined : arguments[1];
+  if (event && event.target && typeof event.target === 'object' && valuePropName in event.target) {
+    return event.target[valuePropName];
+  }
+  return event;
+}
+
+/** 转换names */
+var transformNamesString = arr => {
+  var result = arr.map(subArr => {
+    if (Array.isArray(subArr)) {
+      return subArr.join('_');
+    }
+    return subArr;
+  });
+  return result;
+};
+
+/**
+ * Input TextArea 小写自动转大写
+ * @param type 组件类型
+ * @param upperCase 是否小写转大写
+ * @returns {}
+ */
+exports.transformNamesString = transformNamesString;
+var isUpperCase = (type, upperCase) => {
+  var result = {};
+  if (['Input', 'TextArea'].includes(type) && upperCase) {
+    result.getValueFromEvent = event => {
+      var _event$target;
+      if (Array.isArray(event)) {
+        return event.map(value => {
+          var newValue = value === null || value === void 0 ? void 0 : value.replace(/[^a-zA-Z]/g, '');
+          return (newValue === null || newValue === void 0 ? void 0 : newValue.toUpperCase()) || '';
+        });
+      }
+      var newValue = (_event$target = event.target) === null || _event$target === void 0 || (_event$target = _event$target.value) === null || _event$target === void 0 ? void 0 : _event$target.replace(/[^a-zA-Z]/g, '');
+      return newValue.toUpperCase() || '';
+    };
+  }
+  return result;
+};
+exports.isUpperCase = isUpperCase;
+/** 计算响应式参数的值 */
+var getReactiveProps = params => {
+  var form = params.form,
+    index = params.index,
+    namePath = params.namePath,
+    disabled = params.disabled,
+    show = params.show,
+    component = params.component,
+    fieldProps = params.fieldProps,
+    desensitization = params.desensitization;
+  var values = namePath ? form.getFieldValue(namePath) : form.getFieldsValue();
+  var _disabled = (0, _lodash.isFunction)(disabled) ? disabled(values, {
+    form,
+    index,
+    namePath
+  }) : disabled;
+  var _show = (0, _lodash.isFunction)(show) ? show(values, {
+    form,
+    index,
+    namePath
+  }) : show;
+  var _component = (0, _lodash.isFunction)(component) ? component(values, {
+    form,
+    index,
+    namePath
+  }) : component;
+  var _fieldProps = (0, _lodash.isFunction)(fieldProps) ? fieldProps(values, {
+    form,
+    index,
+    namePath
+  }) : fieldProps;
+  var _desensitization = (0, _lodash.isFunction)(desensitization) ? desensitization(values, {
+    form,
+    index,
+    namePath
+  }) : desensitization;
+  return {
+    disabled: _disabled,
+    show: _show,
+    component: _component,
+    fieldProps: _fieldProps,
+    desensitization: _desensitization
+  };
+};
+exports.getReactiveProps = getReactiveProps;
+/** 获取当前字段的转换函数 */
+var getValueTypeTrans = params => {
+  var _valueTypeMap$valueTy;
+  var valueType = params.valueType;
+  var transform = (_valueTypeMap$valueTy = _valueType.default[valueType]) === null || _valueTypeMap$valueTy === void 0 ? void 0 : _valueTypeMap$valueTy.call(_valueType.default, params);
+  return transform;
+};
+exports.getValueTypeTrans = getValueTypeTrans;
+var getTrim = value => {
+  return (value === null || value === void 0 ? void 0 : value.trim()) || '';
+};
+var getUpperCase = value => {
+  var _value = value === null || value === void 0 ? void 0 : value.replace(/[^a-zA-Z]/g, '');
+  return _value.toUpperCase() || '';
+};
+
+/** 执行所有中间件 返回处理后的值 */
+var getValueMiddleware = exports.getValueMiddleware = function getValueMiddleware(value) {
+  var callbacks = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  return callbacks.reduce((preValue, cb) => {
+    return cb === null || cb === void 0 ? void 0 : cb(preValue);
+  }, value);
+};
+
+/** 获取中间件处理后的value */
+var valueFromEventWrapper = (column, args) => {
+  var getValueFromEvent = column.getValueFromEvent,
+    _column$valuePropName = column.valuePropName,
+    valuePropName = _column$valuePropName === void 0 ? 'value' : _column$valuePropName,
+    trim = column.trim,
+    upperCase = column.upperCase;
+  var newValue;
+  if (getValueFromEvent) {
+    newValue = getValueFromEvent(...args);
+  } else {
+    newValue = defaultGetValueFromEvent(valuePropName, ...args);
+  }
+  var list = [];
+  if (trim) list.push(getTrim);
+  if (upperCase) list.push(getUpperCase);
+  return getValueMiddleware(newValue, list);
+};
+
+// ==================== 原 formItemHelpers.ts 内容 ====================
+exports.valueFromEventWrapper = valueFromEventWrapper;
+/**
+ * 创建FormItem属性（Hook版本）
+ */
+var useFormItemProps = (column, contextProps, groupProps) => {
+  var _ref, _ref2, _groupProps$formDisab;
+  // Debug info removed for production
+
+  var name = column.name,
+    label = column.label,
+    _column$rules = column.rules,
+    rules = _column$rules === void 0 ? [] : _column$rules,
+    required = column.required,
+    dependencies = column.dependencies,
+    tooltip = column.tooltip,
+    extra = column.extra,
+    _column$validateFirst = column.validateFirst,
+    validateFirst = _column$validateFirst === void 0 ? true : _column$validateFirst,
+    columnDisabled = column.disabled,
+    type = column.type,
+    _column$fieldProps = column.fieldProps,
+    fieldProps = _column$fieldProps === void 0 ? {} : _column$fieldProps,
+    otherFormItemProps = _objectWithoutProperties(column, _excluded);
+  var form = contextProps.form,
+    namePath = contextProps.namePath;
+
+  // 构建完整的name路径
+  var fullName = namePath ? [...namePath, name] : name;
+
+  // 处理依赖关系 - 支持相对路径和绝对路径
+  var safeDependencies = Array.isArray(dependencies) ? dependencies : [];
+  var processedDependencies = safeDependencies.map(dep => {
+    if (typeof dep === 'string') {
+      // 相对路径：同Group内的其他字段
+      return namePath ? [...namePath, dep] : dep;
+    }
+    return dep; // 绝对路径保持不变
+  });
+
+  // 处理校验规则 - 确保rules是数组
+  var safeRules = Array.isArray(rules) ? rules : [];
+
+  // 先调用 rulesCreator 转换自定义校验类型（如 type: 'isEmail'）
+  var transformedRules = (0, _rulesCreator.rulesCreator)({
+    rules: safeRules,
+    label: label,
+    isSelect: (0, _utils2.isSelect)({
+      dataSource: fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.dataSource,
+      type
+    }),
+    names: undefined,
+    // 灵活模式不使用 names
+    required
+  });
+
+  // 然后再处理 validator 的增强逻辑（为 validator 提供 form 和当前字段上下文）
+  var processedRules = transformedRules.map(rule => {
+    if (typeof rule.validator === 'function') {
+      var originalValidator = rule.validator;
+      return _objectSpread(_objectSpread({}, rule), {}, {
+        validator: function () {
+          var _validator = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(ruleObj, value) {
+            var enhancedRule;
+            return _regeneratorRuntime().wrap(function _callee$(_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  // 为validator提供form和当前字段上下文
+                  enhancedRule = _objectSpread(_objectSpread({}, ruleObj), {}, {
+                    form,
+                    field: fullName,
+                    getFieldValue: fieldName => {
+                      // 支持相对路径获取同Group内字段值
+                      var targetName = namePath ? [...namePath, fieldName] : fieldName;
+                      return form.getFieldValue(targetName);
+                    }
+                  });
+                  return _context.abrupt("return", originalValidator(enhancedRule, value));
+                case 2:
+                case "end":
+                  return _context.stop();
+              }
+            }, _callee);
+          }));
+          function validator(_x, _x2) {
+            return _validator.apply(this, arguments);
+          }
+          return validator;
+        }()
+      });
+    }
+    return rule;
+  });
+
+  // 处理disabled状态
+  var lastDisabled = (_ref = (_ref2 = (_groupProps$formDisab = groupProps.formDisabled) !== null && _groupProps$formDisab !== void 0 ? _groupProps$formDisab : columnDisabled) !== null && _ref2 !== void 0 ? _ref2 : fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled) !== null && _ref !== void 0 ? _ref : groupProps.disabled;
+
+  // 直接处理校验规则，避免在非Hook函数中使用useRules
+  var internalRule = {
+    rules: processedRules,
+    required,
+    label: label
+  };
+  return _objectSpread(_objectSpread({
+    name: fullName,
+    label,
+    dependencies: processedDependencies,
+    tooltip,
+    extra,
+    validateFirst,
+    disabled: lastDisabled
+  }, otherFormItemProps), internalRule);
+};
+
+/**
+ * 创建组件属性
+ */
+exports.useFormItemProps = useFormItemProps;
+var createComponentProps = (column, formItemProps) => {
+  var type = column.type,
+    _column$fieldProps2 = column.fieldProps,
+    fieldProps = _column$fieldProps2 === void 0 ? {} : _column$fieldProps2,
+    valueType = column.valueType,
+    switchValue = column.switchValue,
+    toISOString = column.toISOString,
+    toCSTString = column.toCSTString;
+
+  // 处理placeholder
+  var label = fieldProps.label,
+    placeholder = fieldProps.placeholder,
+    dataSource = fieldProps.dataSource;
+  var formLabel = formItemProps.label;
+  var _isSelect = (0, _utils2.isSelect)({
+    dataSource,
+    type
+  });
+  var placeholderHandle = () => {
+    var _label = (0, _lodash.isString)(label) ? label : '';
+    var _formLabel = (0, _lodash.isString)(formLabel) ? formLabel : '';
+    return placeholder || `${_isSelect ? `${_locale.default.ProForm.selectPlaceHolder}` : `${_locale.default.ProForm.inputPlaceholder}`}${_label || _formLabel || ''}`;
+  };
+
+  // 值类型转换
+  var transform = getValueTypeTrans({
+    type,
+    valueType,
+    switchValue,
+    toISOString,
+    toCSTString,
+    mode: fieldProps.mode
+  });
+
+  // 组件基本属性
+  var componentProps = _objectSpread(_objectSpread({
+    placeholder: placeholderHandle()
+  }, fieldProps), {}, {
+    disabled: formItemProps.disabled
+  });
+
+  // 时间范围placeholder特殊处理
+  if (type === 'RangePicker' && !(fieldProps !== null && fieldProps !== void 0 && fieldProps.placeholder)) {
+    delete componentProps.placeholder;
+  }
+
+  // Switch组件valuePropName处理
+  if (['Switch', 'SwitchCheckbox'].includes(type)) {
+    formItemProps.valuePropName = 'checked';
+  }
+
+  // 分离 transform 中的 normalize 和 getValueProps（这些应该应用到 Form.Item，而不是组件）
+  var _ref3 = transform || {},
+    normalize = _ref3.normalize,
+    getValueProps = _ref3.getValueProps,
+    restTransform = _objectWithoutProperties(_ref3, _excluded2);
+
+  // formItemTransform 只包含应该应用到 Form.Item 的属性
+  var formItemTransform = _objectSpread(_objectSpread({}, normalize && {
+    normalize
+  }), getValueProps && {
+    getValueProps
+  });
+
+  // 过滤掉不应该传递给组件的属性（这些属性只用于转换，不应该出现在 DOM 上）
+  var filteredComponentProps = (0, _lodash.omit)(_objectSpread(_objectSpread({}, componentProps), restTransform), ['valueType', 'switchValue', 'toISOString', 'toCSTString', 'format', 'precision', 'clearNotShow', 'dependNames']);
+  return {
+    componentProps: filteredComponentProps,
+    formItemTransform
+  };
+};
+
+/**
+ * 配置验证组件
+ */
+exports.createComponentProps = createComponentProps;
+var validateChildren = children => {
+  // 确保children是数组
+  if (!Array.isArray(children) || children.length === 0) {
+    console.warn('[ProForm Group] 灵活模式下children必须是数组且不能为空');
+    return false;
+  }
+  var invalidChildren = children.filter(child => {
+    return child.names || !child.name || child.type === 'Group';
+  });
+  if (invalidChildren.length > 0) {
+    console.warn('[ProForm Group] 灵活模式下所有子组件都必须配置name属性。且type不能为Group', '缺少name的组件索引:', invalidChildren.map((_, index) => children.findIndex(child => child === invalidChildren[index])), '\n示例配置:', '\n{\n  type: "InputNumber",\n  name: "min", // 必需\n  rules: [...] // 可选\n}');
+    return false;
+  }
+
+  // 检查name重复
+  var names = children.map(child => child.name);
+  var duplicateNames = names.filter((name, index) => names.indexOf(name) !== index);
+  if (duplicateNames.length > 0) {
+    console.warn('[ProForm Group] 子组件中发现重复的name属性:', [...new Set(duplicateNames)]);
+    return false;
+  }
+  return true;
+};
+exports.validateChildren = validateChildren;

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

@@ -1,13 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _react = require("react");
 var _antd = require("antd");
 var _lodash = require("lodash");
@@ -21,13 +17,27 @@ var _ = _interopRequireDefault(require("../../.."));
 var _Container = _interopRequireDefault(require("../../Container"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder", "scrollFollowParent", "desensitization", "otherProps"];
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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; }
+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 defaultFieldNames = {
   label: 'name',
   value: 'code',
   children: 'children'
 };
 var filterDataSource = (dataSource, level, fieldNames) => {
-  return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(item => (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+  return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(item => _objectSpread(_objectSpread({}, item), {}, {
     [(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children']: level === 1 ? [] : filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)
   }));
 };
@@ -85,7 +95,7 @@ var ProCascader = props => {
     scrollFollowParent = props.scrollFollowParent,
     desensitization = props.desensitization,
     otherProps = props.otherProps,
-    restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+    restProps = _objectWithoutProperties(props, _excluded);
   var _ref3 = _.default.useFieldProps() || {},
     isViewCon = _ref3.isView,
     viewEmpty = _ref3.viewEmpty;
@@ -115,11 +125,11 @@ var ProCascader = props => {
     return disabled;
   }, [disabled]);
   var _useState = (0, _react.useState)([]),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    _useState2 = _slicedToArray(_useState, 2),
     serviceData = _useState2[0],
     setServiceData = _useState2[1];
   var _useState3 = (0, _react.useState)([]),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    _useState4 = _slicedToArray(_useState3, 2),
     defaultLabel = _useState4[0],
     setDefaultLabel = _useState4[1];
 
@@ -165,7 +175,7 @@ var ProCascader = props => {
   }, [transformResponse]);
 
   // 使用ahooks的useRequest
-  var fetchFunction = (0, _ahooks.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  var fetchFunction = (0, _ahooks.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread(_objectSpread({
     manual: true,
     debounceWait: 300
   }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
@@ -314,7 +324,7 @@ var ProCascader = props => {
     children: viewValue
   }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: `pro-address ${className}`,
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Cascader, (0, _objectSpread2.default)({
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Cascader, _objectSpread({
       className: hasDetail ? '' : 'no-detail',
       placeholder: _locale.default === null || _locale.default === void 0 || (_locale$ProAddressBar = _locale.default.ProAddressBar) === null || _locale$ProAddressBar === void 0 ? void 0 : _locale$ProAddressBar.placeholder,
       value: addressValue,

package/lib/ProForm/components/combination/ProCascader/utils/index.js

@@ -1,19 +1,23 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.transformDataName = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _lodash = require("lodash");
 var _excluded = ["label", "value", "children"];
+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 transformDataName = (dataSource, fieldNames) => {
   var label = fieldNames.label,
     value = fieldNames.value,
     children = fieldNames.children,
-    extraFields = (0, _objectWithoutProperties2.default)(fieldNames, _excluded);
+    extraFields = _objectWithoutProperties(fieldNames, _excluded);
   if (!(dataSource !== null && dataSource !== void 0 && dataSource.length) || 'label' in dataSource[0] && 'value' in dataSource[0] && 'children' in dataSource[0]) {
     return dataSource;
   }
@@ -29,7 +33,7 @@ var transformDataName = (dataSource, fieldNames) => {
     if (children && Array.isArray(node[children])) {
       newNode.children = node[children].map(transformNode);
     }
-    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, newNode), (0, _lodash.omit)(node, Object.values(fieldNames)));
+    return _objectSpread(_objectSpread({}, newNode), (0, _lodash.omit)(node, Object.values(fieldNames)));
   }
   var transformData = data => {
     return data.map(transformNode);