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

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

@@ -1,20 +1,9 @@
-var _excluded = ["name", "label", "rules", "required", "dependencies", "tooltip", "extra", "validateFirst", "disabled", "type", "fieldProps"],
-  _excluded2 = ["normalize", "getValueProps"];
-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; }
+import _omit from "lodash/omit";
+import _isString from "lodash/isString";
+import _isFunction from "lodash/isFunction";
 /* eslint-disable no-lonely-if */
-
 import { Button } from 'antd';
 import React from 'react';
-import { isFunction, isString, omit } from 'lodash';
 import { validate } from '@zat-design/utils';
 import valueTypeMap from "../../../../utils/valueType";
 import locale from "../../../../../locale";
@@ -26,18 +15,18 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * @param columns 表单配置数组
  * @returns
  */
-export var insertSeparator = (columns, space) => {
-  if (!(space !== null && space !== void 0 && space.separator)) {
+export const insertSeparator = (columns, space) => {
+  if (!space?.separator) {
     return columns;
   }
-  var separatorIndexs = (() => {
-    var reuslt = [];
-    if (validate.isEmpty(space === null || space === void 0 ? void 0 : space.separatorIndex)) {
+  const separatorIndexs = (() => {
+    let reuslt = [];
+    if (validate.isEmpty(space?.separatorIndex)) {
       return reuslt;
     }
 
     // 如果 index 是数字，将其转换为数组
-    if (typeof (space === null || space === void 0 ? void 0 : space.separatorIndex) === 'number') {
+    if (typeof space?.separatorIndex === 'number') {
       reuslt.push(space.separatorIndex);
     }
     if (Array.isArray(space.separatorIndex)) {
@@ -48,7 +37,7 @@ export var insertSeparator = (columns, space) => {
   return columns.reduce((result, current, index, array) => {
     // 将当前元素添加到结果数组中
     result.push(current);
-    if (separatorIndexs !== null && separatorIndexs !== void 0 && separatorIndexs.length) {
+    if (separatorIndexs?.length) {
       separatorIndexs.forEach(separatorIndex => {
         if (index === separatorIndex) {
           result.push({
@@ -83,8 +72,8 @@ export var insertSeparator = (columns, space) => {
 };
 
 /** 带出event的组件默认取值方法 */
-export function defaultGetValueFromEvent(valuePropName) {
-  var event = arguments.length <= 1 ? undefined : arguments[1];
+export function defaultGetValueFromEvent(valuePropName, ...args) {
+  const event = args[0];
   if (event && event.target && typeof event.target === 'object' && valuePropName in event.target) {
     return event.target[valuePropName];
   }
@@ -92,8 +81,8 @@ export function defaultGetValueFromEvent(valuePropName) {
 }
 
 /** 转换names */
-export var transformNamesString = arr => {
-  var result = arr.map(subArr => {
+export const transformNamesString = arr => {
+  const result = arr.map(subArr => {
     if (Array.isArray(subArr)) {
       return subArr.join('_');
     }
@@ -108,55 +97,56 @@ export var transformNamesString = arr => {
  * @param upperCase 是否小写转大写
  * @returns {}
  */
-export var isUpperCase = (type, upperCase) => {
-  var result = {};
+export const isUpperCase = (type, upperCase) => {
+  const 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()) || '';
+          const newValue = value?.replace(/[^a-zA-Z]/g, '');
+          return 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, '');
+      const newValue = event.target?.value?.replace(/[^a-zA-Z]/g, '');
       return newValue.toUpperCase() || '';
     };
   }
   return result;
 };
 /** 计算响应式参数的值 */
-export 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 = isFunction(disabled) ? disabled(values, {
+export const getReactiveProps = params => {
+  const {
+    form,
+    index,
+    namePath,
+    disabled,
+    show,
+    component,
+    fieldProps,
+    desensitization
+  } = params;
+  const values = namePath ? form.getFieldValue(namePath) : form.getFieldsValue();
+  const _disabled = _isFunction(disabled) ? disabled(values, {
     form,
     index,
     namePath
   }) : disabled;
-  var _show = isFunction(show) ? show(values, {
+  const _show = _isFunction(show) ? show(values, {
     form,
     index,
     namePath
   }) : show;
-  var _component = isFunction(component) ? component(values, {
+  const _component = _isFunction(component) ? component(values, {
     form,
     index,
     namePath
   }) : component;
-  var _fieldProps = isFunction(fieldProps) ? fieldProps(values, {
+  const _fieldProps = _isFunction(fieldProps) ? fieldProps(values, {
     form,
     index,
     namePath
   }) : fieldProps;
-  var _desensitization = isFunction(desensitization) ? desensitization(values, {
+  const _desensitization = _isFunction(desensitization) ? desensitization(values, {
     form,
     index,
     namePath
@@ -170,42 +160,43 @@ export var getReactiveProps = params => {
   };
 };
 /** 获取当前字段的转换函数 */
-export var getValueTypeTrans = params => {
-  var _valueTypeMap$valueTy;
-  var valueType = params.valueType;
-  var transform = (_valueTypeMap$valueTy = valueTypeMap[valueType]) === null || _valueTypeMap$valueTy === void 0 ? void 0 : _valueTypeMap$valueTy.call(valueTypeMap, params);
+export const getValueTypeTrans = params => {
+  const {
+    valueType
+  } = params;
+  const transform = valueTypeMap[valueType]?.(params);
   return transform;
 };
-var getTrim = value => {
-  return (value === null || value === void 0 ? void 0 : value.trim()) || '';
+const getTrim = value => {
+  return value?.trim() || '';
 };
-var getUpperCase = value => {
-  var _value = value === null || value === void 0 ? void 0 : value.replace(/[^a-zA-Z]/g, '');
+const getUpperCase = value => {
+  const _value = value?.replace(/[^a-zA-Z]/g, '');
   return _value.toUpperCase() || '';
 };
 
 /** 执行所有中间件 返回处理后的值 */
-export var getValueMiddleware = function getValueMiddleware(value) {
-  var callbacks = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+export const getValueMiddleware = (value, callbacks = []) => {
   return callbacks.reduce((preValue, cb) => {
-    return cb === null || cb === void 0 ? void 0 : cb(preValue);
+    return cb?.(preValue);
   }, value);
 };
 
 /** 获取中间件处理后的value */
-export 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;
+export const valueFromEventWrapper = (column, args) => {
+  const {
+    getValueFromEvent,
+    valuePropName = 'value',
+    trim,
+    upperCase
+  } = column;
+  let newValue;
   if (getValueFromEvent) {
     newValue = getValueFromEvent(...args);
   } else {
     newValue = defaultGetValueFromEvent(valuePropName, ...args);
   }
-  var list = [];
+  const list = [];
   if (trim) list.push(getTrim);
   if (upperCase) list.push(getUpperCase);
   return getValueMiddleware(newValue, list);
@@ -216,34 +207,34 @@ export var valueFromEventWrapper = (column, args) => {
 /**
  * 创建FormItem属性（Hook版本）
  */
-export var useFormItemProps = (column, contextProps, groupProps) => {
-  var _ref, _ref2, _groupProps$formDisab;
+export const useFormItemProps = (column, contextProps, groupProps) => {
   // 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;
+  const {
+    name,
+    label,
+    rules = [],
+    required,
+    dependencies,
+    tooltip,
+    extra,
+    validateFirst = true,
+    disabled: columnDisabled,
+    type,
+    fieldProps = {},
+    ...otherFormItemProps
+  } = column;
+  const {
+    form,
+    namePath
+  } = contextProps;
 
   // 构建完整的name路径
-  var fullName = namePath ? [...namePath, name] : name;
+  const fullName = namePath ? [...namePath, name] : name;
 
   // 处理依赖关系 - 支持相对路径和绝对路径
-  var safeDependencies = Array.isArray(dependencies) ? dependencies : [];
-  var processedDependencies = safeDependencies.map(dep => {
+  const safeDependencies = Array.isArray(dependencies) ? dependencies : [];
+  const processedDependencies = safeDependencies.map(dep => {
     if (typeof dep === 'string') {
       // 相对路径：同Group内的其他字段
       return namePath ? [...namePath, dep] : dep;
@@ -252,14 +243,14 @@ export var useFormItemProps = (column, contextProps, groupProps) => {
   });
 
   // 处理校验规则 - 确保rules是数组
-  var safeRules = Array.isArray(rules) ? rules : [];
+  const safeRules = Array.isArray(rules) ? rules : [];
 
   // 先调用 rulesCreator 转换自定义校验类型（如 type: 'isEmail'）
-  var transformedRules = rulesCreator({
+  const transformedRules = rulesCreator({
     rules: safeRules,
     label: label,
     isSelect: isSelect({
-      dataSource: fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.dataSource,
+      dataSource: fieldProps?.dataSource,
       type
     }),
     names: undefined,
@@ -268,92 +259,86 @@ export var useFormItemProps = (column, contextProps, groupProps) => {
   });
 
   // 然后再处理 validator 的增强逻辑（为 validator 提供 form 和当前字段上下文）
-  var processedRules = transformedRules.map(rule => {
+  const 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;
-        }()
-      });
+      const originalValidator = rule.validator;
+      return {
+        ...rule,
+        validator: async (ruleObj, value) => {
+          // 为validator提供form和当前字段上下文
+          const enhancedRule = {
+            ...ruleObj,
+            form,
+            field: fullName,
+            getFieldValue: fieldName => {
+              // 支持相对路径获取同Group内字段值
+              const targetName = namePath ? [...namePath, fieldName] : fieldName;
+              return form.getFieldValue(targetName);
+            }
+          };
+          return originalValidator(enhancedRule, value);
+        }
+      };
     }
     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;
+  const lastDisabled = groupProps.formDisabled ?? columnDisabled ?? fieldProps?.disabled ?? groupProps.disabled;
 
   // 直接处理校验规则，避免在非Hook函数中使用useRules
-  var internalRule = {
+  const internalRule = {
     rules: processedRules,
     required,
     label: label
   };
-  return _objectSpread(_objectSpread({
+  return {
     name: fullName,
     label,
     dependencies: processedDependencies,
     tooltip,
     extra,
     validateFirst,
-    disabled: lastDisabled
-  }, otherFormItemProps), internalRule);
+    disabled: lastDisabled,
+    ...otherFormItemProps,
+    ...internalRule
+  };
 };
 
 /**
  * 创建组件属性
  */
-export 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;
+export const createComponentProps = (column, formItemProps) => {
+  const {
+    type,
+    fieldProps = {},
+    valueType,
+    switchValue,
+    toISOString,
+    toCSTString
+  } = column;
 
   // 处理placeholder
-  var label = fieldProps.label,
-    placeholder = fieldProps.placeholder,
-    dataSource = fieldProps.dataSource;
-  var formLabel = formItemProps.label;
-  var _isSelect = isSelect({
+  const {
+    label,
+    placeholder,
+    dataSource
+  } = fieldProps;
+  const {
+    label: formLabel
+  } = formItemProps;
+  const _isSelect = isSelect({
     dataSource,
     type
   });
-  var placeholderHandle = () => {
-    var _label = isString(label) ? label : '';
-    var _formLabel = isString(formLabel) ? formLabel : '';
+  const placeholderHandle = () => {
+    const _label = _isString(label) ? label : '';
+    const _formLabel = _isString(formLabel) ? formLabel : '';
     return placeholder || `${_isSelect ? `${locale.ProForm.selectPlaceHolder}` : `${locale.ProForm.inputPlaceholder}`}${_label || _formLabel || ''}`;
   };
 
   // 值类型转换
-  var transform = getValueTypeTrans({
+  const transform = getValueTypeTrans({
     type,
     valueType,
     switchValue,
@@ -363,14 +348,14 @@ export var createComponentProps = (column, formItemProps) => {
   });
 
   // 组件基本属性
-  var componentProps = _objectSpread(_objectSpread({
-    placeholder: placeholderHandle()
-  }, fieldProps), {}, {
+  const componentProps = {
+    placeholder: placeholderHandle(),
+    ...fieldProps,
     disabled: formItemProps.disabled
-  });
+  };
 
   // 时间范围placeholder特殊处理
-  if (type === 'RangePicker' && !(fieldProps !== null && fieldProps !== void 0 && fieldProps.placeholder)) {
+  if (type === 'RangePicker' && !fieldProps?.placeholder) {
     delete componentProps.placeholder;
   }
 
@@ -380,20 +365,27 @@ export var createComponentProps = (column, formItemProps) => {
   }
 
   // 分离 transform 中的 normalize 和 getValueProps（这些应该应用到 Form.Item，而不是组件）
-  var _ref3 = transform || {},
-    normalize = _ref3.normalize,
-    getValueProps = _ref3.getValueProps,
-    restTransform = _objectWithoutProperties(_ref3, _excluded2);
+  const {
+    normalize,
+    getValueProps,
+    ...restTransform
+  } = transform || {};
 
   // formItemTransform 只包含应该应用到 Form.Item 的属性
-  var formItemTransform = _objectSpread(_objectSpread({}, normalize && {
-    normalize
-  }), getValueProps && {
-    getValueProps
-  });
+  const formItemTransform = {
+    ...(normalize && {
+      normalize
+    }),
+    ...(getValueProps && {
+      getValueProps
+    })
+  };
 
   // 过滤掉不应该传递给组件的属性（这些属性只用于转换，不应该出现在 DOM 上）
-  var filteredComponentProps = omit(_objectSpread(_objectSpread({}, componentProps), restTransform), ['valueType', 'switchValue', 'toISOString', 'toCSTString', 'format', 'precision', 'clearNotShow', 'dependNames']);
+  const filteredComponentProps = _omit({
+    ...componentProps,
+    ...restTransform
+  }, ['valueType', 'switchValue', 'toISOString', 'toCSTString', 'format', 'precision', 'clearNotShow', 'dependNames']);
   return {
     componentProps: filteredComponentProps,
     formItemTransform
@@ -403,13 +395,13 @@ export var createComponentProps = (column, formItemProps) => {
 /**
  * 配置验证组件
  */
-export var validateChildren = children => {
+export const validateChildren = children => {
   // 确保children是数组
   if (!Array.isArray(children) || children.length === 0) {
     console.warn('[ProForm Group] 灵活模式下children必须是数组且不能为空');
     return false;
   }
-  var invalidChildren = children.filter(child => {
+  const invalidChildren = children.filter(child => {
     return child.names || !child.name || child.type === 'Group';
   });
   if (invalidChildren.length > 0) {
@@ -418,8 +410,8 @@ export var validateChildren = children => {
   }
 
   // 检查name重复
-  var names = children.map(child => child.name);
-  var duplicateNames = names.filter((name, index) => names.indexOf(name) !== index);
+  const names = children.map(child => child.name);
+  const duplicateNames = names.filter((name, index) => names.indexOf(name) !== index);
   if (duplicateNames.length > 0) {
     console.warn('[ProForm Group] 子组件中发现重复的name属性:', [...new Set(duplicateNames)]);
     return false;