@zat-design/sisyphus-react 3.13.14-deta.2 → 4.0.0-beta.3

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

@@ -1,20 +1,20 @@
-import "antd/es/form/style";
-import _Form from "antd/es/form";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _get from "lodash/get";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { forwardRef, useCallback, useImperativeHandle } from 'react';
+import React, { forwardRef, useCallback, useImperativeHandle } from 'react';
+import { Form } from 'antd';
 import { DndContext } from '@dnd-kit/core';
+import { get } from 'lodash';
 import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
-import { toArray } from '../../../utils';
-import { namesPathTransform } from './utils';
-import ToolbarButton from './components/ToolbarButton';
-import BlockFields from './components/BlockFields';
-import LineFields from './components/LineFields';
-import Empty from './components/Empty';
-import ProForm from '../../../../ProForm';
-import { useProConfig } from '../../../../ProConfigProvider';
+import { toArray } from "../../../utils";
+import { namesPathTransform } from "./utils";
+import ToolbarButton from "./components/ToolbarButton";
+import BlockFields from "./components/BlockFields";
+import LineFields from "./components/LineFields";
+import Empty from "./components/Empty";
+import ProForm from "../../../../ProForm";
+import { useProConfig } from "../../../../ProConfigProvider";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var FormList = function FormList(props, ref) {
   var columns = props.columns,
     min = props.min,
@@ -43,9 +43,9 @@ var FormList = function FormList(props, ref) {
     isDiffAll = _useProConfig.isDiffAll;
   var errors = meta.errors;
   var _namePath = toArray(name);
-  var orgValues = _get(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues, name);
+  var orgValues = get(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues, name);
   var _diffConfig = _objectSpread(_objectSpread({}, diffConfig), {}, {
-    originalValues: (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues) && isDiffAll ? orgValues || [] : orgValues
+    originalValues: diffConfig !== null && diffConfig !== void 0 && diffConfig.originalValues && isDiffAll ? orgValues || [] : orgValues
   });
   var processColumns = useCallback(function (fieldName, namePath) {
     return columns.map(function (item) {
@@ -57,7 +57,7 @@ var FormList = function FormList(props, ref) {
       })] : [fieldName].concat(_toConsumableArray(toArray(item.name)));
       var column = _objectSpread(_objectSpread({}, item), {}, {
         name: _name,
-        names: (item === null || item === void 0 ? void 0 : item.names) ? item.names.map(function (nameItem) {
+        names: item !== null && item !== void 0 && item.names ? item.names.map(function (nameItem) {
           // 传给Group的names会被渲染成真实FormItem 不能传完整name
           return [].concat(_toConsumableArray(namePath), _toConsumableArray(toArray(nameItem)));
         }) : item.names,
@@ -87,9 +87,9 @@ var FormList = function FormList(props, ref) {
       props.operation.move(activeIndex, overIndex);
     }
   };
-  return _jsx(DndContext, {
+  return /*#__PURE__*/_jsx(DndContext, {
     onDragEnd: handleDragEnd,
-    children: _jsxs(SortableContext, {
+    children: /*#__PURE__*/_jsxs(SortableContext, {
       items: _fields.map(function (item) {
         return {
           id: item.key
@@ -99,7 +99,7 @@ var FormList = function FormList(props, ref) {
       children: [_fields.map(function (field, index) {
         var namePath = [].concat(_toConsumableArray(_namePath), [field.name]);
         var _columns = processColumns(index, namePath);
-        return mode === 'block' ? _jsx(BlockFields, _objectSpread(_objectSpread({}, props), {}, {
+        return mode === 'block' ? /*#__PURE__*/_jsx(BlockFields, _objectSpread(_objectSpread({}, props), {}, {
           columns: _columns,
           disabled: disabled,
           isView: isView,
@@ -111,7 +111,7 @@ var FormList = function FormList(props, ref) {
           },
           form: form,
           diffConfig: _diffConfig
-        }), field.key) : _jsx(LineFields, _objectSpread(_objectSpread({
+        }), field.key) : /*#__PURE__*/_jsx(LineFields, _objectSpread(_objectSpread({
           className: _fields.length === index + 1 ? 'pro-form-list-last' : ''
         }, props), {}, {
           mode: mode,
@@ -127,16 +127,16 @@ var FormList = function FormList(props, ref) {
           form: form,
           diffConfig: _diffConfig
         }), field.key);
-      }), _fields.length === 0 && _jsx(Empty, {
+      }), _fields.length === 0 && /*#__PURE__*/_jsx(Empty, {
         disabled: disabled,
         toolbarProps: toolbarProps,
         operation: operation,
         form: form,
         namePath: _namePath,
         emptyBtnText: emptyBtnText
-      }), _jsx(_Form.ErrorList, {
+      }), /*#__PURE__*/_jsx(Form.ErrorList, {
         errors: errors
-      }), toolbarProps !== false && _fields.length > 0 && _jsx(ToolbarButton, {
+      }), toolbarProps !== false && _fields.length > 0 && /*#__PURE__*/_jsx(ToolbarButton, {
         disabled: disabled,
         isView: isView,
         min: min,

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

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-form-list-block-title {
   height: 14px;
@@ -69,6 +69,42 @@
   .@{ant-prefix}-btn-text:hover {
     background: transparent;
   }
+  .pro-form-list-tool-btn {
+    .@{ant-prefix}-btn-icon {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+
+  .pro-form-list-tool-btn-less{
+    &:hover{
+      background: transparent !important;
+    }
+  }
+}
+
+.pro-form-list-empty {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+
+  .pro-form-list-empty-img {
+    width: 80px;
+    height: 80px;
+  }
+
+  .pro-form-list-empty-content {
+    display: flex;
+    justify-content: center;
+    margin-top: var(--zaui-space-size-md, 16px);
+    color: @zaui-aide-text;
+
+    .@{ant-prefix}-btn-link {
+      padding: 0;
+    }
+  }
 }
 
 .pro-form-list-empty {

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

@@ -1,5 +1,6 @@
-import _isEqualWith from "lodash/isEqualWith";
+import { isEqualWith } from 'lodash';
 import React from 'react';
+
 /**
  * namesPath生产 [['list', 0, 'min'], ['list', 0, 'max']] => list_0_min-list_0_max
  * @param names  name的集合
@@ -20,10 +21,11 @@ export var namesPathTransform = function namesPathTransform(_ref) {
     return Array.isArray(name) ? name.join('_') : name;
   }).join('-');
 };
+
 // 比较memo
 export var memoWith = function memoWith(pre, next) {
-  return _isEqualWith(pre, next, function (objValue, othValue) {
-    if (/*#__PURE__*/React.isValidElement(objValue) && /*#__PURE__*/React.isValidElement(othValue)) {
+  return isEqualWith(pre, next, function (objValue, othValue) {
+    if ( /*#__PURE__*/React.isValidElement(objValue) && /*#__PURE__*/React.isValidElement(othValue)) {
       return true;
     }
     // 移除解决formlist函数里不更新问题

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

@@ -3,6 +3,7 @@ import './index.less';
 interface Props {
     before?: React.ReactNode;
     after?: React.ReactNode;
+    children?: React.ReactNode;
 }
 declare const AddonWrapper: React.FC<Props>;
 export default AddonWrapper;

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

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

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

@@ -1,19 +1,22 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType", "isView", "viewRender"];
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } 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';
+import ConfirmWrapper from "../../../../components/render/ConfirmWrapper";
+import { FieldProvider } from "../../../../utils/useFieldProps";
+import * as componentMap from "../../../../../index";
+import AddonWrapper from "./AddonWrapper";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 // 这里的key与组件内参数一致, 决定使用哪个包裹组件
 var wrapperMap = {
   confirm: ConfirmWrapper,
   before: AddonWrapper,
   after: AddonWrapper
 };
+
 // 增加middleware根据配置增加多层包裹
 var getComRender = function getComRender(component, props, componentProps) {
   var wrappers = Object.keys(wrapperMap);
@@ -21,16 +24,17 @@ var getComRender = function getComRender(component, props, componentProps) {
   wrappers.forEach(function (item) {
     if (item in props) {
       var Wrapper = wrapperMap[item];
-      Com = _jsx(Wrapper, _objectSpread(_objectSpread(_objectSpread({}, componentProps), _defineProperty({}, item, props[item])), {}, {
+      Com = /*#__PURE__*/_jsx(Wrapper, _objectSpread(_objectSpread(_objectSpread({}, componentProps), _defineProperty({}, item, props[item])), {}, {
         children: Com
       }));
     }
   });
   return Com;
 };
+
 /** 渲染组件 */
 var ComRender = function ComRender(props) {
-  var _props$component, _props$component$prop;
+  var _props$component;
   var type = props.type,
     confirm = props.confirm,
     component = props.component,
@@ -51,15 +55,15 @@ var ComRender = function ComRender(props) {
   };
   var _props = mergedGetValueProps(fieldProps.value);
   var componentProps = _objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), _props);
-  var isSeparator = (props === null || props === void 0 ? void 0 : (_props$component = props.component) === null || _props$component === void 0 ? void 0 : (_props$component$prop = _props$component.props) === null || _props$component$prop === void 0 ? void 0 : _props$component$prop.className) === 'group-separator';
+  var isSeparator = (props === null || props === void 0 || (_props$component = props.component) === null || _props$component === void 0 || (_props$component = _props$component.props) === null || _props$component === void 0 ? void 0 : _props$component.className) === 'group-separator';
   if (isSeparator && isView) {
-    var _props$component2, _props$component2$pro;
-    return _jsxs(_Fragment, {
-      children: [" ", props === null || props === void 0 ? void 0 : (_props$component2 = props.component) === null || _props$component2 === void 0 ? void 0 : (_props$component2$pro = _props$component2.props) === null || _props$component2$pro === void 0 ? void 0 : _props$component2$pro.children, " "]
+    var _props$component2;
+    return /*#__PURE__*/_jsxs(_Fragment, {
+      children: [" ", props === null || props === void 0 || (_props$component2 = props.component) === null || _props$component2 === void 0 || (_props$component2 = _props$component2.props) === null || _props$component2 === void 0 ? void 0 : _props$component2.children, " "]
     });
   }
   if (viewRender && isView) {
-    return _jsx(FieldProvider, {
+    return /*#__PURE__*/_jsx(FieldProvider, {
       value: _objectSpread(_objectSpread({}, contextProps), {}, {
         valueType: valueType,
         type: type,
@@ -68,9 +72,9 @@ var ComRender = function ComRender(props) {
       children: viewRender(componentProps)
     });
   }
-  var Component = component ? (/*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
+  var Component = component ? ( /*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : /*#__PURE__*/_jsx(TypeComponent, _objectSpread({}, componentProps));
   var Com = getComRender(Component, props, componentProps);
-  return _jsx(FieldProvider, {
+  return /*#__PURE__*/_jsx(FieldProvider, {
     value: _objectSpread(_objectSpread({}, contextProps), {}, {
       valueType: valueType,
       type: type,

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

@@ -1,12 +1,11 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _isEqual from "lodash/isEqual";
-import _cloneDeep from "lodash/cloneDeep";
 /* eslint-disable no-lonely-if */
 import { useRef } from 'react';
-import { useDeepCompareMemo } from '../../../../utils/useDeepCompareMemo';
-import { difference } from '../../../../../ProEditTable/utils/tools';
-import { getReactiveProps, getValueTypeTrans, valueFromEventWrapper } from '../utils';
+import { cloneDeep, isEqual } from 'lodash';
+import { useDeepCompareMemo } from "../../../../utils/useDeepCompareMemo";
+import { difference } from "../../../../../ProEditTable/utils/tools";
+import { getReactiveProps, getValueTypeTrans, valueFromEventWrapper } from "../utils";
 /** 转换columns */
 export var useTransformColumns = function useTransformColumns(params) {
   var form = params.form,
@@ -42,6 +41,7 @@ export var useTransformColumns = function useTransformColumns(params) {
       onBlur = _ref.onBlur;
     var _disabled = disabled || comDisabled;
     var columnName = names ? names[index] : [].concat(name, index);
+
     // 响应式字段改变后的回调
     var changedCallback = function changedCallback(lastDependency, current) {
       // 清值防抖  多次刷新时以最后一次为准
@@ -52,7 +52,7 @@ export var useTransformColumns = function useTransformColumns(params) {
             if (names) {
               form.resetFields([columnName]);
             }
-            if (!names && (value === null || value === void 0 ? void 0 : value.length)) {
+            if (!names && value !== null && value !== void 0 && value.length) {
               value[index] = null;
               form.setFieldValue(columnName, _toConsumableArray(value));
             }
@@ -62,6 +62,7 @@ export var useTransformColumns = function useTransformColumns(params) {
         }
       }
     };
+
     // 响应式字段
     // eslint-disable-next-line react-hooks/rules-of-hooks
     var reactiveProps = useDeepCompareMemo(function () {
@@ -95,32 +96,33 @@ export var useTransformColumns = function useTransformColumns(params) {
         args[_key] = arguments[_key];
       }
       newValue = valueFromEventWrapper(column, args);
-      if (transform === null || transform === void 0 ? void 0 : transform.normalize) {
+      if (transform !== null && transform !== void 0 && transform.normalize) {
         var _transform$normalize;
-        newValue = transform === null || transform === void 0 ? void 0 : (_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue);
+        newValue = transform === null || transform === void 0 || (_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue);
       } else if (normalize) {
         // @ts-ignore
         newValue = normalize === null || normalize === void 0 ? void 0 : normalize(newValue);
       }
-      internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
+      internalChange === null || internalChange === void 0 || internalChange(newValue, args[1], index);
       var values = form.getFieldValue(namePath);
-      var originRow = (namePath === null || namePath === void 0 ? void 0 : namePath.length) ? _cloneDeep(values) : undefined;
-      onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, args);
-      onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, values, {
+      var originRow = namePath !== null && namePath !== void 0 && namePath.length ? cloneDeep(values) : undefined;
+      onChange === null || onChange === void 0 || onChange.apply(void 0, args);
+      onFieldChange === null || onFieldChange === void 0 || onFieldChange(newValue, values, {
         index: outerIndex,
         namePath: namePath,
         form: form,
         option: args === null || args === void 0 ? void 0 : args[1]
       });
+
       // 如果是在可编辑表格或formList内部, 储存当前行的值, 并在变更后更新到表单里
-      if ((namePath === null || namePath === void 0 ? void 0 : namePath.length) && !_isEqual(originRow, values)) {
+      if (namePath !== null && namePath !== void 0 && namePath.length && !isEqual(originRow, values)) {
         var _Object$keys, _Object$keys$map;
         form.setFieldValue(namePath, values);
         var diff = difference(originRow, values) || {};
-        var validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
+        var validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 || (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
           return [].concat(_toConsumableArray(namePath), [key]);
         });
-        if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
+        if (validateFieldKeys !== null && validateFieldKeys !== void 0 && validateFieldKeys.length) {
           setTimeout(function () {
             form.validateFields([name].concat(_toConsumableArray(validateFieldKeys)));
           }, 100);
@@ -133,13 +135,14 @@ export var useTransformColumns = function useTransformColumns(params) {
       for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
         args[_key2] = arguments[_key2];
       }
-      onBlur === null || onBlur === void 0 ? void 0 : onBlur(args[0], values, {
+      onBlur === null || onBlur === void 0 || onBlur(args[0], values, {
         index: outerIndex,
         namePath: namePath,
         form: form,
         option: args === null || args === void 0 ? void 0 : args[1]
       });
     };
+
     // 内外一个为true则为true
     var getLastDisabled = function getLastDisabled() {
       if (Array.isArray(groupProps.disabled)) {

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

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

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

@@ -1,22 +1,22 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _omit from "lodash/omit";
-import { jsx as _jsx } from "react/jsx-runtime";
-import React from 'react';
+import { Space } from 'antd';
+import React, { memo } from 'react';
+import { isEqual, omit } from 'lodash';
 import classnames from 'classnames';
-import { insertSeparator } from './utils';
-import { useTransformColumns } from './hooks';
-import ProForm from '../../../../ProForm';
-import ComRender from './component/ComRender';
+import { insertSeparator } from "./utils";
+import { useTransformColumns } from "./hooks";
+import ProForm from "../../../../ProForm";
+import ComRender from "./component/ComRender";
+
 /**
  * 1. 外层过滤FormItem相关属性, 但是子元素上的 required [disabled] [show] rules [fieldProps] [component] 需要取到并
  * 2.
  *
  * render内部能力 show, component, value, onChange, disabled, clearNotShow, fieldProps
  */
+import { jsx as _jsx } from "react/jsx-runtime";
 var Group = function Group(props) {
   var children = props.children,
     className = props.className,
@@ -40,6 +40,7 @@ var Group = function Group(props) {
     index = contextProps.index,
     isView = contextProps.isView;
   var _option = React.useRef([]);
+
   // 组合onChange
   var handleChange = function handleChange(value, option, index) {
     var _value = props.value ? _toConsumableArray(props.value) : [];
@@ -64,39 +65,39 @@ var Group = function Group(props) {
   var _className = classnames(_defineProperty({
     '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;
+      var _item$fieldProps;
+      return item === null || item === void 0 || (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 || (_item$fieldProps = _item$fieldProps.style) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.width;
     }),
     'pro-group-width-auto': columns.some(function (item) {
       return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
     })
   }, "".concat(className), className));
-  return _jsx("div", {
+  return /*#__PURE__*/_jsx("div", {
     className: _className,
     id: id,
-    children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {
+    children: space.compact || space !== null && space !== void 0 && space.separator ? /*#__PURE__*/_jsx(Space.Compact, {
       children: columns.map(function (column, index) {
         column.otherProps = otherProps;
         // 自定义间隔移除对应参数
-        if (column === null || column === void 0 ? void 0 : column.separator) {
+        if (column !== null && column !== void 0 && column.separator) {
           delete column.separator;
           delete column.otherProps;
         }
-        return _jsx(ComRender, _objectSpread({
+        return /*#__PURE__*/_jsx(ComRender, _objectSpread({
           contextProps: contextProps,
           isView: isParentView || isView
         }, column), column.name || index);
       })
-    }) : _jsx(_Space, _objectSpread(_objectSpread({
+    }) : /*#__PURE__*/_jsx(Space, _objectSpread(_objectSpread({
       align: "start"
-    }, _omit(space, ['separator', 'compact'])), {}, {
+    }, omit(space, ['separator', 'compact'])), {}, {
       children: columns.map(function (column, index) {
         column.otherProps = otherProps;
-        if (column === null || column === void 0 ? void 0 : column.separator) {
+        if (column !== null && column !== void 0 && column.separator) {
           delete column.separator;
           delete column.otherProps;
         }
-        return _jsx(ComRender, _objectSpread({
+        return /*#__PURE__*/_jsx(ComRender, _objectSpread({
           contextProps: contextProps,
           isView: isParentView || isView
         }, column), column.name || index);
@@ -104,4 +105,10 @@ var Group = function Group(props) {
     }))
   });
 };
-export default Group;
+export default /*#__PURE__*/memo(Group, function (prevProps, nextProps) {
+  // 基本props比较 只比较关键的
+  if (!isEqual(prevProps === null || prevProps === void 0 ? void 0 : prevProps.value, nextProps === null || nextProps === void 0 ? void 0 : nextProps.value) || (prevProps === null || prevProps === void 0 ? void 0 : prevProps.disabled) !== (nextProps === null || nextProps === void 0 ? void 0 : nextProps.disabled) || !isEqual(prevProps === null || prevProps === void 0 ? void 0 : prevProps.children, nextProps === null || nextProps === void 0 ? void 0 : nextProps.children)) {
+    return false;
+  }
+  return true;
+});

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

@@ -1,28 +1,9 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
-
-.border-radius(@start-end: 0, @end-end: 0, @start-start: 0, @end-start: 0) {
-  border-start-end-radius: @start-end;
-  border-end-end-radius: @end-end;
-  border-start-start-radius: @start-start;
-  border-end-start-radius: @end-start;
-}
-
-.start-radius() {
-  border-start-start-radius: 4px;
-  border-end-start-radius: 4px;
-}
-
-.end-radius() {
-  border-start-end-radius: 4px;
-  border-end-end-radius: 4px;
-}
-
 .pro-group {
-  width: unset !important;
   display: flex;
+  width: unset !important;
 
-  &.pro-group-diy-width, &.pro-group-width-auto {
+  &.pro-group-diy-width,
+  &.pro-group-width-auto {
     .@{ant-prefix}-space .@{ant-prefix}-space-item {
       width: auto;
 
@@ -53,94 +34,33 @@
     align-items: center;
     width: 100%;
 
-    &>.@{ant-prefix}-input-number{
-      &:first-child{
-        border-end-end-radius: 0;
-        border-start-end-radius: 0;
-      }
-      &:last-child{
-        border-start-start-radius: 0;
-        border-end-start-radius: 0;
-        margin-left: -1px;
-      }
-    }
-
     .@{ant-prefix}-form-item {
       margin-bottom: 0 !important;
     }
 
     .group-separator {
-      margin-inline-end: -2px;
-      margin-inline-start: -1px;
-      border-start-start-radius: 0;
-      border-end-start-radius: 0;
       padding: 0 12px;
       background-color: #fff;
       cursor: default;
+      margin-inline-end: -2px;
+      margin-inline-start: -1px;
     }
     .pro-modal-select {
       margin-left: -1px;
-      .@{ant-prefix}-input{
-        border-start-start-radius: 0;
-        border-end-start-radius: 0;
-      }
     }
 
     // 定制内敛合并样式
     .@{ant-prefix}-input-affix-wrapper,
     .@{ant-prefix}-select {
-      .border-radius(0, 0, 0, 0);
-
       &:nth-child(n + 2) {
         margin-inline-start: -1px;
       }
-
-      &:first-child {
-        .start-radius();
-      }
-
-      &:last-child {
-        .end-radius();
-      }
-    }
-
-    .pro-select {
-      .@{ant-prefix}-select .@{ant-prefix}-select-selector{
-        border-radius: 0 !important;
-      }
-      &:first-child   .@{ant-prefix}-select .@{ant-prefix}-select-selector {
-        border-start-start-radius: 4px !important;
-        border-end-start-radius: 4px !important;
-      }
-
-      &:last-child   .@{ant-prefix}-select .@{ant-prefix}-select-selector {
-        border-start-end-radius: 4px  !important;
-        border-end-end-radius: 4px!important;
-      }
-    }
-
-    .@{ant-prefix}-select {
-      .@{ant-prefix}-select-selector {
-        .border-radius(0, 0, 0, 0);
-      }
-
-      &:first-child {
-        .@{ant-prefix}-select-selector {
-          .start-radius();
-        }
-      }
-
-      &:last-child {
-        .@{ant-prefix}-select-selector {
-          .end-radius();
-        }
-      }
     }
 
     // 报错样式定制
     .@{ant-prefix}-input-affix-wrapper-status-error ~ .group-separator {
-      color: var(--ant-error-color);
-      border-color: var(--ant-error-color);
+      color: #ff4d4f;
+      border-color: #ff4d4f;
     }
   }
 }

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

@@ -37,7 +37,7 @@ interface Params {
 export declare const getReactiveProps: (params: Params) => {
     disabled: boolean;
     show: boolean;
-    component: any;
+    component: import("react").ReactNode;
     fieldProps: boolean;
     desensitization: [number, number];
 };