@zat-design/sisyphus-react 3.4.6-beta.6 → 3.4.6-beta.8

package/es/ProEditTable/components/RenderField/index.js

@@ -315,7 +315,7 @@ var RenderField = function RenderField(_ref) {
           }
           _args = [].concat(args);
           rowPath = [].concat(_toConsumableArray(namePath), [index]);
-          row = type === 'Group' ? _args[1] : form.getFieldValue(rowPath, true);
+          row = form.getFieldValue(rowPath, true);
           orgRow = cloneDeep(row);
           if (!onFieldChange) {
             _context.next = 18;
@@ -360,7 +360,7 @@ var RenderField = function RenderField(_ref) {
           return onChange.apply(void 0, _toConsumableArray(_args));
         case 27:
           // 判断属性是否变动
-          type !== 'Group' && form.setFieldValue(rowPath, row);
+          form.setFieldValue(rowPath, row);
           if (!isEqual(orgRow, row)) {
             diff = difference(row, orgRow) || {};
             validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
@@ -406,7 +406,7 @@ var RenderField = function RenderField(_ref) {
             }
             _args = formatArgs([].concat(args));
             rowPath = [].concat(_toConsumableArray(namePath), [index]);
-            row = type === 'Group' ? _args[1] : form.getFieldValue(rowPath, true);
+            row = type === form.getFieldValue(rowPath, true);
             orgRow = cloneDeep(row);
             _args[1] = row;
             _context2.t0 = (_TargetComponent3 = TargetComponent) === null || _TargetComponent3 === void 0 ? void 0 : (_TargetComponent3$pro = _TargetComponent3.props) === null || _TargetComponent3$pro === void 0 ? void 0 : _TargetComponent3$pro.onBlur;
@@ -497,11 +497,7 @@ var RenderField = function RenderField(_ref) {
       isView: isView
     }
   });
-  if (type === 'Group') {
-    componentProps.onFieldChange = _onchange;
-  } else {
-    componentProps = omit(componentProps, ['onFieldChange', 'namePath', 'index']);
-  }
+  componentProps = omit(componentProps, ['onFieldChange', 'namePath', 'index']);
   // 单元格编辑时，设置各个单元格disabled属性
   if (isCell) {
     record["".concat(dataIndex, "-Disabled")] = _disabled;

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

@@ -48,7 +48,7 @@ var FormList = function FormList(props, ref) {
         name: _name,
         names: (item === null || item === void 0 ? void 0 : item.names) ? item.names.map(function (nameItem) {
           // 传给Group的names会被渲染成真实FormItem 不能传完整name
-          return item.type === 'Group' ? [fieldName].concat(_toConsumableArray(toArray(nameItem))) : [].concat(_toConsumableArray(namePath), _toConsumableArray(toArray(nameItem)));
+          return [].concat(_toConsumableArray(namePath), _toConsumableArray(toArray(nameItem)));
         }) : item.names,
         index: fieldName,
         namePath: namePath,

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

@@ -8,12 +8,11 @@ export var namesPathTransform = function namesPathTransform(_ref) {
   var names = _ref.names,
     prefixNamePath = _ref.prefixNamePath,
     type = _ref.type;
-  if (!Array.isArray(names) || type !== 'Group' && !Array.isArray(prefixNamePath)) {
+  if (!Array.isArray(names) || !Array.isArray(prefixNamePath)) {
     return '';
   }
-  var _prefixNamePath = type === 'Group' ? '' : prefixNamePath;
   var newNamePath = names.map(function (val) {
-    return _prefixNamePath.concat(val);
+    return prefixNamePath.concat(val);
   });
   return newNamePath === null || newNamePath === void 0 ? void 0 : newNamePath.map(function (name) {
     return Array.isArray(name) ? name.join('_') : name;

package/es/ProForm/components/combination/Group/index.d.ts

@@ -1,4 +1,10 @@
 import React from 'react';
 import { GroupProps } from './propsType';
-declare const Group: React.FC<GroupProps>;
-export default Group;
+/**
+ * 1. 外层过滤FormItem相关属性, 但是子元素上的 required [disabled] [show] rules [fieldProps] [component] 需要取到并
+ * 2.
+ *
+ * render内部能力 show, component, value, onChange, disabled, clearNotShow, fieldProps
+ */
+declare const GroupCopy: React.FC<GroupProps>;
+export default GroupCopy;

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

@@ -1,61 +1,61 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import "antd/es/button/style";
-import _Button from "antd/es/button";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useMemo } from 'react';
-import { omit, isFunction, union, isNumber } from 'lodash';
-import { useDeepCompareEffect } from 'ahooks';
+import React, { useMemo } from 'react';
+import { omit } from 'lodash';
 import classnames from 'classnames';
-import RenderFields from '../../render/RenderFields';
-import { insertSeparator, transformNamesString } from './utils';
+import { insertSeparator, transformColumns } from './utils';
 import ProForm from '../../../../ProForm';
-var Group = function Group(props) {
-  var columns = props.children,
-    otherProps = props.otherProps,
+import ComRender from './component/ComRender';
+/**
+ * 1. 外层过滤FormItem相关属性, 但是子元素上的 required [disabled] [show] rules [fieldProps] [component] 需要取到并
+ * 2.
+ *
+ * render内部能力 show, component, value, onChange, disabled, clearNotShow, fieldProps
+ */
+var GroupCopy = function GroupCopy(props) {
+  console.log('🚀 ~~> props:', props);
+  var children = props.children,
     className = props.className,
     _props$space = props.space,
     space = _props$space === void 0 ? {
       size: 12
     } : _props$space,
-    id = props.id,
     value = props.value,
-    isView = props.isView,
-    index = props.index,
-    onFieldChange = props.onFieldChange,
-    namePath = props.namePath;
-  var _ref = ProForm.useFieldProps() || {},
-    names = _ref.names,
-    name = _ref.name,
-    form = _ref.form,
-    _namePath = _ref.namePath;
-  var newNamePath = namePath || _namePath || [];
-  if (!Array.isArray(names)) {
-    console.error('Warning: Composite form components whose type is Group must be configured with names');
-  }
-  var data = useMemo(function () {
-    var fieldList = [];
-    var result = columns.map(function (item) {
-      return _objectSpread(_objectSpread({
-        disabled: Boolean(props === null || props === void 0 ? void 0 : props.disabled)
-      }, item), {}, {
-        isView: isView !== null && isView !== void 0 ? isView : item.isView,
-        noStyle: (space === null || space === void 0 ? void 0 : space.compact) || (space === null || space === void 0 ? void 0 : space.separator),
-        parentNames: id,
-        namePath: newNamePath
-      });
-    });
-    var node = _jsx(_Button, {
-      className: "group-separator",
-      children: space.separator
+    onChange = props.onChange,
+    otherProps = props.otherProps,
+    disabled = props.disabled;
+  var contextProps = ProForm.useFieldProps() || {};
+  var names = contextProps.names,
+    name = contextProps.name,
+    form = contextProps.form,
+    namePath = contextProps.namePath,
+    index = contextProps.index;
+  var _option = React.useRef([]);
+  // 组合onChange
+  var handleChange = function handleChange(value, option, index) {
+    var _value = props.value ? _toConsumableArray(props.value) : [];
+    _value[index] = value;
+    _option.current[index] = option;
+    onChange(_value, _option.current);
+  };
+  var columns = useMemo(function () {
+    var columnsProps = transformColumns({
+      columns: children,
+      name: name,
+      names: names,
+      onChange: handleChange,
+      namePath: namePath,
+      form: form,
+      index: index,
+      value: value,
+      groupProps: props
     });
-    return {
-      columns: insertSeparator(result, space, node, otherProps),
-      fieldList: fieldList
-    };
-  }, [name, columns, space, props, names]);
+    return insertSeparator(columnsProps, space);
+  }, [name, value, children, space, names, namePath, index]);
   var _className = classnames(_defineProperty({
     'pro-group': true,
     'pro-group-diy-width': columns.some(function (item) {
@@ -66,44 +66,27 @@ var Group = function Group(props) {
       return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
     })
   }, "".concat(className), className));
-  // 用于formList场景下names移除掉了前缀，需要再次合并回来
-  var _names = names.map(function (item) {
-    if (isNumber(item === null || item === void 0 ? void 0 : item[0])) {
-      return union(newNamePath, item);
-    }
-    return item;
-  });
-  useDeepCompareEffect(function () {
-    var _document, _document$activeEleme;
-    // 焦点激活的表单
-    var touchName = ((_document = document) === null || _document === void 0 ? void 0 : (_document$activeEleme = _document.activeElement) === null || _document$activeEleme === void 0 ? void 0 : _document$activeEleme.id) || '';
-    // 模拟change,初始化不执行onFieldChange
-    if (isFunction(onFieldChange) && form.isFieldsTouched(_names) && transformNamesString(_names).includes(touchName)) {
-      onFieldChange(value, (newNamePath === null || newNamePath === void 0 ? void 0 : newNamePath.length) ? form.getFieldValue(newNamePath, true) : form.getFieldsValue(), {
-        form: form,
-        namePath: newNamePath,
-        index: index
-      });
-    }
-  }, [value]);
-  var _otherProps = omit(otherProps, ['colProps', 'required']);
   return _jsx("div", {
     className: _className,
     children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {
-      children: _jsx(RenderFields, _objectSpread({
-        columns: data.columns,
-        form: form
-      }, _otherProps))
+      children: columns.map(function (column) {
+        return _jsx(ComRender, _objectSpread(_objectSpread({
+          contextProps: contextProps
+        }, column), {}, {
+          otherProps: otherProps
+        }));
+      })
     }) : _jsx(_Space, _objectSpread(_objectSpread({
       align: "start"
     }, omit(space, ['separator', 'compact'])), {}, {
-      children: data.columns.map(function (column, index) {
-        return _jsx(RenderFields, _objectSpread({
-          columns: [column],
-          form: form
-        }, _otherProps), (column === null || column === void 0 ? void 0 : column.name) || index);
+      children: columns.map(function (column, index) {
+        return _jsx(ComRender, _objectSpread(_objectSpread({
+          contextProps: contextProps
+        }, column), {}, {
+          otherProps: otherProps
+        }));
       })
     }))
   });
 };
-export default Group;
+export default GroupCopy;

package/es/ProForm/components/combination/Group/propsType.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
-import { RowProps, SpaceProps } from 'antd';
+import { FormItemProps, ModalFuncProps, SpaceProps } from 'antd';
 import { FormInstance } from 'antd/es/form/Form';
 import { NamePath } from 'antd/lib/form/interface';
-import { ProColumnProps, ProFormOtherProps } from '../../../propsType';
+import { ColumnPropsMap, FunctionArgs, ProFormValueType, ReactiveFunction, ViewType } from '../../../propsType';
 export interface SpaceType extends SpaceProps {
     /**
      * 是否紧凑合并
@@ -16,20 +16,33 @@ export interface SpaceType extends SpaceProps {
     size?: number;
 }
 export interface GroupProps {
-    children?: ProColumnProps[];
+    children?: GroupColumnProps[];
     space?: SpaceType;
-    otherProps?: ProFormOtherProps;
-    rowProps?: RowProps;
     className?: string;
-    value?: any;
     id?: string;
-    disabled?: boolean | (() => void);
+    disabled?: boolean;
     isView?: boolean;
-    namePath?: NamePath;
-    index?: number;
-    onFieldChange?: (value: any[] | null, record: any, { form, }: {
-        form: FormInstance;
-        namePath?: NamePath;
-        index?: number;
-    }) => any;
+    value?: any[];
+    onChange?: (value: any[] | null, options?: any[]) => void;
+    otherProps?: any;
 }
+export type GroupColumnProps<Values = any> = {
+    component?: React.ReactNode | ReactiveFunction<Values, React.ReactNode>;
+    names?: NamePath[];
+    show?: boolean | ReactiveFunction<Values, boolean>;
+    valueType?: ProFormValueType;
+    switchValue?: [any, any];
+    isView?: boolean;
+    viewRender?: (value: any, record: Values, { form, index, namePath, }: {
+        form: FormInstance<Values>;
+        index?: number | undefined;
+        [key: string]: any;
+    }) => React.ReactElement<any, any> | string | undefined | null;
+    viewType?: ViewType;
+    disabled?: boolean | ReactiveFunction<Values, boolean>;
+    trim?: boolean;
+    upperCase?: boolean;
+    toISOString?: boolean;
+    clearNotShow?: boolean;
+    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps>;
+} & ColumnPropsMap & FormItemProps;

package/es/ProForm/components/combination/Group/utils.d.ts

@@ -1,10 +1,63 @@
-import { ReactNode } from 'react';
-import { SpaceType } from './propsType';
+/// <reference types="react" />
+import { InternalNamePath, NamePath } from 'antd/lib/form/interface';
+import { FormInstance } from 'antd';
+import { GroupColumnProps, GroupProps, SpaceType } from './propsType';
+import { ProFormColumnProps, ReactiveFunction } from '../../render/propsType';
+export type EventArgs = any[];
 /**
-* 插入间隔符
-* @param columns 表单配置数组
-* @returns
-*/
-export declare const insertSeparator: (columns: any, space?: SpaceType, separatorNode?: ReactNode, otherProps?: any) => any;
+ * 插入间隔符
+ * @param columns 表单配置数组
+ * @returns
+ */
+export declare const insertSeparator: (columns: GroupColumnProps[], space?: SpaceType) => any[];
+/** 带出event的组件默认取值方法 */
+export declare function defaultGetValueFromEvent(valuePropName: string, ...args: EventArgs): any;
 /** 转换names */
 export declare const transformNamesString: (arr: (string | string[])[]) => (string | string[])[];
+/**
+ * Input TextArea 小写自动转大写
+ * @param type 组件类型
+ * @param upperCase 是否小写转大写
+ * @returns {}
+ */
+export declare const isUpperCase: (type: string, upperCase: boolean) => any;
+interface Params {
+    form?: FormInstance;
+    index?: number;
+    type?: string;
+    namePath?: InternalNamePath;
+    disabled?: boolean | ReactiveFunction<any, boolean>;
+    show?: boolean | ReactiveFunction<any, boolean>;
+    component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
+    fieldProps?: boolean | ReactiveFunction<any, boolean>;
+    name?: NamePath;
+}
+/** 计算响应式参数的值 */
+export declare const getReactiveProps: (params: Params) => {
+    disabled: boolean;
+    show: boolean;
+    component: any;
+    fieldProps: boolean;
+};
+type ValueTypeGetterParams = Pick<ProFormColumnProps, 'valueType' | 'switchValue' | 'toISOString'> & {
+    type?: any;
+    mode?: string;
+};
+/** 获取当前字段的转换函数 */
+export declare const getValueTypeTrans: (params: ValueTypeGetterParams) => any;
+/** 执行所有中间件 返回处理后的值 */
+export declare const getValueMiddleware: (value: any, callbacks?: any[]) => any;
+interface ColumnsTransformerParams {
+    columns: GroupColumnProps[];
+    name?: NamePath;
+    names?: NamePath[];
+    value?: any[];
+    onChange: any;
+    namePath?: InternalNamePath;
+    form: FormInstance;
+    index?: number;
+    groupProps: GroupProps;
+}
+/** 转换columns */
+export declare const transformColumns: (params: ColumnsTransformerParams) => any[];
+export {};

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

@@ -1,31 +1,31 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _typeof from "@babel/runtime/helpers/esm/typeof";
+import "antd/es/button/style";
+import _Button from "antd/es/button";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { isFunction } from 'lodash';
+import valueTypeMap from '../../../utils/valueType';
+import { useDeepCompareMemo } from '@/ProForm/utils/useDeepCompareMemo';
 /**
-* 插入间隔符
-* @param columns 表单配置数组
-* @returns
-*/
-export var insertSeparator = function insertSeparator(columns, space, separatorNode, otherProps) {
-  var _columns = columns;
-  var _ref = otherProps || {},
-    names = _ref.names;
-  // 紧凑模式存在names时，自动给下级拆解name
-  if (names) {
-    _columns = _columns.map(function (column, index) {
-      return _objectSpread(_objectSpread({}, column), {}, {
-        name: names[index]
-      });
-    });
-  }
+ * 插入间隔符
+ * @param columns 表单配置数组
+ * @returns
+ */
+export var insertSeparator = function insertSeparator(columns, space) {
   if (!(space === null || space === void 0 ? void 0 : space.separator)) {
-    return _columns;
+    return columns;
   }
-  return _columns.reduce(function (result, current, index, array) {
+  return columns.reduce(function (result, current, index, array) {
     // 将当前元素添加到结果数组中
     result.push(current);
     // 如果当前元素不是最后一个元素，则添加间隔符
     if (index < array.length - 1) {
       result.push({
-        component: separatorNode,
+        component: _jsx(_Button, {
+          className: "group-separator",
+          children: space.separator
+        }),
         fieldProps: {
           disabled: true
         }
@@ -34,6 +34,14 @@ export var insertSeparator = function insertSeparator(columns, space, separatorN
     return result;
   }, []);
 };
+/** 带出event的组件默认取值方法 */
+export 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 */
 export var transformNamesString = function transformNamesString(arr) {
   var result = arr.map(function (subArr) {
@@ -43,4 +51,186 @@ export var transformNamesString = function transformNamesString(arr) {
     return subArr;
   });
   return result;
+};
+/**
+ * Input TextArea 小写自动转大写
+ * @param type 组件类型
+ * @param upperCase 是否小写转大写
+ * @returns {}
+ */
+export var isUpperCase = function isUpperCase(type, upperCase) {
+  var result = {};
+  if (['Input', 'TextArea', 'ProCombination'].includes(type) && upperCase) {
+    result.getValueFromEvent = function (event) {
+      var _event$target, _event$target$value;
+      if (Array.isArray(event)) {
+        return event.map(function (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 ? void 0 : (_event$target$value = _event$target.value) === null || _event$target$value === void 0 ? void 0 : _event$target$value.replace(/[^a-zA-Z]/g, '');
+      return newValue.toUpperCase() || '';
+    };
+  }
+  return result;
+};
+/** 计算响应式参数的值 */
+export var getReactiveProps = function getReactiveProps(params) {
+  var form = params.form,
+    index = params.index,
+    namePath = params.namePath,
+    disabled = params.disabled,
+    show = params.show,
+    component = params.component,
+    fieldProps = params.fieldProps,
+    name = params.name;
+  var values = form.getFieldsValue(namePath || undefined);
+  var _disabled = isFunction(disabled) ? disabled(values, {
+    form: form,
+    index: index,
+    namePath: namePath
+  }) : disabled;
+  var _show = isFunction(show) ? show(values, {
+    form: form,
+    index: index,
+    namePath: namePath
+  }) : show;
+  var _component = isFunction(component) ? component(values, {
+    form: form,
+    index: index,
+    namePath: namePath
+  }) : component;
+  var _fieldProps = isFunction(fieldProps) ? fieldProps(values, {
+    form: form,
+    index: index,
+    namePath: namePath
+  }) : fieldProps;
+  return {
+    disabled: _disabled,
+    show: _show,
+    component: _component,
+    fieldProps: _fieldProps
+  };
+};
+/** 获取当前字段的转换函数 */
+export var getValueTypeTrans = function 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);
+  return transform;
+};
+var getTrim = function getTrim(value) {
+  return (value === null || value === void 0 ? void 0 : value.trim()) || '';
+};
+var getUpperCase = function getUpperCase(value) {
+  var _value = value === null || value === void 0 ? void 0 : 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] : [];
+  return callbacks.reduce(function (preValue, cb) {
+    return cb === null || cb === void 0 ? void 0 : cb(preValue);
+  }, value);
+};
+/** 获取中间件处理后的value */
+var valueFromEventWrapper = function 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.apply(void 0, _toConsumableArray(args));
+  } else {
+    newValue = defaultGetValueFromEvent.apply(void 0, [valuePropName].concat(_toConsumableArray(args)));
+  }
+  var list = [];
+  if (trim) list.push(getTrim);
+  if (upperCase) list.push(getUpperCase);
+  return getValueMiddleware(newValue, list);
+};
+/** 转换columns */
+export var transformColumns = function transformColumns(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;
+  return columns === null || columns === void 0 ? void 0 : columns.flatMap(function (column, index) {
+    var type = column.type,
+      valueType = column.valueType,
+      switchValue = column.switchValue,
+      toISOString = column.toISOString,
+      fieldProps = column.fieldProps,
+      normalize = column.normalize,
+      disabled = column.disabled,
+      show = column.show,
+      component = column.component;
+    var _ref = fieldProps || {},
+      mode = _ref.mode,
+      onChange = _ref.onChange,
+      onFieldChange = _ref.onFieldChange,
+      comDisabled = _ref.disabled;
+    var _disabled = disabled || comDisabled;
+    var columnName = names ? names[index] : [].concat(name, index);
+    // 响应式字段
+    var reactiveProps = useDeepCompareMemo(function () {
+      return getReactiveProps({
+        form: form,
+        index: index,
+        type: type,
+        namePath: namePath,
+        disabled: _disabled,
+        show: show,
+        component: component,
+        fieldProps: fieldProps,
+        name: columnName
+      });
+    }, [value, show, fieldProps, columnName, type]);
+    if (reactiveProps.show === false) {
+      return [];
+    }
+    var transform = getValueTypeTrans({
+      type: type,
+      valueType: valueType,
+      switchValue: switchValue,
+      toISOString: toISOString,
+      mode: 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];
+      }
+      newValue = valueFromEventWrapper(column, args);
+      if ((transform === null || transform === void 0 ? void 0 : transform.normalize) || normalize) {
+        var _transform$normalize;
+        // @ts-ignore
+        newValue = ((_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue)) || (normalize === null || normalize === void 0 ? void 0 : normalize(newValue));
+      }
+      internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
+      onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, args);
+      onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, form.getFieldValue(namePath), {
+        index: outerIndex,
+        namePath: namePath,
+        form: form
+      });
+    };
+    return _objectSpread(_objectSpread(_objectSpread({}, column), {}, {
+      name: columnName
+    }, reactiveProps), {}, {
+      disabled: reactiveProps.disabled || groupProps.disabled,
+      fieldProps: _objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), {}, {
+        onChange: handleChange,
+        value: value === null || value === void 0 ? void 0 : value[index]
+      })
+    });
+  });
 };

package/es/ProForm/components/combination/_Group/index.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import { GroupProps } from './propsType';
+declare const Group: React.FC<GroupProps>;
+export default Group;