@zat-design/sisyphus-react 4.0.0-beta.3 → 4.0.0-beta.5

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

@@ -1,7 +1,7 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import "antd/es/form/style";
+import _Form from "antd/es/form";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 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';
@@ -15,7 +15,7 @@ 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 FormList = (props, ref) => {
   var columns = props.columns,
     min = props.min,
     max = props.max,
@@ -29,11 +29,9 @@ var FormList = function FormList(props, ref) {
     span = _props$span === void 0 ? 8 : _props$span,
     disabled = props.disabled,
     emptyBtnText = props.emptyBtnText;
-  var _fields = fields.map(function (item) {
-    return _objectSpread(_objectSpread({}, item), {}, {
-      key: String(item.key)
-    });
-  });
+  var _fields = fields.map(item => _objectSpread(_objectSpread({}, item), {}, {
+    key: String(item.key)
+  }));
   var _ref = ProForm.useFieldProps() || {},
     form = _ref.form,
     name = _ref.name,
@@ -47,57 +45,51 @@ var FormList = function FormList(props, ref) {
   var _diffConfig = _objectSpread(_objectSpread({}, diffConfig), {}, {
     originalValues: diffConfig !== null && diffConfig !== void 0 && diffConfig.originalValues && isDiffAll ? orgValues || [] : orgValues
   });
-  var processColumns = useCallback(function (fieldName, namePath) {
-    return columns.map(function (item) {
+  var processColumns = useCallback((fieldName, namePath) => {
+    return columns.map(item => {
       // names的name处理
       var _name = Array.isArray(item === null || item === void 0 ? void 0 : item.names) ? [fieldName, namesPathTransform({
         names: item === null || item === void 0 ? void 0 : item.names,
         prefixNamePath: namePath,
         type: item.type
-      })] : [fieldName].concat(_toConsumableArray(toArray(item.name)));
+      })] : [fieldName, ...toArray(item.name)];
       var column = _objectSpread(_objectSpread({}, item), {}, {
         name: _name,
-        names: item !== null && item !== void 0 && item.names ? item.names.map(function (nameItem) {
+        names: item !== null && item !== void 0 && item.names ? item.names.map(nameItem => {
           // 传给Group的names会被渲染成真实FormItem 不能传完整name
-          return [].concat(_toConsumableArray(namePath), _toConsumableArray(toArray(nameItem)));
+          return [...namePath, ...toArray(nameItem)];
         }) : item.names,
         index: fieldName,
-        namePath: namePath,
-        listName: [].concat(_toConsumableArray(namePath), [item.name]),
+        namePath,
+        listName: [...namePath, item.name],
         label: mode === 'less' ? undefined : item.label
       });
       return column;
     });
   }, [columns]);
-  useImperativeHandle(ref, function () {
+  useImperativeHandle(ref, () => {
     return {
-      operation: operation
+      operation
     };
   });
-  var handleDragEnd = function handleDragEnd(drag) {
+  var handleDragEnd = drag => {
     var active = drag.active,
       over = drag.over;
     if (_fields.length > 1 && active.id !== over.id) {
-      var activeIndex = _fields.findIndex(function (item) {
-        return item.key === active.id;
-      });
-      var overIndex = _fields.findIndex(function (item) {
-        return item.key === over.id;
-      });
+      var activeIndex = _fields.findIndex(item => item.key === active.id);
+      var overIndex = _fields.findIndex(item => item.key === over.id);
       props.operation.move(activeIndex, overIndex);
     }
   };
   return /*#__PURE__*/_jsx(DndContext, {
     onDragEnd: handleDragEnd,
     children: /*#__PURE__*/_jsxs(SortableContext, {
-      items: _fields.map(function (item) {
-        return {
-          id: item.key
-        };
-      }),
+      items: _fields.map(item => ({
+        id: item.key
+      })),
       strategy: verticalListSortingStrategy,
-      children: [_fields.map(function (field, index) {
-        var namePath = [].concat(_toConsumableArray(_namePath), [field.name]);
+      children: [_fields.map((field, index) => {
+        var namePath = [..._namePath, field.name];
         var _columns = processColumns(index, namePath);
         return mode === 'block' ? /*#__PURE__*/_jsx(BlockFields, _objectSpread(_objectSpread({}, props), {}, {
           columns: _columns,
@@ -107,7 +99,7 @@ var FormList = function FormList(props, ref) {
           index: index,
           field: field,
           colProps: {
-            span: span
+            span
           },
           form: form,
           diffConfig: _diffConfig
@@ -134,7 +126,7 @@ var FormList = function FormList(props, ref) {
         form: form,
         namePath: _namePath,
         emptyBtnText: emptyBtnText
-      }), /*#__PURE__*/_jsx(Form.ErrorList, {
+      }), /*#__PURE__*/_jsx(_Form.ErrorList, {
         errors: errors
       }), toolbarProps !== false && _fields.length > 0 && /*#__PURE__*/_jsx(ToolbarButton, {
         disabled: disabled,

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

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-form-list-block-title {
   height: 14px;

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

@@ -7,24 +7,22 @@ import React from 'react';
  * @param prefixNamePath formList的name前缀
  * @returns list_0_min-list_0_max
  */
-export var namesPathTransform = function namesPathTransform(_ref) {
+export var namesPathTransform = _ref => {
   var names = _ref.names,
     prefixNamePath = _ref.prefixNamePath,
     type = _ref.type;
   if (!Array.isArray(names) || !Array.isArray(prefixNamePath)) {
     return '';
   }
-  var newNamePath = names.map(function (val) {
-    return prefixNamePath.concat(val);
-  });
-  return newNamePath === null || newNamePath === void 0 ? void 0 : newNamePath.map(function (name) {
+  var newNamePath = names.map(val => prefixNamePath.concat(val));
+  return newNamePath === null || newNamePath === void 0 ? void 0 : newNamePath.map(name => {
     return Array.isArray(name) ? name.join('_') : name;
   }).join('-');
 };
 
 // 比较memo
-export var memoWith = function memoWith(pre, next) {
-  return isEqualWith(pre, next, function (objValue, othValue) {
+export var memoWith = (pre, next) => {
+  return isEqualWith(pre, next, (objValue, othValue) => {
     if ( /*#__PURE__*/React.isValidElement(objValue) && /*#__PURE__*/React.isValidElement(othValue)) {
       return true;
     }

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

@@ -2,7 +2,7 @@ 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 AddonWrapper = props => {
   var before = props.before,
     after = props.after,
     children = props.children;

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

@@ -1,8 +1,8 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 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 React from 'react';
+import { omit } from 'lodash';
 import ConfirmWrapper from "../../../../components/render/ConfirmWrapper";
 import { FieldProvider } from "../../../../utils/useFieldProps";
 import * as componentMap from "../../../../../index";
@@ -18,22 +18,23 @@ var wrapperMap = {
 };
 
 // 增加middleware根据配置增加多层包裹
-var getComRender = function getComRender(component, props, componentProps) {
+var getComRender = (component, props, componentProps) => {
   var wrappers = Object.keys(wrapperMap);
-  var Com = component;
-  wrappers.forEach(function (item) {
+  var renderComponent = component;
+  wrappers.forEach(item => {
     if (item in props) {
       var Wrapper = wrapperMap[item];
-      Com = /*#__PURE__*/_jsx(Wrapper, _objectSpread(_objectSpread(_objectSpread({}, componentProps), _defineProperty({}, item, props[item])), {}, {
-        children: Com
+      renderComponent = /*#__PURE__*/_jsx(Wrapper, _objectSpread(_objectSpread({}, componentProps), {}, {
+        [item]: props[item],
+        children: renderComponent
       }));
     }
   });
-  return Com;
+  return renderComponent;
 };
 
 /** 渲染组件 */
-var ComRender = function ComRender(props) {
+var ComRender = props => {
   var _props$component;
   var type = props.type,
     confirm = props.confirm,
@@ -50,11 +51,11 @@ var ComRender = function ComRender(props) {
     viewRender = props.viewRender,
     rest = _objectWithoutProperties(props, _excluded);
   var TypeComponent = componentMap[type];
-  var mergedGetValueProps = getValueProps || function (val) {
-    return _defineProperty({}, valuePropName, val);
-  };
-  var _props = mergedGetValueProps(fieldProps.value);
-  var componentProps = _objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), _props);
+  var mergedGetValueProps = getValueProps || (val => ({
+    [valuePropName]: val
+  }));
+  var nextProps = mergedGetValueProps(fieldProps.value);
+  var componentProps = omit(_objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), nextProps), ['onFieldChange']);
   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;
@@ -65,22 +66,22 @@ var ComRender = function ComRender(props) {
   if (viewRender && isView) {
     return /*#__PURE__*/_jsx(FieldProvider, {
       value: _objectSpread(_objectSpread({}, contextProps), {}, {
-        valueType: valueType,
-        type: type,
-        isView: isView
+        valueType,
+        type,
+        isView
       }),
       children: viewRender(componentProps)
     });
   }
   var Component = component ? ( /*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : /*#__PURE__*/_jsx(TypeComponent, _objectSpread({}, componentProps));
-  var Com = getComRender(Component, props, componentProps);
+  var renderComponent = getComRender(Component, props, componentProps);
   return /*#__PURE__*/_jsx(FieldProvider, {
     value: _objectSpread(_objectSpread({}, contextProps), {}, {
-      valueType: valueType,
-      type: type,
-      isView: isView
+      valueType,
+      type,
+      isView
     }),
-    children: Com
+    children: renderComponent
   });
 };
 export default ComRender;

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

@@ -12,7 +12,6 @@ interface ColumnsTransformerParams {
     form: FormInstance;
     index?: number;
     formDisabled?: boolean;
-    desensitizationKey?: string;
     groupProps: GroupType;
 }
 /** 转换columns */

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

@@ -1,5 +1,4 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 /* eslint-disable no-lonely-if */
 import { useRef } from 'react';
 import { cloneDeep, isEqual } from 'lodash';
@@ -7,7 +6,7 @@ import { useDeepCompareMemo } from "../../../../utils/useDeepCompareMemo";
 import { difference } from "../../../../../ProEditTable/utils/tools";
 import { getReactiveProps, getValueTypeTrans, valueFromEventWrapper } from "../utils";
 /** 转换columns */
-export var useTransformColumns = function useTransformColumns(params) {
+export var useTransformColumns = params => {
   var form = params.form,
     columns = params.columns,
     name = params.name,
@@ -16,11 +15,9 @@ export var useTransformColumns = function useTransformColumns(params) {
     namePath = params.namePath,
     value = params.value,
     internalChange = params.onChange,
-    groupProps = params.groupProps,
-    formDisabled = params.formDisabled,
-    desensitizationKey = params.desensitizationKey;
+    groupProps = params.groupProps;
   var timerRef = useRef([]);
-  return columns === null || columns === void 0 ? void 0 : columns.flatMap(function (column, index) {
+  return columns === null || columns === void 0 ? void 0 : columns.flatMap((column, index) => {
     var type = column.type,
       valueType = column.valueType,
       switchValue = column.switchValue,
@@ -36,25 +33,23 @@ export var useTransformColumns = function useTransformColumns(params) {
     var _ref = fieldProps || {},
       mode = _ref.mode,
       onChange = _ref.onChange,
-      onFieldChange = _ref.onFieldChange,
-      comDisabled = _ref.disabled,
-      onBlur = _ref.onBlur;
+      comDisabled = _ref.disabled;
     var _disabled = disabled || comDisabled;
     var columnName = names ? names[index] : [].concat(name, index);
 
     // 响应式字段改变后的回调
-    var changedCallback = function changedCallback(lastDependency, current) {
+    var changedCallback = (lastDependency, current) => {
       // 清值防抖  多次刷新时以最后一次为准
       if (clearNotShow !== false && names) {
         if ((current === null || current === void 0 ? void 0 : current.show) === false) {
           clearInterval(timerRef.current[index]);
-          timerRef.current[index] = setTimeout(function () {
+          timerRef.current[index] = setTimeout(() => {
             if (names) {
               form.resetFields([columnName]);
             }
             if (!names && value !== null && value !== void 0 && value.length) {
               value[index] = null;
-              form.setFieldValue(columnName, _toConsumableArray(value));
+              form.setFieldValue(columnName, [...value]);
             }
           }, 200);
         } else {
@@ -65,30 +60,35 @@ export var useTransformColumns = function useTransformColumns(params) {
 
     // 响应式字段
     // eslint-disable-next-line react-hooks/rules-of-hooks
-    var reactiveProps = useDeepCompareMemo(function () {
+    var reactiveProps = useDeepCompareMemo(() => {
       return getReactiveProps({
-        form: form,
-        index: index,
-        type: type,
-        namePath: namePath,
+        form,
+        index,
+        type,
+        namePath,
         disabled: _disabled,
-        show: show,
-        component: component,
-        fieldProps: fieldProps,
+        show,
+        component,
+        fieldProps,
         name: columnName,
-        desensitization: desensitization
+        desensitization
       });
     }, changedCallback, [value, show, fieldProps, _disabled, columnName, type]);
+
+    // 从处理后的fieldProps中获取事件处理器
+    var _ref2 = reactiveProps.fieldProps || {},
+      onFieldChange = _ref2.onFieldChange,
+      onBlur = _ref2.onBlur;
     if (reactiveProps.show === false) {
       return [];
     }
     var transform = getValueTypeTrans({
-      type: type,
-      valueType: valueType,
-      switchValue: switchValue,
-      toISOString: toISOString,
-      toCSTString: toCSTString,
-      mode: mode
+      type,
+      valueType,
+      switchValue,
+      toISOString,
+      toCSTString,
+      mode
     });
     var newValue;
     var handleChange = function handleChange() {
@@ -103,14 +103,24 @@ export var useTransformColumns = function useTransformColumns(params) {
         // @ts-ignore
         newValue = normalize === null || normalize === void 0 ? void 0 : normalize(newValue);
       }
-      internalChange === null || internalChange === void 0 || internalChange(newValue, args[1], index);
+
+      // 根据模式选择值管理方式
+      if (names) {
+        // 独立字段模式：设置单个字段值 + 触发整体校验
+        form.setFieldValue(columnName, newValue);
+        // 确保触发Group整体的校验
+        internalChange === null || internalChange === void 0 || internalChange(newValue, args[1], index);
+      } else {
+        // 数组值模式
+        internalChange === null || internalChange === void 0 || internalChange(newValue, args[1], index);
+      }
       var values = form.getFieldValue(namePath);
       var originRow = namePath !== null && namePath !== void 0 && namePath.length ? cloneDeep(values) : undefined;
-      onChange === null || onChange === void 0 || onChange.apply(void 0, args);
+      onChange === null || onChange === void 0 || onChange(...args);
       onFieldChange === null || onFieldChange === void 0 || onFieldChange(newValue, values, {
         index: outerIndex,
-        namePath: namePath,
-        form: form,
+        namePath,
+        form,
         option: args === null || args === void 0 ? void 0 : args[1]
       });
 
@@ -119,12 +129,10 @@ export var useTransformColumns = function useTransformColumns(params) {
         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 || (_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]);
-        });
+        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, key => [...namePath, key]);
         if (validateFieldKeys !== null && validateFieldKeys !== void 0 && validateFieldKeys.length) {
-          setTimeout(function () {
-            form.validateFields([name].concat(_toConsumableArray(validateFieldKeys)));
+          setTimeout(() => {
+            form.validateFields([name, ...validateFieldKeys]);
           }, 100);
         }
       }
@@ -137,14 +145,14 @@ export var useTransformColumns = function useTransformColumns(params) {
       }
       onBlur === null || onBlur === void 0 || onBlur(args[0], values, {
         index: outerIndex,
-        namePath: namePath,
-        form: form,
+        namePath,
+        form,
         option: args === null || args === void 0 ? void 0 : args[1]
       });
     };
 
     // 内外一个为true则为true
-    var getLastDisabled = function getLastDisabled() {
+    var getLastDisabled = () => {
       if (Array.isArray(groupProps.disabled)) {
         return reactiveProps.disabled || groupProps.disabled[index];
       }

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

@@ -1,4 +1,10 @@
 import React from 'react';
 import type { GroupType } from './propsType';
-declare const _default: React.NamedExoticComponent<GroupType>;
-export default _default;
+/**
+ * 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;

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

@@ -1,9 +1,8 @@
+import "antd/es/space/style";
+import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import { Space } from 'antd';
-import React, { memo } from 'react';
-import { isEqual, omit } from 'lodash';
+import React from 'react';
+import { isEmpty, omit } from 'lodash';
 import classnames from 'classnames';
 import { insertSeparator } from "./utils";
 import { useTransformColumns } from "./hooks";
@@ -17,7 +16,7 @@ import ComRender from "./component/ComRender";
  * render内部能力 show, component, value, onChange, disabled, clearNotShow, fieldProps
  */
 import { jsx as _jsx } from "react/jsx-runtime";
-var Group = function Group(props) {
+var Group = props => {
   var children = props.children,
     className = props.className,
     _props$space = props.space,
@@ -29,9 +28,9 @@ var Group = function Group(props) {
     otherProps = props.otherProps,
     id = props.id,
     isParentView = props.isView,
-    formDisabled = props.disabled;
-  var _ref = otherProps || {},
-    desensitizationKey = _ref.desensitizationKey;
+    formDisabled = props.disabled,
+    _props$split = props.split,
+    split = _props$split === void 0 ? '/' : _props$split;
   var contextProps = ProForm.useFieldProps() || {};
   var names = contextProps.names,
     name = contextProps.name,
@@ -39,44 +38,49 @@ var Group = function Group(props) {
     namePath = contextProps.namePath,
     index = contextProps.index,
     isView = contextProps.isView;
-  var _option = React.useRef([]);
+  var nextOption = React.useRef([]);
+  var nextIsView = isParentView || isView || otherProps.isView;
 
   // 组合onChange
-  var handleChange = function handleChange(value, option, index) {
-    var _value = props.value ? _toConsumableArray(props.value) : [];
-    _value[index] = value;
-    _option.current[index] = option;
-    onChange(_value, _option.current);
+  var handleChange = (value, option, index) => {
+    var nextValue = props.value ? [...props.value] : [];
+    nextValue[index] = value;
+    nextOption.current[index] = option;
+    onChange(nextValue, nextOption.current);
   };
   var columnsProps = useTransformColumns({
     columns: children,
-    name: name,
-    names: names,
+    name,
+    names,
     onChange: handleChange,
-    namePath: namePath,
-    form: form,
-    index: index,
-    value: value,
+    namePath,
+    form,
+    index,
+    value,
     groupProps: props,
-    formDisabled: formDisabled,
-    desensitizationKey: desensitizationKey
+    formDisabled
   });
   var columns = insertSeparator(columnsProps, space);
-  var _className = classnames(_defineProperty({
+  var nextClassName = classnames({
     'pro-group': true,
-    'pro-group-diy-width': columns.some(function (item) {
+    'pro-group-diy-width': columns.some(item => {
       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) {
+    'pro-group-width-auto': columns.some(item => {
       return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
-    })
-  }, "".concat(className), className));
+    }),
+    'pro-group-view': nextIsView,
+    [`${className}`]: className
+  });
+  if (nextIsView && isEmpty(value)) {
+    return (otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewEmpty) || '-';
+  }
   return /*#__PURE__*/_jsx("div", {
-    className: _className,
+    className: nextClassName,
     id: id,
-    children: space.compact || space !== null && space !== void 0 && space.separator ? /*#__PURE__*/_jsx(Space.Compact, {
-      children: columns.map(function (column, index) {
+    children: (space.compact || space !== null && space !== void 0 && space.separator) && !nextIsView ? /*#__PURE__*/_jsx(_Space.Compact, {
+      children: columns.map((column, index) => {
         column.otherProps = otherProps;
         // 自定义间隔移除对应参数
         if (column !== null && column !== void 0 && column.separator) {
@@ -85,13 +89,15 @@ var Group = function Group(props) {
         }
         return /*#__PURE__*/_jsx(ComRender, _objectSpread({
           contextProps: contextProps,
-          isView: isParentView || isView
+          isView: nextIsView
         }, column), column.name || index);
       })
-    }) : /*#__PURE__*/_jsx(Space, _objectSpread(_objectSpread({
+    }) : /*#__PURE__*/_jsx(_Space, _objectSpread(_objectSpread({
       align: "start"
     }, omit(space, ['separator', 'compact'])), {}, {
-      children: columns.map(function (column, index) {
+      split: nextIsView ? split : null,
+      size: nextIsView ? 0 : space.size,
+      children: columns.map((column, index) => {
         column.otherProps = otherProps;
         if (column !== null && column !== void 0 && column.separator) {
           delete column.separator;
@@ -99,16 +105,10 @@ var Group = function Group(props) {
         }
         return /*#__PURE__*/_jsx(ComRender, _objectSpread({
           contextProps: contextProps,
-          isView: isParentView || isView
+          isView: nextIsView
         }, column), column.name || index);
       })
     }))
   });
 };
-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;
-});
+export default Group;

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

@@ -27,6 +27,8 @@ export interface GroupType {
     value?: any[];
     onChange?: (value: any[] | null, options?: any[]) => void;
     otherProps?: any;
+    /** 分隔符 */
+    split?: string | React.ReactNode;
 }
 export type GroupColumnType<Values = any> = {
     component?: React.ReactNode | ReactiveFunction<Values, React.ReactNode>;

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

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

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

@@ -44,7 +44,6 @@ export declare const getReactiveProps: (params: Params) => {
 type ValueTypeGetterParams = Pick<ProFormColumnType, 'valueType' | 'switchValue' | 'toISOString' | 'toCSTString' | 'disabled' | 'desensitization'> & {
     type?: any;
     mode?: string;
-    desensitizationKey?: string;
 };
 /** 获取当前字段的转换函数 */
 export declare const getValueTypeTrans: (params: ValueTypeGetterParams) => any;