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

package/es/ProEditTable/utils/diffOriginal.d.ts

@@ -4,7 +4,7 @@ export interface DiffOriginalParams {
     originalValue: any;
     value: any;
     form: FormInstance;
-    equalWith?: ({ originValue, originRecord, value, record, index }: {
+    equalWith?: ({ originValue, originRecord, value, record, index, }: {
         originValue: any;
         originRecord: any;
         value: any;

package/es/ProEditTable/utils/diffOriginal.js

@@ -4,7 +4,20 @@ var isEmpty = validate.isEmpty;
 // 过滤对象中undefined字段
 // 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
 var filterObject = function filterObject(data) {
-  if (!isObject(data) || Array.isArray(data) || data === null) return data;
+  if (!isObject(data) || data === null) return data;
+  // ['1', undefined] ['1', ''] 视为相等
+  if (Array.isArray(data)) {
+    // 数组中全是empty值的话 视为null
+    var isFillNull = true;
+    var arr = data.map(function (item) {
+      if (isEmpty(item)) {
+        return null;
+      }
+      isFillNull = false;
+      return item;
+    });
+    return isFillNull ? null : arr;
+  }
   var resData = {};
   Object.keys(data).forEach(function (key) {
     if (!isEmpty(data[key])) {
@@ -41,25 +54,11 @@ export var diffOriginal = function diffOriginal(params) {
   }
   var _value = filterObject(value);
   var _originalValue = filterObject(originalValue);
-  // 如果原始值为空 且当前有值的话 认为变更类型是新增
-  if (isEmpty(_originalValue) && !isEmpty(_value)) {
-    return 'add';
-  }
-  if (Array.isArray(_originalValue)) {
-    if ((_originalValue === null || _originalValue === void 0 ? void 0 : _originalValue.length) === (_value === null || _value === void 0 ? void 0 : _value.length)) {
-      var isSame = _originalValue.every(function (valueItem, index) {
-        // 如果两个值有一个不是空值, 则进行深比较
-        if (!isEmpty(value === null || value === void 0 ? void 0 : value[index]) || !isEmpty(valueItem)) {
-          return isEqual(value === null || value === void 0 ? void 0 : value[index], valueItem);
-        }
-        return true;
-      });
-      return isSame ? 'same' : 'changed';
-    }
-    return 'changed';
-  }
-  if (!isEmpty(_originalValue) || !isEmpty(_value)) {
-    return isEqual(_value, _originalValue) ? 'same' : 'changed';
-  }
-  return 'same';
+  var isEmptyVal = isEmpty(_value);
+  var isEmptyOrg = isEmpty(_originalValue);
+  // 都为空视为相等
+  if (isEmptyOrg && isEmptyVal) return 'same';
+  // 如果原始值为空 且当前有值的话 视为新增
+  if (isEmptyOrg && !isEmptyVal) return 'add';
+  return isEqual(_value, _originalValue) ? 'same' : 'changed';
 };

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

@@ -27,7 +27,10 @@ var Group = function Group(props) {
     onChange = props.onChange,
     otherProps = props.otherProps,
     id = props.id,
-    isParentView = props.isView;
+    isParentView = props.isView,
+    formDisabled = props.disabled;
+  var _ref = otherProps || {},
+    desensitizationKey = _ref.desensitizationKey;
   var contextProps = ProForm.useFieldProps() || {};
   var names = contextProps.names,
     name = contextProps.name,
@@ -52,7 +55,9 @@ var Group = function Group(props) {
     form: form,
     index: index,
     value: value,
-    groupProps: props
+    groupProps: props,
+    formDisabled: formDisabled,
+    desensitizationKey: desensitizationKey
   });
   var columns = insertSeparator(columnsProps, space);
   var _className = classnames(_defineProperty({

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

@@ -50,4 +50,5 @@ export type GroupColumnProps<Values = any> = {
     confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps>;
     valuePropName?: string;
     getValueProps?: (value: any) => Record<string, unknown>;
+    desensitization?: [number, number] | ReactiveFunction<Values, [number, number]>;
 } & ColumnPropsMap & FormItemProps;

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

@@ -31,6 +31,7 @@ interface Params {
     component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
     fieldProps?: boolean | ReactiveFunction<any, boolean>;
     name?: NamePath;
+    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
 }
 /** 计算响应式参数的值 */
 export declare const getReactiveProps: (params: Params) => {
@@ -38,10 +39,12 @@ export declare const getReactiveProps: (params: Params) => {
     show: boolean;
     component: any;
     fieldProps: boolean;
+    desensitization: [number, number];
 };
-type ValueTypeGetterParams = Pick<ProFormColumnProps, 'valueType' | 'switchValue' | 'toISOString' | 'toCSTString'> & {
+type ValueTypeGetterParams = Pick<ProFormColumnProps, 'valueType' | 'switchValue' | 'toISOString' | 'toCSTString' | 'disabled' | 'desensitization'> & {
     type?: any;
     mode?: string;
+    desensitizationKey?: string;
 };
 /** 获取当前字段的转换函数 */
 export declare const getValueTypeTrans: (params: ValueTypeGetterParams) => any;
@@ -56,6 +59,8 @@ interface ColumnsTransformerParams {
     namePath?: InternalNamePath;
     form: FormInstance;
     index?: number;
+    formDisabled?: boolean;
+    desensitizationKey?: string;
     groupProps: GroupProps;
 }
 /** 转换columns */

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

@@ -120,7 +120,7 @@ export var getReactiveProps = function getReactiveProps(params) {
     show = params.show,
     component = params.component,
     fieldProps = params.fieldProps,
-    name = params.name;
+    desensitization = params.desensitization;
   var values = namePath ? form.getFieldValue(namePath) : form.getFieldsValue();
   var _disabled = isFunction(disabled) ? disabled(values, {
     form: form,
@@ -142,17 +142,31 @@ export var getReactiveProps = function getReactiveProps(params) {
     index: index,
     namePath: namePath
   }) : fieldProps;
+  var _desensitization = isFunction(desensitization) ? desensitization(values, {
+    form: form,
+    index: index,
+    namePath: namePath
+  }) : desensitization;
   return {
     disabled: _disabled,
     show: _show,
     component: _component,
-    fieldProps: _fieldProps
+    fieldProps: _fieldProps,
+    desensitization: _desensitization
   };
 };
 /** 获取当前字段的转换函数 */
 export var getValueTypeTrans = function getValueTypeTrans(params) {
   var _valueTypeMap$valueTy;
+  var desensitizationKey = params.desensitizationKey;
   var valueType = params.valueType;
+  var desensitization = params.desensitization,
+    disabled = params.disabled;
+  var isDesensit = sessionStorage.getItem(desensitizationKey);
+  // 仅查看模式下进行数据脱敏
+  if ((desensitization === null || desensitization === void 0 ? void 0 : desensitization.length) && disabled && isDesensit === 'ON') {
+    valueType = 'desensitization';
+  }
   var transform = (_valueTypeMap$valueTy = valueTypeMap[valueType]) === null || _valueTypeMap$valueTy === void 0 ? void 0 : _valueTypeMap$valueTy.call(valueTypeMap, params);
   return transform;
 };
@@ -198,7 +212,9 @@ export var useTransformColumns = function useTransformColumns(params) {
     namePath = params.namePath,
     value = params.value,
     internalChange = params.onChange,
-    groupProps = params.groupProps;
+    groupProps = params.groupProps,
+    formDisabled = params.formDisabled,
+    desensitizationKey = params.desensitizationKey;
   var timerRef = useRef([]);
   return columns === null || columns === void 0 ? void 0 : columns.flatMap(function (column, index) {
     var type = column.type,
@@ -211,7 +227,8 @@ export var useTransformColumns = function useTransformColumns(params) {
       disabled = column.disabled,
       show = column.show,
       component = column.component,
-      clearNotShow = column.clearNotShow;
+      clearNotShow = column.clearNotShow,
+      desensitization = column.desensitization;
     var _ref = fieldProps || {},
       mode = _ref.mode,
       onChange = _ref.onChange,
@@ -252,19 +269,24 @@ export var useTransformColumns = function useTransformColumns(params) {
         show: show,
         component: component,
         fieldProps: fieldProps,
-        name: columnName
+        name: columnName,
+        desensitization: desensitization
       });
     }, changedCallback, [value, show, fieldProps, _disabled, columnName, type]);
     if (reactiveProps.show === false) {
       return [];
     }
+    var isDisabled = formDisabled || _disabled || reactiveProps.disabled;
     var transform = getValueTypeTrans({
       type: type,
       valueType: valueType,
       switchValue: switchValue,
       toISOString: toISOString,
       toCSTString: toCSTString,
-      mode: mode
+      mode: mode,
+      desensitizationKey: desensitizationKey,
+      disabled: isDisabled,
+      desensitization: reactiveProps.desensitization
     });
     var newValue;
     var handleChange = function handleChange() {

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

@@ -31,7 +31,7 @@ import ConfirmWrapper from './ConfirmWrapper';
 import ChangedWrapper from './ChangedWrapper';
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
-  var _ref2, _ref3, _ref4, _ref5, _otherProps$names2;
+  var _ref3, _ref4, _ref5, _ref6, _otherProps$names2;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -116,7 +116,9 @@ var Render = function Render(props) {
    */
   var valueTypeTransform = function valueTypeTransform() {
     var _ref = otherProps || {},
-      valueType = _ref.valueType;
+      desensitizationKey = _ref.desensitizationKey;
+    var _ref2 = otherProps || {},
+      valueType = _ref2.valueType;
     // SwitchCheckbox默认YN, 兼容已有组件
     if (type === 'SwitchCheckbox') {
       valueType = 'switch';
@@ -124,7 +126,9 @@ var Render = function Render(props) {
     if (type === 'Input') {
       valueType = valueType || 'trim';
     }
-    if (_desensitization === null || _desensitization === void 0 ? void 0 : _desensitization.length) {
+    var isDesensit = sessionStorage.getItem(desensitizationKey);
+    // 仅查看模式下进行数据脱敏
+    if ((_desensitization === null || _desensitization === void 0 ? void 0 : _desensitization.length) && _disabled && isDesensit === 'ON') {
       valueType = 'desensitization';
     }
     // 不存在valueType返回空
@@ -149,7 +153,7 @@ var Render = function Render(props) {
    * 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;
+  var lastDisabled = globalControl ? (_ref3 = (_ref4 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref4 !== void 0 ? _ref4 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref3 !== void 0 ? _ref3 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref5 = (_ref6 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref6 !== void 0 ? _ref6 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : formDisabled;
   // ↑↑↑↑↑↑  formItem参数整理  ↑↑↑↑↑↑
   Object.assign(otherFormItemProps, transforms, {
     names: otherProps.names
@@ -202,8 +206,8 @@ var Render = function Render(props) {
   var functionArgs = function functionArgs(args) {
     var _otherFormItemProps$n;
     var _args = _toConsumableArray(args);
-    var _ref6 = otherProps || {},
-      valueType = _ref6.valueType;
+    var _ref7 = otherProps || {},
+      valueType = _ref7.valueType;
     _args[1] = form.getFieldsValue();
     _args[2] = {
       form: form
@@ -303,7 +307,7 @@ var Render = function Render(props) {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _len3,
         args,
         _key3,
@@ -330,7 +334,7 @@ var Render = function Render(props) {
       }, _callee);
     }));
     return function handleBlur() {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
   var renderItem = function renderItem() {

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

@@ -18,6 +18,7 @@ interface Props<T = any> {
     requiredOnView?: boolean;
     required?: boolean | boolean[] | (() => boolean | boolean[]);
     globalControl?: boolean;
+    desensitizationKey?: string;
 }
 declare const RenderFields: React.FC<Props>;
 export default RenderFields;

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

@@ -26,7 +26,8 @@ var RenderFields = function RenderFields(props) {
     requiredOnView = props.requiredOnView,
     required = props.required,
     diffConfig = props.diffConfig,
-    globalControl = props.globalControl;
+    globalControl = props.globalControl,
+    desensitizationKey = props.desensitizationKey;
   // 是否包含隐藏字段
   var hiddenData = columns.filter(function (item) {
     return Array.isArray(item.hiddenNames);
@@ -189,7 +190,8 @@ var RenderFields = function RenderFields(props) {
       listName: column.listName,
       globalControl: globalControl,
       formDisabled: formDisabled,
-      diffConfig: diffConfig
+      diffConfig: diffConfig,
+      desensitizationKey: desensitizationKey
     };
     return _jsx(FieldProvider, {
       value: otherProps,

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

@@ -85,7 +85,7 @@ type FieldProps<T extends ControlProps, Values, TT> = TT extends 'ProForm' ? Tra
 /**
  * 值转换
  */
-export type ProFormValueType = 'percentage' | 'permillage' | 'thousandth' | 'datePicker' | 'enumName' | 'enumCodeName' | 'address' | 'thousandthCNY' | 'date' | 'dateTime' | 'dateStartTime' | 'dateEndTime' | 'dateStartEndTime' | 'switch';
+export type ProFormValueType = 'percentage' | 'permillage' | 'thousandth' | 'datePicker' | 'enumName' | 'enumCodeName' | 'address' | 'thousandthCNY' | 'date' | 'dateTime' | 'dateStartTime' | 'dateEndTime' | 'dateStartEndTime' | 'switch' | 'desensitization';
 export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
     type?: 'Input';
     fieldProps?: FieldProps<InputProps, Values, T>;

package/es/ProForm/index.js

@@ -11,7 +11,7 @@ import "antd/es/space/style";
 import _Space from "antd/es/space";
 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", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize"];
+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", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize", "desensitizationKey"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DoubleLeftOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
@@ -69,6 +69,8 @@ var ProForm = function ProForm(props, ref) {
     scrollToError = _props$scrollToError === void 0 ? true : _props$scrollToError,
     _props$optimize = props.optimize,
     optimize = _props$optimize === void 0 ? false : _props$optimize,
+    _props$desensitizatio = props.desensitizationKey,
+    desensitizationKey = _props$desensitizatio === void 0 ? 'zat-design-pro-component-desensitization' : _props$desensitizatio,
     otherProps = _objectWithoutProperties(props, _excluded);
   var config = useProConfig('ProForm');
   var _useForm = useForm(originForm, {
@@ -237,7 +239,8 @@ var ProForm = function ProForm(props, ref) {
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
         required: required,
-        globalControl: globalControl
+        globalControl: globalControl,
+        desensitizationKey: desensitizationKey
       }), footerRender()]
     })), children]
   }));

package/es/ProForm/propsType.d.ts

@@ -46,6 +46,7 @@ export interface ProFormOtherProps {
     formDisabled?: boolean;
     isDiffChange?: boolean;
     diffConfig?: DiffConfigProps;
+    desensitizationKey?: string;
 }
 export interface DiffConfigProps<Values = any> {
     /** 比对原始数据源 */
@@ -94,6 +95,8 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
      * 1. 开启不过滤names的中间态值
      */
     optimize?: boolean;
+    /** 全局脱敏开关的key、默认 zat-design-pro-component-desensitization */
+    desensitizationKey?: string;
 }
 export interface Transform<T = any> {
     normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;

package/es/ProForm/utils/diffOriginal.js

@@ -6,9 +6,16 @@ var filterObject = function filterObject(data) {
   if (!isObject(data) || data === null) return data;
   // ['1', undefined] ['1', ''] 视为相等
   if (Array.isArray(data)) {
-    return data.map(function (item) {
-      return isEmpty(item) ? null : item;
+    // 数组中全是empty值的话 视为null
+    var isFillNull = true;
+    var arr = data.map(function (item) {
+      if (isEmpty(item)) {
+        return null;
+      }
+      isFillNull = false;
+      return item;
     });
+    return isFillNull ? null : arr;
   }
   var resData = {};
   Object.keys(data).forEach(function (key) {

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

@@ -67,9 +67,7 @@ declare const _default: {
         };
     };
     /**  脱敏 转换 */
-    desensitization: ({ desensitization }: {
-        desensitization: any;
-    }) => {
+    desensitization: (props: any) => {
         getValueProps: (value: any) => {
             value: any;
         };

package/es/ProForm/utils/valueType.js

@@ -1,3 +1,4 @@
+import _readOnlyError from "@babel/runtime/helpers/esm/readOnlyError";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import Big from 'big.js';
@@ -304,13 +305,42 @@ export default {
     return switchTransform(switchValue);
   },
   /**  脱敏 转换 */
-  desensitization: function desensitization(_ref13) {
-    var _desensitization = _ref13.desensitization;
+  desensitization: function desensitization(props) {
+    var desensitization = props.desensitization,
+      type = props.type,
+      mode = props.mode,
+      names = props.names;
+    // 判断是否是地址控件，并带地址详情场景
+    if (type === 'ProCascader' && mode === 'address' && (names === null || names === void 0 ? void 0 : names.length) === 4) {
+      return {
+        getValueProps: function getValueProps(value) {
+          try {
+            if (value === null || value === void 0 ? void 0 : value.length) {
+              var _value = _slicedToArray(value, 4),
+                province = _value[0],
+                city = _value[1],
+                county = _value[2],
+                address = _value[3];
+              return {
+                value: [province, city, county, maskStringRangeWithRegex(address, desensitization)]
+              };
+            }
+            return {
+              value: value
+            };
+          } catch (error) {
+            return {
+              value: value
+            }; // 如果发生错误，返回原始值
+          }
+        }
+      };
+    }
     return {
       getValueProps: function getValueProps(value) {
         try {
           return {
-            value: maskStringRangeWithRegex(value, _desensitization)
+            value: maskStringRangeWithRegex(value, desensitization)
           };
         } catch (error) {
           return {

package/lib/ProEditTable/utils/diffOriginal.d.ts

@@ -4,7 +4,7 @@ export interface DiffOriginalParams {
     originalValue: any;
     value: any;
     form: FormInstance;
-    equalWith?: ({ originValue, originRecord, value, record, index }: {
+    equalWith?: ({ originValue, originRecord, value, record, index, }: {
         originValue: any;
         originRecord: any;
         value: any;

package/lib/ProEditTable/utils/diffOriginal.js

@@ -10,7 +10,20 @@ var isEmpty = _utils.validate.isEmpty;
 // 过滤对象中undefined字段
 // 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
 var filterObject = function filterObject(data) {
-  if (!(0, _lodash.isObject)(data) || Array.isArray(data) || data === null) return data;
+  if (!(0, _lodash.isObject)(data) || data === null) return data;
+  // ['1', undefined] ['1', ''] 视为相等
+  if (Array.isArray(data)) {
+    // 数组中全是empty值的话 视为null
+    var isFillNull = true;
+    var arr = data.map(function (item) {
+      if (isEmpty(item)) {
+        return null;
+      }
+      isFillNull = false;
+      return item;
+    });
+    return isFillNull ? null : arr;
+  }
   var resData = {};
   Object.keys(data).forEach(function (key) {
     if (!isEmpty(data[key])) {
@@ -47,25 +60,11 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
   }
   var _value = filterObject(value);
   var _originalValue = filterObject(originalValue);
-  // 如果原始值为空 且当前有值的话 认为变更类型是新增
-  if (isEmpty(_originalValue) && !isEmpty(_value)) {
-    return 'add';
-  }
-  if (Array.isArray(_originalValue)) {
-    if ((_originalValue === null || _originalValue === void 0 ? void 0 : _originalValue.length) === (_value === null || _value === void 0 ? void 0 : _value.length)) {
-      var isSame = _originalValue.every(function (valueItem, index) {
-        // 如果两个值有一个不是空值, 则进行深比较
-        if (!isEmpty(value === null || value === void 0 ? void 0 : value[index]) || !isEmpty(valueItem)) {
-          return (0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
-        }
-        return true;
-      });
-      return isSame ? 'same' : 'changed';
-    }
-    return 'changed';
-  }
-  if (!isEmpty(_originalValue) || !isEmpty(_value)) {
-    return (0, _lodash.isEqual)(_value, _originalValue) ? 'same' : 'changed';
-  }
-  return 'same';
+  var isEmptyVal = isEmpty(_value);
+  var isEmptyOrg = isEmpty(_originalValue);
+  // 都为空视为相等
+  if (isEmptyOrg && isEmptyVal) return 'same';
+  // 如果原始值为空 且当前有值的话 视为新增
+  if (isEmptyOrg && !isEmptyVal) return 'add';
+  return (0, _lodash.isEqual)(_value, _originalValue) ? 'same' : 'changed';
 };

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

@@ -33,7 +33,10 @@ var Group = function Group(props) {
     onChange = props.onChange,
     otherProps = props.otherProps,
     id = props.id,
-    isParentView = props.isView;
+    isParentView = props.isView,
+    formDisabled = props.disabled;
+  var _ref = otherProps || {},
+    desensitizationKey = _ref.desensitizationKey;
   var contextProps = _ProForm.default.useFieldProps() || {};
   var names = contextProps.names,
     name = contextProps.name,
@@ -58,7 +61,9 @@ var Group = function Group(props) {
     form: form,
     index: index,
     value: value,
-    groupProps: props
+    groupProps: props,
+    formDisabled: formDisabled,
+    desensitizationKey: desensitizationKey
   });
   var columns = (0, _utils.insertSeparator)(columnsProps, space);
   var _className = (0, _classnames2.default)((0, _defineProperty2.default)({

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

@@ -50,4 +50,5 @@ export type GroupColumnProps<Values = any> = {
     confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps>;
     valuePropName?: string;
     getValueProps?: (value: any) => Record<string, unknown>;
+    desensitization?: [number, number] | ReactiveFunction<Values, [number, number]>;
 } & ColumnPropsMap & FormItemProps;

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

@@ -31,6 +31,7 @@ interface Params {
     component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
     fieldProps?: boolean | ReactiveFunction<any, boolean>;
     name?: NamePath;
+    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
 }
 /** 计算响应式参数的值 */
 export declare const getReactiveProps: (params: Params) => {
@@ -38,10 +39,12 @@ export declare const getReactiveProps: (params: Params) => {
     show: boolean;
     component: any;
     fieldProps: boolean;
+    desensitization: [number, number];
 };
-type ValueTypeGetterParams = Pick<ProFormColumnProps, 'valueType' | 'switchValue' | 'toISOString' | 'toCSTString'> & {
+type ValueTypeGetterParams = Pick<ProFormColumnProps, 'valueType' | 'switchValue' | 'toISOString' | 'toCSTString' | 'disabled' | 'desensitization'> & {
     type?: any;
     mode?: string;
+    desensitizationKey?: string;
 };
 /** 获取当前字段的转换函数 */
 export declare const getValueTypeTrans: (params: ValueTypeGetterParams) => any;
@@ -56,6 +59,8 @@ interface ColumnsTransformerParams {
     namePath?: InternalNamePath;
     form: FormInstance;
     index?: number;
+    formDisabled?: boolean;
+    desensitizationKey?: string;
     groupProps: GroupProps;
 }
 /** 转换columns */