@zat-design/sisyphus-react 3.4.2 → 3.4.3

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

@@ -4,14 +4,13 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useMemo } from 'react';
-import { omit, isFunction } from 'lodash';
-import { useDeepCompareEffect, useCounter } from 'ahooks';
+import { omit, isFunction, union, isNumber } from 'lodash';
+import { useDeepCompareEffect } from 'ahooks';
 import classnames from 'classnames';
 import RenderFields from '../../render/RenderFields';
-import { insertSeparator } from './utils';
+import { insertSeparator, transformNamesString } from './utils';
 import ProForm from '../../../../ProForm';
 var Group = function Group(props) {
   var columns = props.children,
@@ -23,15 +22,16 @@ var Group = function Group(props) {
     } : _props$space,
     id = props.id,
     value = props.value,
-    onFieldChange = props.onFieldChange;
-  var _useCounter = useCounter(0),
-    _useCounter2 = _slicedToArray(_useCounter, 2),
-    num = _useCounter2[0],
-    inc = _useCounter2[1].inc;
+    isView = props.isView,
+    index = props.index,
+    onFieldChange = props.onFieldChange,
+    namePath = props.namePath;
   var _ref = ProForm.useFieldProps() || {},
     names = _ref.names,
     name = _ref.name,
-    form = _ref.form;
+    form = _ref.form,
+    _namePath = _ref.namePath;
+  var newNamePath = namePath || _namePath || [];
   if (!Array.isArray(names)) {
     console.error('Warning: Composite form components whose type is Group must be configured with names');
   }
@@ -41,8 +41,10 @@ var Group = function Group(props) {
       return _objectSpread(_objectSpread({
         disabled: Boolean(props === null || props === void 0 ? void 0 : props.disabled)
       }, item), {}, {
+        isView: isView !== null && isView !== void 0 ? isView : item.isView,
         noStyle: (space === null || space === void 0 ? void 0 : space.compact) || (space === null || space === void 0 ? void 0 : space.separator),
-        parentNames: id
+        parentNames: id,
+        namePath: newNamePath
       });
     });
     var node = _jsx(_Button, {
@@ -64,14 +66,25 @@ var Group = function Group(props) {
       return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
     })
   }, "".concat(className), className));
+  // 用于formList场景下names移除掉了前缀，需要再次合并回来
+  var _names = names.map(function (item) {
+    if (isNumber(item === null || item === void 0 ? void 0 : item[0])) {
+      return union(newNamePath, item);
+    }
+    return item;
+  });
   useDeepCompareEffect(function () {
+    var _document, _document$activeEleme;
+    // 焦点激活的表单
+    var touchName = ((_document = document) === null || _document === void 0 ? void 0 : (_document$activeEleme = _document.activeElement) === null || _document$activeEleme === void 0 ? void 0 : _document$activeEleme.id) || '';
     // 模拟change,初始化不执行onFieldChange
-    if (isFunction(onFieldChange) && num >= 1) {
-      onFieldChange(value, form.getFieldsValue(), {
-        form: form
+    if (isFunction(onFieldChange) && form.isFieldsTouched(_names) && transformNamesString(_names).includes(touchName)) {
+      onFieldChange(value, (newNamePath === null || newNamePath === void 0 ? void 0 : newNamePath.length) ? form.getFieldValue(newNamePath, true) : form.getFieldsValue(), {
+        form: form,
+        namePath: newNamePath,
+        index: index
       });
     }
-    inc();
   }, [value]);
   return _jsx("div", {
     className: _className,

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

@@ -1,6 +1,7 @@
 import React from 'react';
 import { RowProps, SpaceProps } from 'antd';
 import { FormInstance } from 'antd/es/form/Form';
+import { NamePath } from 'antd/lib/form/interface';
 import { ProColumnProps, ProFormOtherProps } from '../../../propsType';
 export interface SpaceType extends SpaceProps {
     /**
@@ -23,7 +24,12 @@ export interface GroupProps {
     value?: any;
     id?: string;
     disabled?: boolean | (() => void);
+    isView?: boolean;
+    namePath?: NamePath;
+    index?: number;
     onFieldChange?: (value: any[] | null, record: any, { form, }: {
         form: FormInstance;
+        namePath?: NamePath;
+        index?: number;
     }) => any;
 }

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

@@ -9,13 +9,13 @@
 }
 
 .start-radius() {
-  border-start-start-radius: var(--zaui-border-radius, 4px);
-  border-end-start-radius: var(--zaui-border-radius, 4px);
+  border-start-start-radius: 4px;
+  border-end-start-radius: 4px;
 }
 
 .end-radius() {
-  border-start-end-radius: var(--zaui-border-radius, 4px);
-  border-end-end-radius: var(--zaui-border-radius, 4px);
+  border-start-end-radius: 4px;
+  border-end-end-radius: 4px;
 }
 
 .pro-group {

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

@@ -6,3 +6,5 @@ import { SpaceType } from './propsType';
 * @returns
 */
 export declare const insertSeparator: (columns: any, space?: SpaceType, separatorNode?: ReactNode, otherProps?: any) => any;
+/** 转换names */
+export declare const transformNamesString: (arr: (string | string[])[]) => (string | string[])[];

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

@@ -33,4 +33,14 @@ export var insertSeparator = function insertSeparator(columns, space, separatorN
     }
     return result;
   }, []);
+};
+/** 转换names */
+export var transformNamesString = function transformNamesString(arr) {
+  var result = arr.map(function (subArr) {
+    if (Array.isArray(subArr)) {
+      return subArr.join('_');
+    }
+    return subArr;
+  });
+  return result;
 };

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

@@ -11,7 +11,7 @@ var _excluded = ["format", "disabled", "foreverTime", "foreverText", "valueType"
   _excluded2 = ["mode"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classNames from 'classnames';
-import { omit } from 'lodash';
+import { omit, isObject } from 'lodash';
 import moment from 'moment';
 import { useMemo } from 'react';
 import { useProConfig } from '../../../../ProConfigProvider';
@@ -53,7 +53,7 @@ export var ProTimeLimit = function ProTimeLimit(props) {
     onChange = _useControlled2[1];
   var initialConfig = useProConfig('ProTimeLimit');
   var isForever = useMemo(function () {
-    if (moment.isMoment(value)) {
+    if (isObject(value)) {
       return foreverMoment.format(format) === value.format(format);
     }
     return false;
@@ -73,6 +73,12 @@ export var ProTimeLimit = function ProTimeLimit(props) {
         children: foreverText
       });
     }
+    if (isObject(value)) {
+      return _jsx(Container, {
+        viewEmpty: viewEmpty,
+        children: value.format(format)
+      });
+    }
     return _jsx(Container, {
       viewEmpty: viewEmpty,
       children: props.value

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

@@ -6,7 +6,7 @@
     ~ .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(
       .@{ant-prefix}-input-borderless
     ).@{ant-prefix}-input {
-    background: @zaui-base-bg;
+    // background: @zaui-base-bg;
     border-color: var(--ant-error-color);
   }
   .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(

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

@@ -24,7 +24,6 @@ export { default as Container } from './combination/Container';
 export { default as ProEnum } from '../../ProEnum';
 export { default as ProSelect } from '../../ProSelect';
 export { default as ProUpload } from '../../ProUpload';
-export { default as ProTreeSelect } from '../../ProTreeSelect';
 export { default as ProTreeModal } from '../../ProTreeModal';
 export { default as ProTree } from '../../ProTree';
 export { default as FormFooter } from './FormFooter';

package/es/ProForm/components/index.js

@@ -26,7 +26,7 @@ export { default as Container } from './combination/Container';
 export { default as ProEnum } from '../../ProEnum';
 export { default as ProSelect } from '../../ProSelect';
 export { default as ProUpload } from '../../ProUpload';
-export { default as ProTreeSelect } from '../../ProTreeSelect';
+// export { default as ProTreeSelect } from '../../ProTreeSelect';
 export { default as ProTreeModal } from '../../ProTreeModal';
 export { default as ProTree } from '../../ProTree';
 // footer组件

package/es/ProForm/components/render/ConfirmWrapper.js

@@ -33,7 +33,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
       return;
     }
     if (isObject(confirmProps)) {
-      _Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, defaultConfirmProps), confirmProps), {}, {
+      _Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
         onOk: function onOk() {
           var _confirmProps$onOk;
           for (var _len2 = arguments.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {

package/es/ProForm/components/render/Render.js

@@ -34,7 +34,7 @@ import useRules from '../../utils/useRules';
 import ConfirmWrapper from './ConfirmWrapper';
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
-  var _ref2, _ref3, _otherProps$names2;
+  var _ref2, _ref3, _ref4, _ref5, _otherProps$names2;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -52,8 +52,9 @@ var Render = function Render(props) {
     originalValues = props.originalValues,
     equalWith = props.equalWith,
     requiredOnView = props.requiredOnView,
-    originalTip = props.originalTip,
-    confirm = props.confirm;
+    originalDiffTip = props.originalDiffTip,
+    confirm = props.confirm,
+    globalControl = props.globalControl;
   var colProps = props.colProps;
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
@@ -149,7 +150,7 @@ var Render = function Render(props) {
    */
   var transforms = Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.names) ? transformNames(_objectSpread(_objectSpread({}, otherFormItemProps), valueTypeTransform()),
   // 合并valueType的transform
-  form, otherProps.names, namesStr) : valueTypeTransform();
+  form, otherProps.names, namesStr, otherProps.type) : valueTypeTransform();
   // ↑↑↑↑↑↑  formItem参数整理  ↑↑↑↑↑↑
   Object.assign(otherFormItemProps, transforms, {
     names: otherProps.names
@@ -169,8 +170,12 @@ var Render = function Render(props) {
   }
   /** 移除多余参数，防止透传给formItem报错 */
   var _otherFormItemProps = omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'switchValue', 'precision', 'clearNotShow']);
-  // 优先级 formitem上【column.disabled】 > 组件上【fieldProps.disabled】 > 全局【formDisabled】
-  var lastDisabled = (_ref2 = (_ref3 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref3 !== void 0 ? _ref3 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : formDisabled;
+  /**
+   * globalControl 全局控制优先
+   * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】
+   * globalControl false时，优先级 组件上【fieldProps.disabled】 > formitem上【column.disabled】 >  全局【formDisabled】
+   */
+  var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
   /**
    * 最新fieldProps: 更新后的组件Props
    */
@@ -198,8 +203,8 @@ var Render = function Render(props) {
   var functionArgs = function functionArgs(args) {
     var _otherFormItemProps$n;
     var _args = _toConsumableArray(args);
-    var _ref4 = otherProps || {},
-      valueType = _ref4.valueType;
+    var _ref6 = otherProps || {},
+      valueType = _ref6.valueType;
     _args[1] = form.getFieldsValue();
     _args[2] = {
       form: form
@@ -266,7 +271,7 @@ var Render = function Render(props) {
       }, 60);
     }
     // ProTreeSelect返回option
-    if (['ProTreeSelect', 'ProTree'].includes(type)) {
+    if (['ProTree'].includes(type)) {
       var _args2, _args2$;
       _args[2].option = findOptionByValue(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0]);
     }
@@ -276,7 +281,7 @@ var Render = function Render(props) {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _len2,
         args,
         _key2,
@@ -303,7 +308,7 @@ var Render = function Render(props) {
       }, _callee);
     }));
     return function handleBlur() {
-      return _ref5.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
   var renderItem = function renderItem() {
@@ -380,7 +385,7 @@ var Render = function Render(props) {
       };
     }
     // 需要过滤掉的form_item的key
-    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
+    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl'];
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';
@@ -429,7 +434,7 @@ var Render = function Render(props) {
       });
     }
     // 不渲染tooltip
-    if (!originalTip || ['FormList', 'ProEditTable'].includes(type)) {
+    if (!originalDiffTip || ['FormList', 'ProEditTable'].includes(type)) {
       return formItem;
     }
     var title = _jsxs(_Space, {
@@ -442,6 +447,9 @@ var Render = function Render(props) {
     return _jsx(_Tooltip, {
       title: title,
       visible: changed ? undefined : false,
+      getPopupContainer: function getPopupContainer(target) {
+        return target.parentElement;
+      },
       children: formItem
     });
   };

package/es/ProForm/components/render/RenderFields.d.ts

@@ -17,7 +17,8 @@ interface Props<T = any> {
     clearNotShow?: boolean;
     requiredOnView?: boolean;
     required?: boolean | (() => boolean);
-    originalTip?: boolean;
+    originalDiffTip?: boolean;
+    globalControl?: boolean;
 }
 declare const RenderFields: React.FC<Props>;
 export default RenderFields;

package/es/ProForm/components/render/RenderFields.js

@@ -25,7 +25,8 @@ var RenderFields = function RenderFields(props) {
     outerClearNotShow = props.clearNotShow,
     requiredOnView = props.requiredOnView,
     required = props.required,
-    originalTip = props.originalTip;
+    originalDiffTip = props.originalDiffTip,
+    globalControl = props.globalControl;
   // 是否包含隐藏字段
   var hiddenData = columns.filter(function (item) {
     return Array.isArray(item.hiddenNames);
@@ -175,7 +176,9 @@ var RenderFields = function RenderFields(props) {
       form: form,
       type: _type,
       hiddenNames: column.hiddenNames,
-      colProps: _colProps
+      colProps: _colProps,
+      mode: componentProps.mode,
+      namePath: column.namePath
     };
     if (outerClearNotShow !== false && show === false && (column === null || column === void 0 ? void 0 : column.name) && form.getFieldValue(column === null || column === void 0 ? void 0 : column.name)) {
       setTimeout(function () {
@@ -204,7 +207,8 @@ var RenderFields = function RenderFields(props) {
         originalValues: originalValues,
         equalWith: equalWith,
         requiredOnView: requiredOnView,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip,
+        globalControl: globalControl
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
   });

package/es/ProForm/components/render/propsType.d.ts

@@ -26,7 +26,6 @@ import { Props as ProRangeLimitProps } from '../combination/ProRangeLimit';
 import { CheckboxPropsMap, ProEnum, PropProSelectsMap, PropRadioPropsMap } from '../../../ProEnum/propsType';
 import { PropSelectProps as ProSelectProps } from '../../../ProSelect/propsType';
 import { ProEditTableProps } from '../../../ProEditTable/propsType';
-import { PropTreeSelectProps } from '../../../ProTreeSelect/propsType';
 import { ProTreeModalProps } from '../../../ProTreeModal/propsType';
 import { ProUploadProps } from '../../../ProUpload/propsType';
 import { ProTreeProps } from '../../../ProTree/propsType';
@@ -150,9 +149,6 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
 } | {
     type?: 'ProEditTable';
     fieldProps?: FieldProps<ProEditTableProps, Values, T>;
-} | {
-    type?: 'ProTreeSelect';
-    fieldProps?: FieldProps<PropTreeSelectProps, Values, T>;
 } | {
     type?: 'ProTreeModal';
     fieldProps?: FieldProps<ProTreeModalProps, Values, T>;
@@ -270,6 +266,7 @@ export interface RenderProps<Values = any> {
     originalValues?: Values;
     requiredOnView?: boolean;
     confirm?: ProFormColumnProps['confirm'];
+    globalControl?: boolean;
     [name: string]: any;
 }
 export {};

package/es/ProForm/index.js

@@ -12,13 +12,13 @@ import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalTip", "formKey"];
+var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalDiffTip", "formKey", "globalControl"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DoubleLeftOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
 import React, { forwardRef, useImperativeHandle, useMemo } from 'react';
 import { isObject, isString, merge } from 'lodash';
-import { FormFooter, InputRange, ProAddress, ProAddressBar, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeSelect, ProTreeModal, ProTree, EnumSelect } from './components';
+import { FormFooter, InputRange, ProAddress, ProAddressBar, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeModal, ProTree, EnumSelect } from './components';
 import RenderFields from './components/render/RenderFields';
 import { useProConfig, useContextForms } from '../ProConfigProvider';
 import { getLayout, splitNameStr, useControlled, initialValuesToNames } from './utils/index';
@@ -63,9 +63,10 @@ var ProForm = function ProForm(props, ref) {
     requiredOnView = _props$requiredOnView === void 0 ? true : _props$requiredOnView,
     formId = props.formId,
     required = props.required,
-    _props$originalTip = props.originalTip,
-    originalTip = _props$originalTip === void 0 ? true : _props$originalTip,
+    _props$originalDiffTi = props.originalDiffTip,
+    originalDiffTip = _props$originalDiffTi === void 0 ? true : _props$originalDiffTi,
     formKey = props.formKey,
+    globalControl = props.globalControl,
     otherProps = _objectWithoutProperties(props, _excluded);
   var _useProConfig = useProConfig(),
     state = _useProConfig.state,
@@ -253,7 +254,8 @@ var ProForm = function ProForm(props, ref) {
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
         required: required,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip,
+        globalControl: globalControl
       }), children, footerRender()]
     }))
   }));
@@ -318,7 +320,7 @@ ProFormForward.ProNumberRange = ProNumberRange;
 ProFormForward.ProModalSelect = ProModalSelect;
 ProFormForward.ProTimeLimit = ProTimeLimit;
 ProFormForward.ProUpload = ProUpload;
-ProFormForward.ProTreeSelect = ProTreeSelect;
+// ProFormForward.ProTreeSelect = ProTreeSelect;
 ProFormForward.ProTreeModal = ProTreeModal;
 ProFormForward.ProTree = ProTree;
 // 待废弃

package/es/ProForm/propsType.d.ts

@@ -39,9 +39,13 @@ export interface ProFormOtherProps {
     disabled: boolean;
     show?: boolean | (() => boolean);
     required?: boolean | (() => boolean);
+    mode?: string;
+    namePath?: any[] | string | number;
 }
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;
+    /** 全局控制优先 */
+    globalControl?: boolean;
     mode?: ModeEnum;
     formKey?: string;
     /** 是否查看 */
@@ -67,7 +71,7 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
     requiredOnView?: boolean;
     formId?: string;
     required?: boolean;
-    originalTip?: boolean;
+    originalDiffTip?: boolean;
 }
 export interface Transform<T = any> {
     normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;

package/es/ProForm/style/index.less

@@ -31,16 +31,6 @@
     }
   }
 
-  &.@{ant-prefix}-form {
-    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
-  }
-
-  .pro-collapse-level2 {
-    .@{ant-prefix}-collapse-item {
-      margin-bottom: 0 !important;
-    }
-  }
-
   .@{ant-prefix}-form-item-control-input {
     flex-grow: 1;
     max-width: 100%;
@@ -135,7 +125,7 @@
         background: @zaui-contract-bg !important;
 
         input {
-          background: @zaui-contract-bg;
+          background: transparent;
         }
         .@{ant-prefix}-select-selection-placeholder {
           z-index: 9;
@@ -147,8 +137,22 @@
         border-radius: 4px;
       }
 
-      // 查看模式 修改容器样式
-      .@{ant-prefix}-form-item-control-input-content > span, // 地址组件
+      // 地址组件
+      .@{ant-prefix}-form-item-control-input-content {
+        & > .pro-address {
+          .ant-select-selector,
+          .ant-input-affix-wrapper,
+          .ant-input-disabled {
+            background: @zaui-contract-bg;
+          }
+        }
+        & > .ant-input-group {
+          .forever-checkbox {
+            background: @zaui-contract-bg;
+          }
+        }
+      }
+
       .pro-form-view-container {
         padding: 4px 8px;
         background: @zaui-contract-bg;

package/es/ProForm/utils/{contrastOriginal.d.ts → diffOriginal.d.ts}

@@ -3,7 +3,8 @@ interface Params {
     originalValue: any;
     value: any;
     form: FormInstance;
+    name?: string | any[];
     equalWith?: (originalValue: any, currentValue: any) => boolean;
 }
-export declare const contrastOriginal: (params: Params) => boolean;
+export declare const diffOriginal: (params: Params) => boolean;
 export {};

package/es/ProForm/utils/diffOriginal.js

@@ -0,0 +1,61 @@
+import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
+import { isEqual, isFunction } from 'lodash';
+var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
+var extractValue = function extractValue(obj, path) {
+  var value = obj || {};
+  if (!Object.keys(obj)) {
+    return [];
+  }
+  var _iterator = _createForOfIteratorHelper(path),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var key = _step.value;
+      if (value && value.hasOwnProperty(key)) {
+        value = value[key];
+      } else {
+        return undefined;
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return Object.values(value);
+};
+/** 将解构后的name值，反向转回names,例如 formData {a:1, b:2} names ['a', 'b'] 返回 [1,2] */
+var extractValues = function extractValues(data, pathString) {
+  if (pathString.includes('_')) {
+    var namePrefixes = pathString.split('-')[0].split('_').slice(0, -1);
+    return extractValue(data, namePrefixes);
+  }
+  return pathString.split('-').map(function (item) {
+    return data[item];
+  });
+};
+export var diffOriginal = function diffOriginal(params) {
+  var originalValue = params.originalValue,
+    _value = params.value,
+    equalWith = params.equalWith,
+    form = params.form,
+    name = params.name;
+  var value = !(name === null || name === void 0 ? void 0 : name.includes('-')) ? _value : extractValues(form.getFieldsValue(), name);
+  // 支持传入自定义比较事件
+  if (isFunction(equalWith)) {
+    return !equalWith(originalValue, value);
+  }
+  if (Array.isArray(originalValue)) {
+    return originalValue.some(function (valueItem, index) {
+      // 如果两个值有一个不是空值, 则进行深比较
+      if (!nullValue.includes(value === null || value === void 0 ? void 0 : value[index]) || !nullValue.includes(valueItem)) {
+        return !isEqual(value === null || value === void 0 ? void 0 : value[index], valueItem);
+      }
+      return false;
+    });
+  }
+  if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
+    return !isEqual(value, originalValue);
+  }
+  return false;
+};

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

@@ -26,7 +26,7 @@ export declare const isTrim: (type: string, trim: boolean, configData: any) => a
  */
 export declare const isUpperCase: (type: string, upperCase: boolean) => any;
 export declare const weedOutProps: (data: Record<string, any>, keys: string[]) => {}[];
-export declare const contrast: (prevValues: any, curValues: any, names: NamePath[]) => boolean;
+export declare const diffField: (prevValues: any, curValues: any, names: NamePath[]) => boolean;
 export declare const splitNameStr: (name: string) => NamePath[];
 export declare const filterInternalFields: (values: any) => any;
 export declare const getAllNamePath: (object: Record<string, any>, currentPath?: InternalNamePath) => InternalNamePath[];

package/es/ProForm/utils/index.js

@@ -108,7 +108,7 @@ export var weedOutProps = function weedOutProps(data, keys) {
   return [obj, weedOut];
 };
 // 对比字段变化
-export var contrast = function contrast(prevValues, curValues, names) {
+export var diffField = function diffField(prevValues, curValues, names) {
   return names.some(function (name) {
     return _.get(prevValues, name) !== _.get(curValues, name);
   });

package/es/ProForm/utils/transformNames.d.ts

@@ -6,5 +6,5 @@ interface TransformProps extends FormItemProps {
     namePath: any[];
 }
 type TransformFun = 'normalize' | 'getValueProps' | 'shouldUpdate' | 'name';
-declare const transformNames: (formItem: TransformProps, form: FormInstance, names: NamePath[], fieldName: string) => Pick<TransformProps, TransformFun>;
+declare const transformNames: (formItem: TransformProps, form: FormInstance, names: NamePath[], fieldName: string, type?: string) => Pick<TransformProps, TransformFun>;
 export default transformNames;

package/es/ProForm/utils/transformNames.js

@@ -1,16 +1,23 @@
-import { union } from 'lodash';
+import { union, isNumber } from 'lodash';
 import { transformValue } from './transformValue';
-var transformNames = function transformNames(formItem, form, names, fieldName) {
+var transformNames = function transformNames(formItem, form, names, fieldName, type) {
+  var _names2, _names3, _names3$;
   var _ref = formItem || {},
     normalize = _ref.normalize,
     getValueProps = _ref.getValueProps,
     _shouldUpdate2 = _ref.shouldUpdate;
-  if (!(names === null || names === void 0 ? void 0 : names.length)) {
+  var _names = names;
+  if (!((_names2 = _names) === null || _names2 === void 0 ? void 0 : _names2.length)) {
     return {};
   }
   // 当在formList场景下，给transformValue函数的setFiledProps的name, 需要全namePath
   var _fieldName = Array.isArray(formItem === null || formItem === void 0 ? void 0 : formItem.name) ? union(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, formItem === null || formItem === void 0 ? void 0 : formItem.name) : fieldName;
-  var _transformValue = transformValue(names, form, _fieldName, normalize, getValueProps),
+  if (type === 'Group' && isNumber((_names3 = _names) === null || _names3 === void 0 ? void 0 : (_names3$ = _names3[0]) === null || _names3$ === void 0 ? void 0 : _names3$[0])) {
+    _names = _names.map(function (item) {
+      return union(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, item);
+    });
+  }
+  var _transformValue = transformValue(_names, form, _fieldName, normalize, getValueProps),
     _normalize = _transformValue.normalize,
     _getValueProps = _transformValue.getValueProps,
     _shouldUpdate = _transformValue.shouldUpdate;