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

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

@@ -5,9 +5,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _react = require("react");
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
@@ -15,7 +17,7 @@ var _lodash = require("lodash");
 var _icons = require("@ant-design/icons");
 var _ProIcon = _interopRequireDefault(require("../../../../../ProIcon"));
 var _locale = _interopRequireDefault(require("../../../../../locale"));
-var _excluded = ["label", "onClick", "onHandle", "actionType", "needConfirm", "confirmProps", "title"],
+var _excluded = ["label", "onClick", "onHandle", "type", "needConfirm", "confirmProps", "title"],
   _excluded2 = ["onClick", "label"];
 var getDefaultActions = function getDefaultActions(mode) {
   var originActions = {
@@ -27,7 +29,6 @@ var getDefaultActions = function getDefaultActions(mode) {
         var add = operation.add;
         add(undefined, index + 1);
       },
-      type: 'text',
       label: "".concat(_locale.default.ProForm.formListActions[0]),
       icon: (0, _jsxRuntime.jsx)(_icons.PlusSquareOutlined, {})
     },
@@ -39,7 +40,6 @@ var getDefaultActions = function getDefaultActions(mode) {
         var remove = operation.remove;
         remove(index);
       },
-      type: 'text',
       label: "".concat(_locale.default.ProForm.formListActions[1]),
       icon: mode === 'less' ? (0, _jsxRuntime.jsx)(_ProIcon.default, {
         type: "solid-close",
@@ -56,7 +56,6 @@ var getDefaultActions = function getDefaultActions(mode) {
         var add = operation.add;
         add(record, index + 1);
       },
-      type: 'text',
       label: "".concat(_locale.default.ProForm.formListActions[2]),
       icon: (0, _jsxRuntime.jsx)(_icons.CopyOutlined, {})
     },
@@ -68,7 +67,6 @@ var getDefaultActions = function getDefaultActions(mode) {
         var move = operation.move;
         move(index, index - 1);
       },
-      type: 'text',
       label: "".concat(_locale.default.ProForm.formListActions[3]),
       icon: (0, _jsxRuntime.jsx)(_icons.UpSquareOutlined, {})
     },
@@ -80,7 +78,6 @@ var getDefaultActions = function getDefaultActions(mode) {
         var move = operation.move;
         move(index, index + 1);
       },
-      type: 'text',
       label: "".concat(_locale.default.ProForm.formListActions[4]),
       icon: (0, _jsxRuntime.jsx)(_icons.DownSquareOutlined, {})
     }
@@ -104,7 +101,7 @@ var getDefaultActions = function getDefaultActions(mode) {
   return originActions;
 };
 var defaultActionProps = [{
-  actionType: 'delete'
+  type: 'delete'
 }];
 var ActionButton = function ActionButton(props) {
   var namePath = props.namePath,
@@ -122,24 +119,69 @@ var ActionButton = function ActionButton(props) {
   // 默认显示一个delete
   var actionProps = (0, _react.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 (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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((0, _toConsumableArray2.default)(props.actionProps), defaultActionProps) : defaultActionProps;
+      return _actionProps ? [].concat((0, _toConsumableArray2.default)(_actionProps), defaultActionProps) : defaultActionProps;
     }
-    return props.actionProps;
+    return _actionProps;
   }, [props.actionProps]);
-  var handleClick = function handleClick(callback, index, item) {
+  var handleClick = /*#__PURE__*/function () {
+    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(defaultCallback, callback, index, item) {
+      var value, data;
+      return (0, _regeneratorRuntime2.default)().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 = (0, _react.useMemo)(function () {
     return getDefaultActions(mode);
@@ -148,18 +190,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 (0, _jsxRuntime.jsx)("span", {}, "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
+      if (item.show === false) return (0, _jsxRuntime.jsx)("span", {}, "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index));
       if ((0, _lodash.isFunction)(item.show) && !item.show(form.getFieldValue(namePath), {
         namePath: namePath,
         index: index,
         form: form
       })) {
-        return (0, _jsxRuntime.jsx)("span", {}, "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
+        return (0, _jsxRuntime.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,
@@ -167,27 +209,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 (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
-        var _defaultActions$actio = defaultActions[actionType],
-          internalOnClick = _defaultActions$actio.onClick,
-          defaultLabel = _defaultActions$actio.label,
-          defaultRest = (0, _objectWithoutProperties2.default)(_defaultActions$actio, _excluded2);
+        var _defaultActions$type = defaultActions[type],
+          internalOnClick = _defaultActions$type.onClick,
+          defaultLabel = _defaultActions$type.label,
+          defaultRest = (0, _objectWithoutProperties2.default)(_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 ? (0, _jsxRuntime.jsx)(_antd.Popconfirm, (0, _objectSpread2.default)((0, _objectSpread2.default)({
@@ -196,22 +238,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: (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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)) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultRest), rest), {}, {
+        }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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 ? (0, _jsxRuntime.jsx)(_antd.Popconfirm, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         title: title !== null && title !== void 0 ? title : "".concat(_locale.default.ProForm.formListConfirmMessage),
@@ -219,20 +263,22 @@ var ActionButton = function ActionButton(props) {
           return e.stopPropagation();
         },
         onConfirm: function onConfirm() {
-          return handleClick(_onClick, index);
+          return customClick(_onClick, index);
         }
       }, _confirmProps), {}, {
         children: (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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__*/(0, _react.createElement)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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__*/(0, _react.createElement)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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/lib/ProForm/components/combination/FormList/components/ToolbarButton.js

@@ -5,16 +5,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _icons = require("@ant-design/icons");
 var _lodash = require("lodash");
 var _react = require("react");
 var _locale = _interopRequireDefault(require("../../../../../locale"));
-var _excluded = ["label", "onClick", "onHandle", "actionType"],
+var _excluded = ["label", "onClick", "onHandle", "type"],
   _excluded2 = ["onClick", "label"];
 var actions = {
   add: {
@@ -25,12 +27,11 @@ var actions = {
       operation.add();
     },
     label: "".concat(_locale.default.ProForm.formListActions[5]),
-    type: 'link',
     icon: (0, _jsxRuntime.jsx)(_icons.PlusOutlined, {})
   }
 };
 var defaultActionProps = [{
-  actionType: 'add'
+  type: 'add'
 }];
 var ToolbarButton = function ToolbarButton(props) {
   var namePath = props.namePath,
@@ -45,28 +46,71 @@ var ToolbarButton = function ToolbarButton(props) {
   // 默认显示一个delete
   var toolbarProps = (0, _react.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 (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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((0, _toConsumableArray2.default)(props.toolbarProps), defaultActionProps) : defaultActionProps;
+      return _toolbarProps ? [].concat((0, _toConsumableArray2.default)(_toolbarProps), defaultActionProps) : defaultActionProps;
     }
-    return props.toolbarProps;
+    return _toolbarProps;
   }, [props.toolbarProps]);
-  var handleClick = function handleClick(callback, item) {
+  var handleClick = /*#__PURE__*/function () {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(defaultCallback, callback, item) {
+      var value, data;
+      return (0, _regeneratorRuntime2.default)().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 (0, _jsxRuntime.jsx)(_antd.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 (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
       if ((0, _lodash.isFunction)(item.show) && !item.show(form.getFieldValue(namePath), {
         namePath: namePath,
@@ -77,32 +121,34 @@ var ToolbarButton = function ToolbarButton(props) {
       var label = item.label,
         _onClick2 = item.onClick,
         onHandle = item.onHandle,
-        actionType = item.actionType,
+        type = item.type,
         rest = (0, _objectWithoutProperties2.default)(item, _excluded);
       var _onClick = _onClick2 || onHandle;
-      if (['add'].includes(actionType)) {
+      if (type === 'add') {
         if (disabled || isView) return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
-        var _actions$actionType = actions[actionType],
-          internalOnClick = _actions$actionType.onClick,
-          defaultLabel = _actions$actionType.label,
-          defaultRest = (0, _objectWithoutProperties2.default)(_actions$actionType, _excluded2);
+        var _actions$type = actions[type],
+          internalOnClick = _actions$type.onClick,
+          defaultLabel = _actions$type.label,
+          defaultRest = (0, _objectWithoutProperties2.default)(_actions$type, _excluded2);
         // 大于等于max不可新增
-        if (max && max <= fields.length && ['add'].includes(actionType)) {
+        if (max && max <= fields.length && type === 'add') {
           return false;
         }
-        return (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, actions[actionType]), rest), {}, {
+        return (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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 (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
+        type: "link",
         onClick: function onClick() {
-          return handleClick(_onClick2, item);
+          return customClick(_onClick2, item);
         },
         children: label
-      }), actionType);
+      }), "".concat(type).concat(index));
     })
   });
 };

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

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _jsxRuntime = require("react/jsx-runtime");
+require("./index.less");
+var AddonWrapper = function AddonWrapper(props) {
+  var before = props.before,
+    after = props.after,
+    children = props.children;
+  return (0, _jsxRuntime.jsxs)("div", {
+    className: "addon-wrapper",
+    children: [before && (0, _jsxRuntime.jsx)("div", {
+      className: "before",
+      children: before
+    }), children, after && (0, _jsxRuntime.jsx)("div", {
+      className: "after",
+      children: after
+    })]
+  });
+};
+var _default = exports.default = AddonWrapper;

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

@@ -6,14 +6,36 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireDefault(require("react"));
 var _ConfirmWrapper = _interopRequireDefault(require("../../../../components/render/ConfirmWrapper"));
 var _useFieldProps = require("../../../../utils/useFieldProps");
 var componentMap = _interopRequireWildcard(require("../../../../../index"));
-var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps"];
+var _AddonWrapper = _interopRequireDefault(require("./AddonWrapper"));
+var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after"];
+// 这里的key与组件内参数一致, 决定使用哪个包裹组件
+var wrapperMap = {
+  confirm: _ConfirmWrapper.default,
+  before: _AddonWrapper.default,
+  after: _AddonWrapper.default
+};
+// 增加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 = (0, _jsxRuntime.jsx)(Wrapper, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, componentProps), (0, _defineProperty2.default)({}, item, props[item])), {}, {
+        children: Com
+      }));
+    }
+  });
+  return Com;
+};
 /** 渲染组件 */
 var ComRender = function ComRender(props) {
   var type = props.type,
@@ -21,24 +43,18 @@ var ComRender = function ComRender(props) {
     component = props.component,
     fieldProps = props.fieldProps,
     contextProps = props.contextProps,
+    before = props.before,
+    after = props.after,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var TypeComponent = componentMap[type];
-  var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, fieldProps), rest);
-  var Component;
-  if (confirm) {
-    Component = (0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      confirm: confirm
-    }, componentProps), {}, {
-      children: component || (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread2.default)({}, componentProps))
-    }));
-  } else {
-    Component = component ? ( /*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread2.default)({}, componentProps))) : (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread2.default)({}, componentProps));
-  }
+  var componentProps = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldProps), rest);
+  var Component = component ? ( /*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread3.default)({}, componentProps))) : (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread3.default)({}, componentProps));
+  var Com = getComRender(Component, props, componentProps);
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
-    value: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, contextProps), {}, {
+    value: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, contextProps), {}, {
       type: type
     }),
-    children: Component
+    children: Com
   });
 };
 var _default = exports.default = ComRender;

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

@@ -22,7 +22,7 @@ var _ComRender = _interopRequireDefault(require("./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,
@@ -47,7 +47,7 @@ var GroupCopy = function GroupCopy(props) {
     _option.current[index] = option;
     onChange(_value, _option.current);
   };
-  var columnsProps = (0, _utils.transformColumns)({
+  var columnsProps = (0, _utils.useTransformColumns)({
     columns: children,
     name: name,
     names: names,
@@ -72,12 +72,12 @@ var GroupCopy = function GroupCopy(props) {
   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: columns.map(function (column) {
+      children: columns.map(function (column, index) {
         return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
           contextProps: contextProps
         }, column), {}, {
           otherProps: otherProps
-        }));
+        }), column.name);
       })
     }) : (0, _jsxRuntime.jsx)(_antd.Space, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       align: "start"
@@ -87,9 +87,9 @@ var GroupCopy = function GroupCopy(props) {
           contextProps: contextProps
         }, column), {}, {
           otherProps: otherProps
-        }));
+        }), column.name);
       })
     }))
   });
 };
-var _default = exports.default = GroupCopy;
+var _default = exports.default = Group;

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