@zat-design/sisyphus-react 3.4.9 → 3.4.10

package/es/ProLayout/components/ProCollapse/style/index.less

@@ -11,9 +11,12 @@
   }
 
   &.pro-collapse-no-title {
-    .@{ant-prefix}-collapse-header {
-      display: none !important;
+    &>.pro-collapse-panel{
+      &>.@{ant-prefix}-collapse-header {
+        display: none !important;
+      }
     }
+   
     .pro-collapse-level2{
       .@{ant-prefix}-collapse-header {
         display: flex !important;

package/es/ProLayout/style/index.less

@@ -39,7 +39,7 @@
       }
       .@{ant-prefix}-collapse-item-active{
         &.pro-collapse-panel{
-          .@{ant-prefix}-collapse-header{
+          & > .@{ant-prefix}-collapse-header{
             border-radius: var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px) 0 0 !important;
           }
         }

package/es/ProSelect/index.js

@@ -23,10 +23,11 @@ import { getSelectList } from './utils';
 import './index.less';
 var Option = _Select.Option;
 export var ProSelect = function ProSelect(props, ref) {
-  var _locale$ProSelect;
+  var _selectProps$showCode, _locale$ProSelect;
   var _ref = useProConfig('ProSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
-    proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames;
+    proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
+    showCodeName = _ref.showCodeName;
   var label = 'label';
   var code = 'value';
   if (proSelectFieldNames && Object.keys(proSelectFieldNames).length) {
@@ -54,6 +55,7 @@ export var ProSelect = function ProSelect(props, ref) {
     transformResponse = props.transformResponse,
     isViewPro = props.isView,
     selectProps = _objectWithoutProperties(props, _excluded);
+  selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
   var value = props.value;
   var _ref2 = ProForm.useFieldProps() || {},
     isViewCon = _ref2.isView,
@@ -274,7 +276,8 @@ export var ProSelect = function ProSelect(props, ref) {
       otherProps: otherProps,
       value: props.value,
       dataSource: selectList,
-      labelInValue: labelInValue
+      labelInValue: labelInValue,
+      fieldNames: fieldNames
     });
   }
   return _jsx(_Select, _objectSpread(_objectSpread({

package/es/ProSelect/utils/index.d.ts

@@ -1,9 +1,10 @@
 /**
  * 返回当前组件可以显示的数据源
  */
-export declare const getSelectList: ({ otherProps, value, dataSource, labelInValue, }: {
+export declare const getSelectList: ({ otherProps, value, dataSource, labelInValue, fieldNames, }: {
     otherProps: any;
     value: any;
     dataSource: any;
     labelInValue: any;
+    fieldNames: any;
 }) => any;

package/es/ProSelect/utils/index.js

@@ -6,7 +6,8 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
     selectName = _ref.selectName,
     value = _ref.value,
     dataSource = _ref.dataSource,
-    labelInValue = _ref.labelInValue;
+    labelInValue = _ref.labelInValue,
+    fieldNames = _ref.fieldNames;
   var selectValues = [];
   list.forEach(function (item) {
     var result = item;
@@ -29,7 +30,7 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
   });
   var diffList = _.difference(selectValues, [value]);
   return dataSource.filter(function (item) {
-    return !diffList.includes(labelInValue ? item : item.value);
+    return !diffList.includes(labelInValue ? item : item[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value] || (item === null || item === void 0 ? void 0 : item.value));
   });
 };
 /**
@@ -39,15 +40,16 @@ export var getSelectList = function getSelectList(_ref2) {
   var otherProps = _ref2.otherProps,
     value = _ref2.value,
     dataSource = _ref2.dataSource,
-    labelInValue = _ref2.labelInValue;
+    labelInValue = _ref2.labelInValue,
+    fieldNames = _ref2.fieldNames;
   if (!otherProps) {
     return null;
   }
   var listName = otherProps.listName,
     form = otherProps.form;
-  var firstNumberIndex = listName.findIndex(function (item) {
+  var firstNumberIndex = listName.lastIndexOf(listName.findLast(function (item) {
     return typeof item === 'number';
-  });
+  }));
   var fatherName = listName.slice(0, firstNumberIndex);
   var selectName = listName.slice(firstNumberIndex + 1);
   return findSelectNameValues({
@@ -55,6 +57,7 @@ export var getSelectList = function getSelectList(_ref2) {
     selectName: selectName,
     value: value,
     dataSource: dataSource,
-    labelInValue: labelInValue
+    labelInValue: labelInValue,
+    fieldNames: fieldNames
   });
 };

package/es/ProTree/components/Tree.js

@@ -337,11 +337,14 @@ function List(props) {
     return loop(newTreeData, -1);
   }
   var _treeData = fn();
-  var onExpand = function onExpand(newExpandedKeys) {
+  var onExpand = function onExpand(newExpandedKeys, nextPara) {
     setState({
       expandedKeys: newExpandedKeys,
       autoExpandParent: false
     });
+    if (other.onExpand) {
+      other.onExpand(newExpandedKeys, nextPara);
+    }
   };
   var others = other;
   return _jsx("div", {

package/es/ProTree/propsType.d.ts

@@ -65,6 +65,11 @@ export interface ProTreeProps extends PropTreeSelectProps {
     onSelect?: (values: string[] | AllValueType, info?: any) => any;
     /** 复选情况下点击checkbox触发,参照antd */
     onCheck?: (values: string[] | AllValueType, info?: any) => any;
+    onExpand?: (newExpandedKeys: React.Key[], nextPara: {
+        expanded: boolean;
+        node: DataOption;
+        nativeEvent: PointerEvent;
+    }) => void;
     /** 自定义展示 */
     optionRender?: (item: any, searchStr: string) => string | ReactNode;
     /** 对后台返回数据进行格式化 */

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

@@ -92,6 +92,10 @@ var RenderField = function RenderField(_ref) {
   }
   // type类型 首字母转大写
   type = ((_type = type) === null || _type === void 0 ? void 0 : (_type$replace = _type.replace) === null || _type$replace === void 0 ? void 0 : _type$replace.call(_type, type[0], type[0].toUpperCase())) || 'Input';
+  // 自定义组件时 防止默认值影像后续判断
+  if ('component' in column) {
+    type = null;
+  }
   // 单行正在编辑时，临时生成一套formItem用来存储中间值，点击取消时候重置回上一次状态
   var namePath = (0, _tools.getNamePath)(name, virtualKey);
   var rowData = form.getFieldValue([].concat((0, _toConsumableArray2.default)(namePath), [index])) || record || {};
@@ -525,7 +529,8 @@ var RenderField = function RenderField(_ref) {
     delete _formItemProps.rules;
   }
   var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-changed', changed));
-  var FormItem = TargetComponent ? (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  var FormItem = null;
+  FormItem = TargetComponent ? (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     validateFirst: true
   }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
@@ -534,6 +539,20 @@ var RenderField = function RenderField(_ref) {
   })) : (0, _jsxRuntime.jsx)(_Container.default, {
     viewEmpty: viewEmpty
   });
+  if (type === 'FormList') {
+    FormItem = (0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
+    }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+      children: function children(fields, operation, meta) {
+        return (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
+          otherProps: otherProps,
+          fields: fields,
+          operation: operation,
+          meta: meta
+        }));
+      }
+    }));
+  }
   var originalTitle = originalDiffTip && originalValues ? (0, _jsxRuntime.jsxs)(_antd.Space, {
     children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
       isView: true,

package/lib/ProEditTable/propsType.d.ts

@@ -66,12 +66,12 @@ export interface BaseActionProps<T = any> {
      * @description       按钮前置校验事件
      * @default           -
      */
-    onClick?: ShowFunction<T>;
+    onClick?: (record?: any, index?: number) => any;
     /**
      * @description       按钮前置校验事件
      * @default           -
      */
-    onHandle?: ShowFunction<T>;
+    onHandle?: (record?: any, index?: number) => any;
     /**
      * @description       支持antd的Button属性
      * @default           -

package/lib/ProEditTable/utils/index.js

@@ -254,6 +254,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
       after = item.after;
     // column设置label时，权重最高
     var columnTitle = label || title;
+    item.title = columnTitle;
     if (typeof columnTitle === 'string') {
       item.originTitle = columnTitle;
       if (tooltip) {

package/lib/ProEnum/components/Group.d.ts

@@ -4,6 +4,7 @@ interface Props extends Pick<ProEnum, 'value' | 'onChange' | 'dataSource'> {
     fieldLabel: string;
     disabled?: boolean;
     allowClear?: boolean;
+    button?: boolean;
 }
 declare const Group: (props: Props) => JSX.Element;
 export default Group;

package/lib/ProEnum/index.js

@@ -27,8 +27,9 @@ var _useEnum = _interopRequireDefault(require("./hooks/useEnum"));
 var _locale = _interopRequireDefault(require("../locale"));
 require("./style/index.less");
 var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component", "onChange", "transformResponse", "otherProps"],
-  _excluded2 = ["fieldNames", "clear", "cacheKey"];
+  _excluded2 = ["fieldNames", "clear", "cacheKey", "showCodeName"];
 var ProEnum = function ProEnum(props) {
+  var _enumProps$showCodeNa;
   var code = props.code,
     _props$type = props.type,
     type = _props$type === void 0 ? 'ProSelect' : _props$type,
@@ -42,15 +43,16 @@ var ProEnum = function ProEnum(props) {
     enumProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = otherProps || {},
     isView = _ref.isView,
-    viewEmpty = _ref.viewEmpty,
-    disabled = _ref.disabled;
+    viewEmpty = _ref.viewEmpty;
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
     clear = _ref2$clear === void 0 ? true : _ref2$clear,
     _ref2$cacheKey = _ref2.cacheKey,
     cacheKey = _ref2$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref2$cacheKey,
+    showCodeName = _ref2.showCodeName,
     resProps = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
+  enumProps.showCodeName = (_enumProps$showCodeNa = enumProps.showCodeName) !== null && _enumProps$showCodeNa !== void 0 ? _enumProps$showCodeNa : showCodeName;
   var label = '';
   var fieldValue = '';
   var _useState = (0, _react.useState)(dataSource || []),
@@ -166,6 +168,7 @@ var ProEnum = function ProEnum(props) {
     switch (type) {
       case 'ProSelect':
         return (0, _jsxRuntime.jsx)(_ProSelect.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, enumProps), {}, {
+          otherProps: otherProps,
           dataSource: list,
           fieldNames: {
             label: label,
@@ -236,8 +239,11 @@ var ProEnum = function ProEnum(props) {
           return item[fieldValue] === (v === null || v === void 0 ? void 0 : v[fieldValue]);
         }
         return item[fieldValue] === v;
-      });
-      return enumProps.showCodeName ? "".concat(option[fieldValue], "-").concat(option[label]) : option === null || option === void 0 ? void 0 : option[label];
+      }) || {};
+      if (!option) {
+        return '';
+      }
+      return enumProps.showCodeName ? "".concat(option === null || option === void 0 ? void 0 : option[fieldValue], "-").concat(option === null || option === void 0 ? void 0 : option[label]) : option === null || option === void 0 ? void 0 : option[label];
     });
     var record = value.map(function (v) {
       return list.find(function (item) {

package/lib/ProEnum/style/index.less

@@ -76,8 +76,8 @@
     }
 
     .pro-enum-group-item-selected {
-      color: var(--zaui-brand);
-      background: #fff;
+      background: var(--zaui-brand);
+      color: #fff;
       border: 1px solid var(--zaui-brand);
       &::after {
         background: transparent;

package/lib/ProForm/components/base/InputNumber/index.js

@@ -231,6 +231,10 @@ var InputNumber = function InputNumber(props) {
       min: Number(_min),
       max: Number(_max)
     };
+    // 截取数字指定精度
+    if (props.precision !== undefined) {
+      value = Number(value.toFixed(props.precision));
+    }
     switch (valueType || viewType) {
       // 百分比
       case 'percent':
@@ -245,7 +249,6 @@ var InputNumber = function InputNumber(props) {
         value = limitNumber(value, limit);
         break;
     }
-    // 第一个类型转换值，第二个原始值
     onBlur(value, Number(e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.value));
   };
   return (0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({

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

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 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 _react = require("react");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -129,17 +131,55 @@ var ActionButton = function ActionButton(props) {
     }
     return props.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.actionType) === '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);
@@ -196,7 +236,7 @@ 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), {}, {
@@ -208,7 +248,7 @@ var ActionButton = function ActionButton(props) {
         }), "".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), {}, {
           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));
@@ -219,7 +259,7 @@ 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), {}, {
@@ -232,7 +272,7 @@ var ActionButton = function ActionButton(props) {
         key: "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index),
         onClick: function onClick(e) {
           e.stopPropagation();
-          handleClick(_onClick, index);
+          customClick(_onClick, index);
         }
       }), label));
     })

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

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 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 _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
@@ -52,16 +54,52 @@ var ToolbarButton = function ToolbarButton(props) {
     }
     return props.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.actionType) === '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",
@@ -92,14 +130,14 @@ var ToolbarButton = function ToolbarButton(props) {
         }
         return (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, actions[actionType]), rest), {}, {
           onClick: function onClick() {
-            return handleClick(_onClick || internalOnClick, item);
+            return handleClick(internalOnClick, _onClick, item);
           },
           children: label || defaultLabel
         }), actionType);
       }
       return (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
         onClick: function onClick() {
-          return handleClick(_onClick2, item);
+          return customClick(_onClick2, item);
         },
         children: label
       }), actionType);

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;