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

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

@@ -1,57 +1,59 @@
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import _isFunction from "lodash/isFunction";
+import _isEqual from "lodash/isEqual";
+import _cloneDeep from "lodash/cloneDeep";
 /* eslint-disable no-lonely-if */
 import { useRef, useEffect } from 'react';
-import { cloneDeep, isEqual, isFunction } from 'lodash';
 import { useDeepCompareMemo } from "../../../../utils/useDeepCompareMemo";
 import { difference } from "../../../../../ProEditTable/utils/tools";
 import { getReactiveProps, getValueTypeTrans, valueFromEventWrapper } from "../utils";
 /** 转换columns */
-export var useTransformColumns = params => {
-  var form = params.form,
-    columns = params.columns,
-    name = params.name,
-    names = params.names,
-    outerIndex = params.index,
-    namePath = params.namePath,
-    value = params.value,
-    internalChange = params.onChange,
-    groupProps = params.groupProps;
-  var timerRef = useRef([]);
-  return columns === null || columns === void 0 ? void 0 : columns.flatMap((column, index) => {
-    var type = column.type,
-      valueType = column.valueType,
-      switchValue = column.switchValue,
-      toISOString = column.toISOString,
-      toCSTString = column.toCSTString,
-      fieldProps = column.fieldProps,
-      normalize = column.normalize,
-      disabled = column.disabled,
-      show = column.show,
-      component = column.component,
-      clearNotShow = column.clearNotShow,
-      desensitization = column.desensitization;
-    var _ref = fieldProps || {},
-      mode = _ref.mode,
-      onChange = _ref.onChange,
-      comDisabled = _ref.disabled;
-    var _disabled = disabled || comDisabled;
-    var columnName = names ? names[index] : [].concat(name, index);
+export const useTransformColumns = params => {
+  const {
+    form,
+    columns,
+    name,
+    names,
+    index: outerIndex,
+    namePath,
+    value,
+    onChange: internalChange,
+    groupProps
+  } = params;
+  const timerRef = useRef([]);
+  return columns?.flatMap((column, index) => {
+    const {
+      type,
+      valueType,
+      switchValue,
+      toISOString,
+      toCSTString,
+      fieldProps,
+      normalize,
+      disabled,
+      show,
+      component,
+      clearNotShow,
+      desensitization
+    } = column;
+    const {
+      mode,
+      onChange,
+      disabled: comDisabled
+    } = fieldProps || {};
+    const _disabled = disabled || comDisabled;
+    const columnName = names ? names[index] : [].concat(name, index);
 
     // 响应式字段改变后的回调
-    var changedCallback = (lastDependency, current) => {
+    const changedCallback = (lastDependency, current) => {
       // 清值防抖  多次刷新时以最后一次为准
       if (clearNotShow !== false && names) {
-        if ((current === null || current === void 0 ? void 0 : current.show) === false) {
+        if (current?.show === false) {
           clearInterval(timerRef.current[index]);
           timerRef.current[index] = setTimeout(() => {
             if (names) {
               form.resetFields([columnName]);
             }
-            if (!names && value !== null && value !== void 0 && value.length) {
+            if (!names && value?.length) {
               value[index] = null;
               form.setFieldValue(columnName, [...value]);
             }
@@ -64,7 +66,7 @@ export var useTransformColumns = params => {
 
     // 响应式字段
     // eslint-disable-next-line react-hooks/rules-of-hooks
-    var reactiveProps = useDeepCompareMemo(() => {
+    const reactiveProps = useDeepCompareMemo(() => {
       return getReactiveProps({
         form,
         index,
@@ -80,13 +82,14 @@ export var useTransformColumns = params => {
     }, changedCallback, [value, show, fieldProps, _disabled, columnName, type]);
 
     // 从处理后的fieldProps中获取事件处理器
-    var _ref2 = reactiveProps.fieldProps || {},
-      onFieldChange = _ref2.onFieldChange,
-      onBlur = _ref2.onBlur;
+    const {
+      onFieldChange,
+      onBlur
+    } = reactiveProps.fieldProps || {};
     if (reactiveProps.show === false) {
       return [];
     }
-    var transform = getValueTypeTrans({
+    const transform = getValueTypeTrans({
       type,
       valueType,
       switchValue,
@@ -94,18 +97,14 @@ export var useTransformColumns = params => {
       toCSTString,
       mode
     });
-    var newValue;
-    var handleChange = function handleChange() {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
+    let newValue;
+    const handleChange = (...args) => {
       newValue = valueFromEventWrapper(column, args);
-      if (transform !== null && transform !== void 0 && transform.normalize) {
-        var _transform$normalize;
-        newValue = transform === null || transform === void 0 || (_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue);
+      if (transform?.normalize) {
+        newValue = transform?.normalize?.(newValue);
       } else if (normalize) {
         // @ts-ignore
-        newValue = normalize === null || normalize === void 0 ? void 0 : normalize(newValue);
+        newValue = normalize?.(newValue);
       }
 
       // 根据模式选择值管理方式
@@ -113,73 +112,74 @@ export var useTransformColumns = params => {
         // 独立字段模式：设置单个字段值 + 触发整体校验
         form.setFieldValue(columnName, newValue);
         // 确保触发Group整体的校验
-        internalChange === null || internalChange === void 0 || internalChange(newValue, args[1], index);
+        internalChange?.(newValue, args[1], index);
       } else {
         // 数组值模式
-        internalChange === null || internalChange === void 0 || internalChange(newValue, args[1], index);
+        internalChange?.(newValue, args[1], index);
       }
-      var values = form.getFieldValue(namePath);
-      var originRow = namePath !== null && namePath !== void 0 && namePath.length ? cloneDeep(values) : undefined;
-      onChange === null || onChange === void 0 || onChange(...args);
-      onFieldChange === null || onFieldChange === void 0 || onFieldChange(newValue, values, {
+      const values = form.getFieldValue(namePath);
+      const originRow = namePath?.length ? _cloneDeep(values) : undefined;
+      onChange?.(...args);
+      onFieldChange?.(newValue, values, {
         index: outerIndex,
         namePath,
         form,
-        option: args === null || args === void 0 ? void 0 : args[1]
+        option: args?.[1]
       });
       // 如果是在可编辑表格或formList内部, 储存当前行的值, 并在变更后更新到表单里
-      if (namePath !== null && namePath !== void 0 && namePath.length && !isEqual(originRow, values)) {
-        var _Object$keys, _Object$keys$map;
+      if (namePath?.length && !_isEqual(originRow, values)) {
         form.setFieldValue(namePath, values);
-        var diff = difference(originRow, values) || {};
-        var validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 || (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, key => [...namePath, key]);
-        if (validateFieldKeys !== null && validateFieldKeys !== void 0 && validateFieldKeys.length) {
+        const diff = difference(originRow, values) || {};
+        const validateFieldKeys = Object.keys(diff)?.map?.(key => [...namePath, key]);
+        if (validateFieldKeys?.length) {
           setTimeout(() => {
             form.validateFields([name, ...validateFieldKeys]);
           }, 100);
         }
       }
     };
-    var handleBlur = function handleBlur() {
+    const handleBlur = (...args) => {
       if (!onBlur) return;
-      var values = form.getFieldValue(namePath);
-      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-        args[_key2] = arguments[_key2];
-      }
-      onBlur === null || onBlur === void 0 || onBlur(args[0], values, {
+      const values = form.getFieldValue(namePath);
+      onBlur?.(args[0], values, {
         index: outerIndex,
         namePath,
         form,
-        option: args === null || args === void 0 ? void 0 : args[1]
+        option: args?.[1]
       });
     };
 
     // 内外一个为true则为true
-    var getLastDisabled = () => {
+    const getLastDisabled = () => {
       if (Array.isArray(groupProps.disabled)) {
         return reactiveProps.disabled || groupProps.disabled[index];
       }
       return reactiveProps.disabled || groupProps.disabled;
     };
-    return _objectSpread(_objectSpread(_objectSpread({}, column), {}, {
-      name: columnName
-    }, reactiveProps), {}, {
+    return {
+      ...column,
+      name: columnName,
+      ...reactiveProps,
       disabled: getLastDisabled(),
-      getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
-      fieldProps: _objectSpread(_objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), reactiveProps === null || reactiveProps === void 0 ? void 0 : reactiveProps.fieldProps), {}, {
+      getValueProps: transform?.getValueProps,
+      fieldProps: {
+        ...column?.fieldProps,
+        ...reactiveProps?.fieldProps,
         onChange: handleChange,
         onBlur: handleBlur,
-        value: value === null || value === void 0 ? void 0 : value[index]
-      })
-    });
+        value: value?.[index]
+      }
+    };
   });
 };
 
 /**
  * 检查子项是否应该显示（纯函数，不执行副作用）
  */
-export var checkShouldShow = (child, form, namePath, index) => {
-  var show = child.show;
+export const checkShouldShow = (child, form, namePath, index) => {
+  const {
+    show
+  } = child;
 
   // 如果没有配置 show，默认显示
   if (show === undefined || show === true) {
@@ -192,8 +192,8 @@ export var checkShouldShow = (child, form, namePath, index) => {
   }
 
   // 如果 show 是函数，需要获取表单值来评估
-  if (isFunction(show)) {
-    var values = {};
+  if (_isFunction(show)) {
+    let values = {};
     if (namePath) {
       // FormList 场景：取当前行数据
       values = form.getFieldValue(namePath) || {};
@@ -213,16 +213,18 @@ export var checkShouldShow = (child, form, namePath, index) => {
  * ProEditTable 场景下，当字段的 show 从 true 变为 false 时，自动重置字段值
  * 使用 useEffect 在副作用中执行重置，避免在渲染过程中调用 setState
  */
-export var useResetProEditTable = params => {
-  var children = params.children,
-    form = params.form,
-    namePath = params.namePath,
-    source = params.source;
+export const useResetProEditTable = params => {
+  const {
+    children,
+    form,
+    namePath,
+    source
+  } = params;
 
   // 用于跟踪每个子项的显示状态
-  var showStateRef = useRef(new Map());
+  const showStateRef = useRef(new Map());
   // 用于存储重置定时器
-  var resetTimersRef = useRef(new Map());
+  const resetTimersRef = useRef(new Map());
   useEffect(() => {
     // 只在 ProEditTable 场景下执行重置逻辑
     if (source !== 'ProEditTable') {
@@ -231,26 +233,26 @@ export var useResetProEditTable = params => {
 
     // 检查每个子项的显示状态
     children.forEach(child => {
-      var childNamePath = child.namePath || namePath;
-      var childIndex = child.index;
+      const childNamePath = child.namePath || namePath;
+      const childIndex = child.index;
 
       // 生成唯一 key 用于跟踪状态
-      var childKey = child.name ? Array.isArray(child.name) ? `${JSON.stringify(childNamePath)}-${JSON.stringify(child.name)}` : `${JSON.stringify(childNamePath)}-${child.name}` : `child-${children.indexOf(child)}`;
+      const childKey = child.name ? Array.isArray(child.name) ? `${JSON.stringify(childNamePath)}-${JSON.stringify(child.name)}` : `${JSON.stringify(childNamePath)}-${child.name}` : `child-${children.indexOf(child)}`;
 
       // 计算当前显示状态
-      var currentShow = checkShouldShow(child, form, childNamePath, childIndex);
-      var previousShow = showStateRef.current.get(childKey);
+      const currentShow = checkShouldShow(child, form, childNamePath, childIndex);
+      const previousShow = showStateRef.current.get(childKey);
 
       // 如果状态发生变化，且从显示变为隐藏，执行重置
       if (previousShow !== undefined && previousShow === true && currentShow === false) {
         // 清除之前的定时器
-        var existingTimer = resetTimersRef.current.get(childKey);
+        const existingTimer = resetTimersRef.current.get(childKey);
         if (existingTimer) {
           clearTimeout(existingTimer);
         }
 
         // 延迟执行重置，避免在渲染过程中调用
-        var timer = setTimeout(() => {
+        const timer = setTimeout(() => {
           if (Array.isArray(child.name)) {
             form.resetFields([[...childNamePath, ...child.name]]);
           } else {

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

@@ -1,11 +1,7 @@
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import _omit from "lodash/omit";
+import _isEmpty from "lodash/isEmpty";
 import { Space } from 'antd';
 import React from 'react';
-import { isEmpty, omit } from 'lodash';
 import classnames from 'classnames';
 import { insertSeparator } from "./utils";
 import { useTransformColumns } from "./hooks";
@@ -17,47 +13,49 @@ import FlexibleGroup from "./component/FlexibleGroup";
  * 传统数组模式Group组件（保持向后兼容）
  */
 import { jsx as _jsx } from "react/jsx-runtime";
-var LegacyGroup = props => {
-  var _ref, _fieldProps;
-  var children = props.children,
-    className = props.className,
-    _props$space = props.space,
-    propsSpace = _props$space === void 0 ? {
+const LegacyGroup = props => {
+  const {
+    children,
+    className,
+    space: propsSpace = {
       size: 12
-    } : _props$space,
-    value = props.value,
-    onChange = props.onChange,
-    otherProps = props.otherProps,
-    id = props.id,
-    isParentView = props.isView,
-    formDisabled = props.disabled,
-    separator = props.separator,
-    split = props.split;
+    },
+    value,
+    onChange,
+    otherProps,
+    id,
+    isView: isParentView,
+    disabled: formDisabled,
+    separator,
+    split // 弃用属性，保持向后兼容
+  } = props;
 
   // 向后兼容处理：优先使用 separator，如果没有则使用 split，最后使用默认值
-  var finalSeparator = (_ref = separator !== null && separator !== void 0 ? separator : split) !== null && _ref !== void 0 ? _ref : '/';
+  const finalSeparator = separator ?? split ?? '/';
 
   // 支持从 fieldProps.space 获取 space 配置
-  var fieldPropsSpace = (_fieldProps = props.fieldProps) === null || _fieldProps === void 0 ? void 0 : _fieldProps.space;
-  var space = fieldPropsSpace || propsSpace;
-  var contextProps = ProForm.useFieldProps() || {};
-  var names = contextProps.names,
-    name = contextProps.name,
-    form = contextProps.form,
-    namePath = contextProps.namePath,
-    index = contextProps.index,
-    isView = contextProps.isView;
-  var nextOption = React.useRef([]);
-  var nextIsView = isParentView || isView || otherProps.isView;
+  const fieldPropsSpace = props.fieldProps?.space;
+  const space = fieldPropsSpace || propsSpace;
+  const contextProps = ProForm.useFieldProps() || {};
+  const {
+    names,
+    name,
+    form,
+    namePath,
+    index,
+    isView
+  } = contextProps;
+  const nextOption = React.useRef([]);
+  const nextIsView = isParentView || isView || otherProps.isView;
 
   // 组合onChange
-  var handleChange = (value, option, index) => {
-    var nextValue = props.value ? [...props.value] : [];
+  const handleChange = (value, option, index) => {
+    const nextValue = props.value ? [...props.value] : [];
     nextValue[index] = value;
     nextOption.current[index] = option;
     onChange(nextValue, nextOption.current);
   };
-  var columnsProps = useTransformColumns({
+  const columnsProps = useTransformColumns({
     columns: children,
     name,
     names,
@@ -69,70 +67,70 @@ var LegacyGroup = props => {
     groupProps: props,
     formDisabled
   });
-  var columns = insertSeparator(columnsProps, space);
-  var nextClassName = classnames({
+  const columns = insertSeparator(columnsProps, space);
+  const nextClassName = classnames({
     'pro-group': true,
     'pro-group-unflexible': true,
-    'pro-group-diy-width': columns.some(item => {
-      var _item$fieldProps;
-      return item === null || item === void 0 || (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 || (_item$fieldProps = _item$fieldProps.style) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.width;
-    }),
+    'pro-group-diy-width': columns.some(item => item?.fieldProps?.style?.width),
     'pro-group-width-auto': columns.some(item => {
       return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
     }),
     'pro-group-view': nextIsView,
     [`${className}`]: className
   });
-  if (nextIsView && isEmpty(value)) {
-    return (otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewEmpty) || '-';
+  if (nextIsView && _isEmpty(value)) {
+    return otherProps?.viewEmpty || '-';
   }
 
   // compact模式专用：为每个字段创建可见的Form.Item，并应用宽度样式
-  var renderCompactFormItems = () => {
-    var elements = [];
+  const renderCompactFormItems = () => {
+    const elements = [];
     columns.forEach((column, index) => {
-      var _column$fieldProps;
       // 检测是否有自定义宽度
-      var childWidth = column === null || column === void 0 || (_column$fieldProps = column.fieldProps) === null || _column$fieldProps === void 0 || (_column$fieldProps = _column$fieldProps.style) === null || _column$fieldProps === void 0 ? void 0 : _column$fieldProps.width;
-      var formItemStyle = childWidth ? {
+      const childWidth = column?.fieldProps?.style?.width;
+      const formItemStyle = childWidth ? {
         width: childWidth
       } : undefined;
-      var formItemClassName = childWidth ? 'pro-group-form-item pro-group-form-item-has-width' : 'pro-group-form-item';
+      const formItemClassName = childWidth ? 'pro-group-form-item pro-group-form-item-has-width' : 'pro-group-form-item';
 
       // 创建新的 column 对象，避免直接修改原对象
-      var newColumn = _objectSpread({}, column);
+      const newColumn = {
+        ...column
+      };
       newColumn.otherProps = otherProps;
 
       // 如果子组件有自定义宽度，将子组件的宽度改为 100%，让它填充 Form.Item
       if (childWidth) {
-        var _newColumn$fieldProps;
-        newColumn.fieldProps = _objectSpread(_objectSpread({}, newColumn.fieldProps), {}, {
-          style: _objectSpread(_objectSpread({}, (_newColumn$fieldProps = newColumn.fieldProps) === null || _newColumn$fieldProps === void 0 ? void 0 : _newColumn$fieldProps.style), {}, {
+        newColumn.fieldProps = {
+          ...newColumn.fieldProps,
+          style: {
+            ...newColumn.fieldProps?.style,
             width: '100%'
-          })
-        });
+          }
+        };
       }
 
       // 自定义间隔移除对应参数
-      if (newColumn !== null && newColumn !== void 0 && newColumn.separator) {
+      if (newColumn?.separator) {
         delete newColumn.separator;
         delete newColumn.otherProps;
       }
 
       // 传统模式 compact 模式：将 Form.Item 相关的 props 传递给 ComRender
       // ComRender 内部会处理 Form.Item 的渲染，避免嵌套
-      var dependencies = names && names.length > 0 ? names.filter(n => n !== newColumn.name) : undefined;
-      var formElement = /*#__PURE__*/_jsx(ComRender, _objectSpread({
+      const dependencies = names && names.length > 0 ? names.filter(n => n !== newColumn.name) : undefined;
+      const formElement = /*#__PURE__*/_jsx(ComRender, {
         contextProps: contextProps,
         isView: nextIsView,
         formItemClassName: formItemClassName,
         formItemStyle: formItemStyle,
-        dependencies: dependencies
-      }, newColumn), newColumn.name || index);
+        dependencies: dependencies,
+        ...newColumn
+      }, newColumn.name || index);
       elements.push(formElement);
 
       // 添加分隔符
-      if (newColumn !== null && newColumn !== void 0 && newColumn.separator && index < columns.length - 1) {
+      if (newColumn?.separator && index < columns.length - 1) {
         elements.push( /*#__PURE__*/_jsx("span", {
           className: "pro-group-separator-compact",
           children: newColumn.separator
@@ -147,23 +145,24 @@ var LegacyGroup = props => {
   return /*#__PURE__*/_jsx("div", {
     className: nextClassName,
     id: id,
-    children: (space.compact || space !== null && space !== void 0 && space.separator) && !nextIsView ? renderCompactFormItems() : /*#__PURE__*/_jsx(Space, _objectSpread(_objectSpread({
-      align: "start"
-    }, omit(space, ['separator', 'compact'])), {}, {
+    children: (space.compact || space?.separator) && !nextIsView ? renderCompactFormItems() : /*#__PURE__*/_jsx(Space, {
+      align: "start",
+      ..._omit(space, ['separator', 'compact']),
       separator: nextIsView ? finalSeparator : null,
       size: nextIsView ? 0 : space.size,
       children: columns.map((column, index) => {
         column.otherProps = otherProps;
-        if (column !== null && column !== void 0 && column.separator) {
+        if (column?.separator) {
           delete column.separator;
           delete column.otherProps;
         }
-        return /*#__PURE__*/_jsx(ComRender, _objectSpread({
+        return /*#__PURE__*/_jsx(ComRender, {
           contextProps: contextProps,
-          isView: nextIsView
-        }, column), column.name || index);
+          isView: nextIsView,
+          ...column
+        }, column.name || index);
       })
-    }))
+    })
   });
 };
 
@@ -172,26 +171,30 @@ var LegacyGroup = props => {
  * - 有names属性 → 传统数组模式（保持向后兼容）
  * - 无names属性 → 新的灵活模式（子组件必须配置name）
  */
-var Group = props => {
-  var _ref2 = props,
-    children = _ref2.children,
-    names = _ref2.names,
-    otherProps = _ref2.otherProps;
+const Group = props => {
+  const {
+    children,
+    names,
+    otherProps
+  } = props;
 
   // names可能在props.names或props.otherProps.names中（来自ProForm的传递）
-  var actualNames = names || (otherProps === null || otherProps === void 0 ? void 0 : otherProps.names);
+  const actualNames = names || otherProps?.names;
 
   // 模式检测：基于names属性判断使用哪种模式
   // 传统模式：有names属性且为非空数组
   // 灵活模式：无names属性或names为空，children中的子项必须配置name
-  var isLegacyMode = Array.isArray(actualNames) && actualNames.length > 0;
+  const isLegacyMode = Array.isArray(actualNames) && actualNames.length > 0;
   if (isLegacyMode) {
     // 传统模式：使用names数组管理值，确保names被传递给LegacyGroup
-    return /*#__PURE__*/_jsx(LegacyGroup, _objectSpread(_objectSpread({}, props), {}, {
+    return /*#__PURE__*/_jsx(LegacyGroup, {
+      ...props,
       names: actualNames
-    }));
+    });
   }
   // 灵活模式：子组件独立管理name和rules
-  return /*#__PURE__*/_jsx(FlexibleGroup, _objectSpread({}, props));
+  return /*#__PURE__*/_jsx(FlexibleGroup, {
+    ...props
+  });
 };
 export default Group;