@zat-design/sisyphus-react 3.4.7 → 3.4.8

package/lib/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/lib/ProForm/components/combination/Group/utils.js

@@ -4,35 +4,35 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.transformNamesString = exports.insertSeparator = void 0;
+exports.defaultGetValueFromEvent = defaultGetValueFromEvent;
+exports.transformNamesString = exports.transformColumns = exports.isUpperCase = exports.insertSeparator = exports.getValueTypeTrans = exports.getValueMiddleware = exports.getReactiveProps = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _lodash = require("lodash");
+var _antd = require("antd");
+var _valueType = _interopRequireDefault(require("../../../utils/valueType"));
+var _useDeepCompareMemo = require("../../../utils/useDeepCompareMemo");
 /**
-* 插入间隔符
-* @param columns 表单配置数组
-* @returns
-*/
-var insertSeparator = exports.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 (0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
-        name: names[index]
-      });
-    });
-  }
+ * 插入间隔符
+ * @param columns 表单配置数组
+ * @returns
+ */
+var insertSeparator = exports.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: (0, _jsxRuntime.jsx)(_antd.Button, {
+          className: "group-separator",
+          children: space.separator
+        }),
         fieldProps: {
           disabled: true
         }
@@ -41,6 +41,14 @@ var insertSeparator = exports.insertSeparator = function insertSeparator(columns
     return result;
   }, []);
 };
+/** 带出event的组件默认取值方法 */
+function defaultGetValueFromEvent(valuePropName) {
+  var event = arguments.length <= 1 ? undefined : arguments[1];
+  if (event && event.target && (0, _typeof2.default)(event.target) === 'object' && valuePropName in event.target) {
+    return event.target[valuePropName];
+  }
+  return event;
+}
 /** 转换names */
 var transformNamesString = exports.transformNamesString = function transformNamesString(arr) {
   var result = arr.map(function (subArr) {
@@ -50,4 +58,186 @@ var transformNamesString = exports.transformNamesString = function transformName
     return subArr;
   });
   return result;
+};
+/**
+ * Input TextArea 小写自动转大写
+ * @param type 组件类型
+ * @param upperCase 是否小写转大写
+ * @returns {}
+ */
+var isUpperCase = exports.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;
+};
+/** 计算响应式参数的值 */
+var getReactiveProps = exports.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 = (0, _lodash.isFunction)(disabled) ? disabled(values, {
+    form: form,
+    index: index,
+    namePath: namePath
+  }) : disabled;
+  var _show = (0, _lodash.isFunction)(show) ? show(values, {
+    form: form,
+    index: index,
+    namePath: namePath
+  }) : show;
+  var _component = (0, _lodash.isFunction)(component) ? component(values, {
+    form: form,
+    index: index,
+    namePath: namePath
+  }) : component;
+  var _fieldProps = (0, _lodash.isFunction)(fieldProps) ? fieldProps(values, {
+    form: form,
+    index: index,
+    namePath: namePath
+  }) : fieldProps;
+  return {
+    disabled: _disabled,
+    show: _show,
+    component: _component,
+    fieldProps: _fieldProps
+  };
+};
+/** 获取当前字段的转换函数 */
+var getValueTypeTrans = exports.getValueTypeTrans = function 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;
+};
+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() || '';
+};
+/** 执行所有中间件 返回处理后的值 */
+var getValueMiddleware = exports.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, (0, _toConsumableArray2.default)(args));
+  } else {
+    newValue = defaultGetValueFromEvent.apply(void 0, [valuePropName].concat((0, _toConsumableArray2.default)(args)));
+  }
+  var list = [];
+  if (trim) list.push(getTrim);
+  if (upperCase) list.push(getUpperCase);
+  return getValueMiddleware(newValue, list);
+};
+/** 转换columns */
+var transformColumns = exports.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 = (0, _useDeepCompareMemo.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 (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
+      name: columnName
+    }, reactiveProps), {}, {
+      disabled: reactiveProps.disabled || groupProps.disabled,
+      fieldProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, column === null || column === void 0 ? void 0 : column.fieldProps), {}, {
+        onChange: handleChange,
+        value: value === null || value === void 0 ? void 0 : value[index]
+      })
+    });
+  });
 };

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

@@ -292,58 +292,64 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleFinish = /*#__PURE__*/function () {
     var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
-      var _data, flag, res;
+      var _nextSelectedRows, _nextSelectedRows2, nextSelectedRows, record, flag, res;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.prev = 0;
-            if (selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length) {
+            if (selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) {
               _context2.next = 4;
               break;
             }
             _antd.message.error(_locale.default.ProModalSelect.checkMsg);
             return _context2.abrupt("return", false);
           case 4:
-            _data = isMultiple ? selectedRows : selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows[0];
+            nextSelectedRows = selectedRows;
+            if (!((_nextSelectedRows = nextSelectedRows) === null || _nextSelectedRows === void 0 ? void 0 : _nextSelectedRows[0])) {
+              nextSelectedRows = data.filter(function (item) {
+                return selectedRowKeys.includes(item[valueKey]);
+              });
+            }
+            record = isMultiple ? nextSelectedRows : (_nextSelectedRows2 = nextSelectedRows) === null || _nextSelectedRows2 === void 0 ? void 0 : _nextSelectedRows2[0];
             if (!isMultiple) {
               // @ts-ignore
-              _data.value = _data[valueKey];
+              record.value = record[valueKey];
               // @ts-ignore
-              _data.label = _data[labelKey];
+              record.label = record[labelKey];
             }
             flag = true;
             if (!onOk) {
-              _context2.next = 12;
+              _context2.next = 14;
               break;
             }
-            _context2.next = 10;
-            return onOk(_data);
-          case 10:
+            _context2.next = 12;
+            return onOk(record);
+          case 12:
             res = _context2.sent;
             if (res !== null && res !== undefined) {
               // @ts-ignore
               flag = res;
             }
-          case 12:
+          case 14:
             if (flag) {
-              onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? _data : getNextValues(_data), _data);
+              onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? record : getNextValues(record), record);
               // 更新内部展示值
               setState({
-                _value: _data,
-                options: (0, _lodash.isArray)(_data) ? _data : [_data]
+                _value: record,
+                options: (0, _lodash.isArray)(record) ? record : [record]
               });
               handleClose();
             }
             return _context2.abrupt("return", flag);
-          case 16:
-            _context2.prev = 16;
+          case 18:
+            _context2.prev = 18;
             _context2.t0 = _context2["catch"](0);
             console.warn('error', _context2.t0);
-          case 19:
+          case 21:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[0, 16]]);
+      }, _callee2, null, [[0, 18]]);
     }));
     return function handleFinish() {
       return _ref7.apply(this, arguments);
@@ -424,7 +430,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
-      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data2, nextSelectRowKeys;
+      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -455,15 +461,15 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               } else {
                 list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
               }
-              _data2 = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
-              if (_data2) {
+              _data = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
+              if (_data) {
                 nextSelectRowKeys = isMultiple ? value : [value];
                 if (labelInValue) {
-                  onChange(_data2);
+                  onChange(_data);
                 }
                 // 更新内部展示值
                 setState({
-                  _value: _data2,
+                  _value: _data,
                   isInit: false,
                   selectedRows: list,
                   selectedRowKeys: nextSelectRowKeys
@@ -490,7 +496,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var getDefaultOneValues = /*#__PURE__*/function () {
     var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
       var _useRequest$options4, _useRequest$options5;
-      var queryBean, page, params, res, _list2, list, _res$data3, _data3, nextSelectRowKeys;
+      var queryBean, page, params, res, _list2, list, _res$data3, _data2, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -514,18 +520,18 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               } else {
                 list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.list : res === null || res === void 0 ? void 0 : res.data;
               }
-              _data3 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
+              _data2 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
               nextSelectRowKeys = isMultiple ? value : [value];
               if (labelInValue) {
-                onChange(_data3);
+                onChange(_data2);
               } else {
-                onChange(isMultiple ? _data3.map(function (item) {
+                onChange(isMultiple ? _data2.map(function (item) {
                   return item[valueKey];
-                }) : _data3[valueKey]);
+                }) : _data2[valueKey]);
               }
               // 更新内部展示值
               setState({
-                _value: _data3,
+                _value: _data2,
                 isInit: false,
                 selectedRows: list,
                 selectedRowKeys: nextSelectRowKeys
@@ -594,8 +600,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           nextState.selectedRows = value;
         }
       } else if (value) {
+        console.log('value', value);
         nextState.selectedRowKeys = [value];
-        nextState.selectedRows = [(0, _defineProperty2.default)({}, valueKey, value[valueKey])];
       }
       setState(nextState);
     }

package/lib/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;

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

@@ -0,0 +1,113 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
+var _react = require("react");
+var _lodash = require("lodash");
+var _ahooks = require("ahooks");
+var _classnames2 = _interopRequireDefault(require("classnames"));
+var _RenderFields = _interopRequireDefault(require("../../render/RenderFields"));
+var _utils = require("./utils");
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
+var Group = function Group(props) {
+  var columns = props.children,
+    otherProps = props.otherProps,
+    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.default.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 = (0, _react.useMemo)(function () {
+    var fieldList = [];
+    var result = columns.map(function (item) {
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        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 = (0, _jsxRuntime.jsx)(_antd.Button, {
+      className: "group-separator",
+      children: space.separator
+    });
+    return {
+      columns: (0, _utils.insertSeparator)(result, space, node, otherProps),
+      fieldList: fieldList
+    };
+  }, [name, columns, space, props, names]);
+  var _className = (0, _classnames2.default)((0, _defineProperty2.default)({
+    'pro-group': true,
+    'pro-group-diy-width': columns.some(function (item) {
+      var _item$fieldProps, _item$fieldProps$styl;
+      return item === null || item === void 0 ? void 0 : (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : (_item$fieldProps$styl = _item$fieldProps.style) === null || _item$fieldProps$styl === void 0 ? void 0 : _item$fieldProps$styl.width;
+    }),
+    'pro-group-width-auto': columns.some(function (item) {
+      return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
+    })
+  }, "".concat(className), className));
+  // 用于formList场景下names移除掉了前缀，需要再次合并回来
+  var _names = names.map(function (item) {
+    if ((0, _lodash.isNumber)(item === null || item === void 0 ? void 0 : item[0])) {
+      return (0, _lodash.union)(newNamePath, item);
+    }
+    return item;
+  });
+  (0, _ahooks.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 ((0, _lodash.isFunction)(onFieldChange) && form.isFieldsTouched(_names) && (0, _utils.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 = (0, _lodash.omit)(otherProps, ['colProps', 'required']);
+  return (0, _jsxRuntime.jsx)("div", {
+    className: _className,
+    children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? (0, _jsxRuntime.jsx)(_antd.Space.Compact, {
+      children: (0, _jsxRuntime.jsx)(_RenderFields.default, (0, _objectSpread2.default)({
+        columns: data.columns,
+        form: form
+      }, _otherProps))
+    }) : (0, _jsxRuntime.jsx)(_antd.Space, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      align: "start"
+    }, (0, _lodash.omit)(space, ['separator', 'compact'])), {}, {
+      children: data.columns.map(function (column, index) {
+        return (0, _jsxRuntime.jsx)(_RenderFields.default, (0, _objectSpread2.default)({
+          columns: [column],
+          form: form
+        }, _otherProps), (column === null || column === void 0 ? void 0 : column.name) || index);
+      })
+    }))
+  });
+};
+var _default = exports.default = Group;

package/lib/ProForm/components/combination/_Group/propsType.d.ts

@@ -0,0 +1,35 @@
+import React from 'react';
+import { RowProps, SpaceProps } from 'antd';
+import { FormInstance } from 'antd/es/form/Form';
+import { NamePath } from 'antd/lib/form/interface';
+import { ProColumnProps, ProFormOtherProps } from '../../../propsType';
+export interface SpaceType extends SpaceProps {
+    /**
+     * 是否紧凑合并
+     */
+    compact?: Boolean;
+    /**
+     * 分隔符
+     */
+    separator?: string | React.ReactNode;
+    /** 间隔距离 */
+    size?: number;
+}
+export interface GroupProps {
+    children?: ProColumnProps[];
+    space?: SpaceType;
+    otherProps?: ProFormOtherProps;
+    rowProps?: RowProps;
+    className?: string;
+    value?: any;
+    id?: string;
+    disabled?: boolean | (() => void);
+    isView?: boolean;
+    namePath?: NamePath;
+    index?: number;
+    onFieldChange?: (value: any[] | null, record: any, { form, }: {
+        form: FormInstance;
+        namePath?: NamePath;
+        index?: number;
+    }) => any;
+}

package/lib/ProForm/components/combination/_Group/utils.d.ts

@@ -0,0 +1,10 @@
+import { ReactNode } from 'react';
+import { SpaceType } from './propsType';
+/**
+* 插入间隔符
+* @param columns 表单配置数组
+* @returns
+*/
+export declare const insertSeparator: (columns: any, space?: SpaceType, separatorNode?: ReactNode, otherProps?: any) => any;
+/** 转换names */
+export declare const transformNamesString: (arr: (string | string[])[]) => (string | string[])[];