@zat-design/sisyphus-react 3.4.9 → 3.4.10-beta.10

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

@@ -1,13 +1,15 @@
 import "antd/es/button/style";
 import _Button from "antd/es/button";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/popconfirm/style";
 import _Popconfirm from "antd/es/popconfirm";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-var _excluded = ["label", "onClick", "onHandle", "actionType", "needConfirm", "confirmProps", "title"],
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+var _excluded = ["label", "onClick", "onHandle", "type", "needConfirm", "confirmProps", "title"],
   _excluded2 = ["onClick", "label"];
 import { createElement as _createElement } from "react";
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
@@ -26,7 +28,6 @@ var getDefaultActions = function getDefaultActions(mode) {
         var add = operation.add;
         add(undefined, index + 1);
       },
-      type: 'text',
       label: "".concat(locale.ProForm.formListActions[0]),
       icon: _jsx(PlusSquareOutlined, {})
     },
@@ -38,7 +39,6 @@ var getDefaultActions = function getDefaultActions(mode) {
         var remove = operation.remove;
         remove(index);
       },
-      type: 'text',
       label: "".concat(locale.ProForm.formListActions[1]),
       icon: mode === 'less' ? _jsx(ProIcon, {
         type: "solid-close",
@@ -55,7 +55,6 @@ var getDefaultActions = function getDefaultActions(mode) {
         var add = operation.add;
         add(record, index + 1);
       },
-      type: 'text',
       label: "".concat(locale.ProForm.formListActions[2]),
       icon: _jsx(CopyOutlined, {})
     },
@@ -67,7 +66,6 @@ var getDefaultActions = function getDefaultActions(mode) {
         var move = operation.move;
         move(index, index - 1);
       },
-      type: 'text',
       label: "".concat(locale.ProForm.formListActions[3]),
       icon: _jsx(UpSquareOutlined, {})
     },
@@ -79,7 +77,6 @@ var getDefaultActions = function getDefaultActions(mode) {
         var move = operation.move;
         move(index, index + 1);
       },
-      type: 'text',
       label: "".concat(locale.ProForm.formListActions[4]),
       icon: _jsx(DownSquareOutlined, {})
     }
@@ -103,7 +100,7 @@ var getDefaultActions = function getDefaultActions(mode) {
   return originActions;
 };
 var defaultActionProps = [{
-  actionType: 'delete'
+  type: 'delete'
 }];
 var ActionButton = function ActionButton(props) {
   var namePath = props.namePath,
@@ -121,24 +118,69 @@ var ActionButton = function ActionButton(props) {
   // 默认显示一个delete
   var actionProps = useMemo(function () {
     var _props$actionProps;
-    if (!((_props$actionProps = props.actionProps) === null || _props$actionProps === void 0 ? void 0 : _props$actionProps.find(function (item) {
-      return item.actionType === 'delete';
+    // 兼容 actionType 和 type
+    var _actionProps = (_props$actionProps = props.actionProps) === null || _props$actionProps === void 0 ? void 0 : _props$actionProps.map(function (item) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        // @ts-ignore
+        type: item.actionType
+      });
+    });
+    if (!(_actionProps === null || _actionProps === void 0 ? void 0 : _actionProps.find(function (item) {
+      return item.type === 'delete';
     }))) {
-      return (props === null || props === void 0 ? void 0 : props.actionProps) ? [].concat(_toConsumableArray(props.actionProps), defaultActionProps) : defaultActionProps;
+      return _actionProps ? [].concat(_toConsumableArray(_actionProps), defaultActionProps) : defaultActionProps;
     }
-    return props.actionProps;
+    return _actionProps;
   }, [props.actionProps]);
-  var handleClick = function handleClick(callback, index, item) {
+  var handleClick = /*#__PURE__*/function () {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, index, item) {
+      var value, data;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            value = form.getFieldValue(namePath);
+            _context.next = 3;
+            return callback === null || callback === void 0 ? void 0 : callback(value, {
+              namePath: namePath,
+              index: index,
+              operation: operation,
+              form: form
+            });
+          case 3:
+            data = _context.sent;
+            if (!(!callback || data === true)) {
+              _context.next = 7;
+              break;
+            }
+            defaultCallback === null || defaultCallback === void 0 ? void 0 : defaultCallback(value, {
+              namePath: namePath,
+              index: index,
+              operation: operation,
+              form: form
+            });
+            return _context.abrupt("return");
+          case 7:
+            if ((item === null || item === void 0 ? void 0 : item.type) === 'add') {
+              operation.add(data, index !== undefined ? index + 1 : undefined);
+            }
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleClick(_x, _x2, _x3, _x4) {
+      return _ref6.apply(this, arguments);
+    };
+  }();
+  var customClick = function customClick(callback, index) {
     var value = form.getFieldValue(namePath);
-    var data = callback === null || callback === void 0 ? void 0 : callback(value, {
+    callback === null || callback === void 0 ? void 0 : callback(value, {
       namePath: namePath,
       index: index,
       operation: operation,
       form: form
     });
-    if ((item === null || item === void 0 ? void 0 : item.actionType) === 'add') {
-      operation.add(data, index !== undefined ? index + 1 : undefined);
-    }
   };
   var defaultActions = useMemo(function () {
     return getDefaultActions(mode);
@@ -147,18 +189,18 @@ var ActionButton = function ActionButton(props) {
     align: "start",
     className: "pro-form-list-action",
     children: actionProps === null || actionProps === void 0 ? void 0 : actionProps.map(function (item) {
-      if (item.show === false) return _jsx("span", {}, "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
+      if (item.show === false) return _jsx("span", {}, "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index));
       if (isFunction(item.show) && !item.show(form.getFieldValue(namePath), {
         namePath: namePath,
         index: index,
         form: form
       })) {
-        return _jsx("span", {}, "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
+        return _jsx("span", {}, "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index));
       }
       var label = item.label,
         onClick = item.onClick,
         onHandle = item.onHandle,
-        actionType = item.actionType,
+        type = item.type,
         needConfirm = item.needConfirm,
         confirmProps = item.confirmProps,
         title = item.title,
@@ -166,27 +208,27 @@ var ActionButton = function ActionButton(props) {
       var _needConfirm = needConfirm || confirmProps;
       var _confirmProps = !confirmProps || confirmProps === true ? {} : confirmProps;
       var _onClick = onClick || onHandle;
-      if (['add', 'delete', 'copy', 'moveUp', 'moveDown'].includes(actionType)) {
+      if (['add', 'delete', 'copy', 'moveUp', 'moveDown'].includes(type)) {
         // 禁用状态默认隐藏内置操作按钮
         if (disabled || isView) return _jsx(_Fragment, {});
-        var _defaultActions$actio = defaultActions[actionType],
-          internalOnClick = _defaultActions$actio.onClick,
-          defaultLabel = _defaultActions$actio.label,
-          defaultRest = _objectWithoutProperties(_defaultActions$actio, _excluded2);
+        var _defaultActions$type = defaultActions[type],
+          internalOnClick = _defaultActions$type.onClick,
+          defaultLabel = _defaultActions$type.label,
+          defaultRest = _objectWithoutProperties(_defaultActions$type, _excluded2);
         // 小于min不可删除
-        if (min && min >= fields.length && ['delete'].includes(actionType)) {
+        if (min && min >= fields.length && ['delete'].includes(type)) {
           return false;
         }
         // 大于等于max不可新增和复制
-        if (max && max <= fields.length && ['add', 'copy'].includes(actionType)) {
+        if (max && max <= fields.length && ['add', 'copy'].includes(type)) {
           return false;
         }
         // 下标为零 不可向上移动
-        if (index === 0 && ['moveUp'].includes(actionType)) {
+        if (index === 0 && ['moveUp'].includes(type)) {
           return false;
         }
         // 下标最大 不可向下移动
-        if (index + 1 === fields.length && ['moveDown'].includes(actionType)) {
+        if (index + 1 === fields.length && type === 'moveDown') {
           return false;
         }
         return _needConfirm ? _jsx(_Popconfirm, _objectSpread(_objectSpread({
@@ -195,22 +237,24 @@ var ActionButton = function ActionButton(props) {
             return e.stopPropagation();
           },
           onConfirm: function onConfirm(e) {
-            handleClick(_onClick || internalOnClick, index, item);
+            handleClick(internalOnClick, _onClick, index, item);
           }
         }, _confirmProps), {}, {
           children: _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, defaultRest), rest), {}, {
+            type: "text",
             onClick: function onClick(e) {
               return e.stopPropagation();
             },
             children: label || defaultLabel
           }))
-        }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index)) : _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, defaultRest), rest), {}, {
+        }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, defaultRest), rest), {}, {
+          type: "text",
           onClick: function onClick(e) {
             e.stopPropagation();
-            handleClick(_onClick || internalOnClick, index, item);
+            handleClick(internalOnClick, _onClick, index, item);
           },
           children: label || defaultLabel
-        }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
+        }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index));
       }
       return needConfirm ? _jsx(_Popconfirm, _objectSpread(_objectSpread({
         title: title !== null && title !== void 0 ? title : "".concat(locale.ProForm.formListConfirmMessage),
@@ -218,20 +262,22 @@ var ActionButton = function ActionButton(props) {
           return e.stopPropagation();
         },
         onConfirm: function onConfirm() {
-          return handleClick(_onClick, index);
+          return customClick(_onClick, index);
         }
       }, _confirmProps), {}, {
         children: _jsx(_Button, _objectSpread(_objectSpread({}, rest), {}, {
+          type: "text",
           onClick: function onClick(e) {
             return e.stopPropagation();
           },
           children: label
         }))
-      }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index)) : ( /*#__PURE__*/_createElement(_Button, _objectSpread(_objectSpread({}, rest), {}, {
-        key: "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index),
+      }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : ( /*#__PURE__*/_createElement(_Button, _objectSpread(_objectSpread({}, rest), {}, {
+        key: "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index),
+        type: "text",
         onClick: function onClick(e) {
           e.stopPropagation();
-          handleClick(_onClick, index);
+          customClick(_onClick, index);
         }
       }), label));
     })

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

@@ -1,11 +1,13 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-var _excluded = ["label", "onClick", "onHandle", "actionType"],
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+var _excluded = ["label", "onClick", "onHandle", "type"],
   _excluded2 = ["onClick", "label"];
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { PlusOutlined } from '@ant-design/icons';
@@ -21,12 +23,11 @@ var actions = {
       operation.add();
     },
     label: "".concat(locale.ProForm.formListActions[5]),
-    type: 'link',
     icon: _jsx(PlusOutlined, {})
   }
 };
 var defaultActionProps = [{
-  actionType: 'add'
+  type: 'add'
 }];
 var ToolbarButton = function ToolbarButton(props) {
   var namePath = props.namePath,
@@ -41,28 +42,71 @@ var ToolbarButton = function ToolbarButton(props) {
   // 默认显示一个delete
   var toolbarProps = useMemo(function () {
     var _props$toolbarProps;
-    if (!((_props$toolbarProps = props.toolbarProps) === null || _props$toolbarProps === void 0 ? void 0 : _props$toolbarProps.find(function (item) {
-      return item.actionType === 'add';
+    // 兼容 actionType 和 type
+    var _toolbarProps = (_props$toolbarProps = props.toolbarProps) === null || _props$toolbarProps === void 0 ? void 0 : _props$toolbarProps.map(function (item) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        // @ts-ignore
+        type: item.actionType
+      });
+    });
+    if (!(_toolbarProps === null || _toolbarProps === void 0 ? void 0 : _toolbarProps.find(function (item) {
+      return item.type === 'add';
     }))) {
-      return (props === null || props === void 0 ? void 0 : props.toolbarProps) ? [].concat(_toConsumableArray(props.toolbarProps), defaultActionProps) : defaultActionProps;
+      return _toolbarProps ? [].concat(_toConsumableArray(_toolbarProps), defaultActionProps) : defaultActionProps;
     }
-    return props.toolbarProps;
+    return _toolbarProps;
   }, [props.toolbarProps]);
-  var handleClick = function handleClick(callback, item) {
+  var handleClick = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, item) {
+      var value, data;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            value = form.getFieldValue(namePath);
+            _context.next = 3;
+            return callback === null || callback === void 0 ? void 0 : callback(value, {
+              operation: operation,
+              form: form,
+              namePath: namePath
+            });
+          case 3:
+            data = _context.sent;
+            if (!(!callback || data === true)) {
+              _context.next = 7;
+              break;
+            }
+            defaultCallback === null || defaultCallback === void 0 ? void 0 : defaultCallback(value, {
+              operation: operation,
+              form: form,
+              namePath: namePath
+            });
+            return _context.abrupt("return");
+          case 7:
+            if ((item === null || item === void 0 ? void 0 : item.type) === 'add' && data) {
+              operation.add(data);
+            }
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleClick(_x, _x2, _x3) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var customClick = function customClick(callback, item) {
     var value = form.getFieldValue(namePath);
-    var data = callback === null || callback === void 0 ? void 0 : callback(value, {
+    callback === null || callback === void 0 ? void 0 : callback(value, {
       operation: operation,
       form: form,
       namePath: namePath
     });
-    if ((item === null || item === void 0 ? void 0 : item.actionType) === 'add' && data) {
-      operation.add(data);
-    }
   };
   return _jsx(_Space, {
     align: "start",
     className: "pro-form-list-toolbar",
-    children: toolbarProps === null || toolbarProps === void 0 ? void 0 : toolbarProps.map(function (item) {
+    children: toolbarProps === null || toolbarProps === void 0 ? void 0 : toolbarProps.map(function (item, index) {
       if (item.show === false) return _jsx(_Fragment, {});
       if (isFunction(item.show) && !item.show(form.getFieldValue(namePath), {
         namePath: namePath,
@@ -73,32 +117,34 @@ var ToolbarButton = function ToolbarButton(props) {
       var label = item.label,
         _onClick2 = item.onClick,
         onHandle = item.onHandle,
-        actionType = item.actionType,
+        type = item.type,
         rest = _objectWithoutProperties(item, _excluded);
       var _onClick = _onClick2 || onHandle;
-      if (['add'].includes(actionType)) {
+      if (type === 'add') {
         if (disabled || isView) return _jsx(_Fragment, {});
-        var _actions$actionType = actions[actionType],
-          internalOnClick = _actions$actionType.onClick,
-          defaultLabel = _actions$actionType.label,
-          defaultRest = _objectWithoutProperties(_actions$actionType, _excluded2);
+        var _actions$type = actions[type],
+          internalOnClick = _actions$type.onClick,
+          defaultLabel = _actions$type.label,
+          defaultRest = _objectWithoutProperties(_actions$type, _excluded2);
         // 大于等于max不可新增
-        if (max && max <= fields.length && ['add'].includes(actionType)) {
+        if (max && max <= fields.length && type === 'add') {
           return false;
         }
-        return _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, actions[actionType]), rest), {}, {
+        return _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, actions[type]), rest), {}, {
+          type: "link",
           onClick: function onClick() {
-            return handleClick(_onClick || internalOnClick, item);
+            return handleClick(internalOnClick, _onClick, item);
           },
           children: label || defaultLabel
-        }), actionType);
+        }), "".concat(type).concat(index));
       }
       return _jsx(_Button, _objectSpread(_objectSpread({}, rest), {}, {
+        type: "link",
         onClick: function onClick() {
-          return handleClick(_onClick2, item);
+          return customClick(_onClick2, item);
         },
         children: label
-      }), actionType);
+      }), "".concat(type).concat(index));
     })
   });
 };

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

@@ -14,8 +14,8 @@ export interface Option {
     form: FormInstance;
     operation: FormListOperation;
 }
-export interface ActionProps extends Omit<ButtonProps, 'onClick'> {
-    actionType?: 'add' | 'delete' | 'copy' | 'moveUp' | 'moveDown';
+export interface ActionProps extends Omit<ButtonProps, 'onClick' | 'type'> {
+    type?: 'add' | 'delete' | 'copy' | 'moveUp' | 'moveDown';
     onHandle?: Callback;
     onClick?: Callback;
     label?: string;
@@ -24,8 +24,8 @@ export interface ActionProps extends Omit<ButtonProps, 'onClick'> {
     title?: string;
     show?: boolean | ((record: any, option: Pick<Option, 'index' | 'form' | 'namePath'>) => boolean);
 }
-export interface ToolbarActionProps extends Omit<ActionProps, 'actionType' | 'onHandle' | 'onClick' | 'show'> {
-    actionType?: 'add';
+export interface ToolbarActionProps extends Omit<ActionProps, 'actionType' | 'onHandle' | 'onClick' | 'show' | 'type'> {
+    type?: 'add';
     onHandle?: ToolbarCallback;
     onClick?: ToolbarCallback;
     show?: boolean | ((record: any, option: Pick<Option, 'form' | 'namePath'>) => boolean);

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

@@ -0,0 +1,8 @@
+import React from 'react';
+import './index.less';
+interface Props {
+    before?: React.ReactNode;
+    after?: React.ReactNode;
+}
+declare const AddonWrapper: React.FC<Props>;
+export default AddonWrapper;

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

@@ -0,0 +1,18 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import './index.less';
+var AddonWrapper = function AddonWrapper(props) {
+  var before = props.before,
+    after = props.after,
+    children = props.children;
+  return _jsxs("div", {
+    className: "addon-wrapper",
+    children: [before && _jsx("div", {
+      className: "before",
+      children: before
+    }), children, after && _jsx("div", {
+      className: "after",
+      children: after
+    })]
+  });
+};
+export default AddonWrapper;

package/es/ProForm/components/combination/Group/component/AddonWrapper/index.less

@@ -0,0 +1,10 @@
+.addon-wrapper {
+  display: flex;
+  gap: 16px;
+  align-items: center;
+
+  .before,
+  .after {
+    white-space: nowrap;
+  }
+}

package/es/ProForm/components/combination/Group/component/ComRender.d.ts

@@ -8,6 +8,8 @@ interface Props {
     confirm: any;
     fieldProps: any;
     contextProps: any;
+    before?: React.ReactNode;
+    after?: React.ReactNode;
 }
 /** 渲染组件 */
 declare const ComRender: React.FC<Props>;

package/es/ProForm/components/combination/Group/component/ComRender.js

@@ -1,11 +1,33 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps"];
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
 import ConfirmWrapper from '../../../../components/render/ConfirmWrapper';
 import { FieldProvider } from '../../../../utils/useFieldProps';
 import * as componentMap from '../../../../../index';
+import AddonWrapper from './AddonWrapper';
+// 这里的key与组件内参数一致, 决定使用哪个包裹组件
+var wrapperMap = {
+  confirm: ConfirmWrapper,
+  before: AddonWrapper,
+  after: AddonWrapper
+};
+// 增加middleware根据配置增加多层包裹
+var getComRender = function getComRender(component, props, componentProps) {
+  var wrappers = Object.keys(wrapperMap);
+  var Com = component;
+  wrappers.forEach(function (item) {
+    if (item in props) {
+      var Wrapper = wrapperMap[item];
+      Com = _jsx(Wrapper, _objectSpread(_objectSpread(_objectSpread({}, componentProps), _defineProperty({}, item, props[item])), {}, {
+        children: Com
+      }));
+    }
+  });
+  return Com;
+};
 /** 渲染组件 */
 var ComRender = function ComRender(props) {
   var type = props.type,
@@ -13,24 +35,18 @@ var ComRender = function ComRender(props) {
     component = props.component,
     fieldProps = props.fieldProps,
     contextProps = props.contextProps,
+    before = props.before,
+    after = props.after,
     rest = _objectWithoutProperties(props, _excluded);
   var TypeComponent = componentMap[type];
   var componentProps = _objectSpread(_objectSpread({}, fieldProps), rest);
-  var Component;
-  if (confirm) {
-    Component = _jsx(ConfirmWrapper, _objectSpread(_objectSpread({
-      confirm: confirm
-    }, componentProps), {}, {
-      children: component || _jsx(TypeComponent, _objectSpread({}, componentProps))
-    }));
-  } else {
-    Component = component ? ( /*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
-  }
+  var Component = component ? ( /*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
+  var Com = getComRender(Component, props, componentProps);
   return _jsx(FieldProvider, {
     value: _objectSpread(_objectSpread({}, contextProps), {}, {
       type: type
     }),
-    children: Component
+    children: Com
   });
 };
 export default ComRender;

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

@@ -6,5 +6,5 @@ import { GroupProps } from './propsType';
  *
  * render内部能力 show, component, value, onChange, disabled, clearNotShow, fieldProps
  */
-declare const GroupCopy: React.FC<GroupProps>;
-export default GroupCopy;
+declare const Group: React.FC<GroupProps>;
+export default Group;

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

@@ -7,7 +7,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
 import { omit } from 'lodash';
 import classnames from 'classnames';
-import { insertSeparator, transformColumns } from './utils';
+import { insertSeparator, useTransformColumns } from './utils';
 import ProForm from '../../../../ProForm';
 import ComRender from './component/ComRender';
 /**
@@ -16,7 +16,7 @@ import ComRender from './component/ComRender';
  *
  * render内部能力 show, component, value, onChange, disabled, clearNotShow, fieldProps
  */
-var GroupCopy = function GroupCopy(props) {
+var Group = function Group(props) {
   var children = props.children,
     className = props.className,
     _props$space = props.space,
@@ -41,7 +41,7 @@ var GroupCopy = function GroupCopy(props) {
     _option.current[index] = option;
     onChange(_value, _option.current);
   };
-  var columnsProps = transformColumns({
+  var columnsProps = useTransformColumns({
     columns: children,
     name: name,
     names: names,
@@ -66,12 +66,12 @@ var GroupCopy = function GroupCopy(props) {
   return _jsx("div", {
     className: _className,
     children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {
-      children: columns.map(function (column) {
+      children: columns.map(function (column, index) {
         return _jsx(ComRender, _objectSpread(_objectSpread({
           contextProps: contextProps
         }, column), {}, {
           otherProps: otherProps
-        }));
+        }), column.name);
       })
     }) : _jsx(_Space, _objectSpread(_objectSpread({
       align: "start"
@@ -81,9 +81,9 @@ var GroupCopy = function GroupCopy(props) {
           contextProps: contextProps
         }, column), {}, {
           otherProps: otherProps
-        }));
+        }), column.name);
       })
     }))
   });
 };
-export default GroupCopy;
+export default Group;

package/es/ProForm/components/combination/Group/style/index.less

@@ -20,7 +20,7 @@
 
 .pro-group {
   width: unset !important;
-  
+  display: flex;
 
   &.pro-group-diy-width, &.pro-group-width-auto {
     .@{ant-prefix}-space .@{ant-prefix}-space-item {

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

@@ -59,5 +59,5 @@ interface ColumnsTransformerParams {
     groupProps: GroupProps;
 }
 /** 转换columns */
-export declare const transformColumns: (params: ColumnsTransformerParams) => any[];
+export declare const useTransformColumns: (params: ColumnsTransformerParams) => any[];
 export {};