@zat-design/sisyphus-react 3.9.8-beta.1 → 3.9.8-beta.11

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,
@@ -51,7 +51,8 @@ var Render = function Render(props) {
     confirm = props.confirm,
     globalControl = props.globalControl,
     diffConfig = props.diffConfig,
-    viewRender = props.viewRender;
+    viewRender = props.viewRender,
+    desensitization = props.desensitization;
   var colProps = props.colProps;
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
@@ -75,7 +76,8 @@ var Render = function Render(props) {
       fieldProps: fieldProps,
       component: component,
       originComponent: originComponent,
-      type: type
+      type: type,
+      desensitization: desensitization
     }),
     shouldUpdate = _useShouldUpdate.shouldUpdate,
     _show = _useShouldUpdate.show,
@@ -83,7 +85,8 @@ var Render = function Render(props) {
     _rules = _useShouldUpdate.rules,
     _required = _useShouldUpdate.required,
     _fieldProps = _useShouldUpdate.fieldProps,
-    AutoComponent = _useShouldUpdate.component;
+    AutoComponent = _useShouldUpdate.component,
+    _desensitization = _useShouldUpdate.desensitization;
   otherFormItemProps.shouldUpdate = shouldUpdate;
   var namesStr = useMemo(function () {
     var _otherProps$names;
@@ -113,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';
@@ -121,11 +126,18 @@ var Render = function Render(props) {
     if (type === 'Input') {
       valueType = valueType || 'trim';
     }
+    var isDesensit = sessionStorage.getItem(desensitizationKey);
+    // 仅查看模式下进行数据脱敏
+    if ((_desensitization === null || _desensitization === void 0 ? void 0 : _desensitization.length) && _disabled && isDesensit === 'ON') {
+      valueType = 'desensitization';
+    }
     // 不存在valueType返回空
     if (!valueType) {
       return {};
     }
-    var params = _objectSpread(_objectSpread({}, otherProps), otherFormItemProps);
+    var params = _objectSpread(_objectSpread(_objectSpread({}, otherProps), otherFormItemProps), {}, {
+      desensitization: _desensitization
+    });
     return isFunction(valueTypeMap[valueType]) ? valueTypeMap[valueType](params) : {};
   };
   /**
@@ -141,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
@@ -194,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
@@ -295,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,
@@ -322,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

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "equalWith", "onDiff", "clearNotShow", "required", "confirm"];
+var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "equalWith", "onDiff", "clearNotShow", "required", "confirm", "desensitization"];
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from 'react';
 import { isBoolean, isFunction, union, isString } from 'lodash';
@@ -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);
@@ -74,6 +75,7 @@ var RenderFields = function RenderFields(props) {
       clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,
       columnRequired = column.required,
       confirm = column.confirm,
+      desensitization = column.desensitization,
       otherFormItemProps = _objectWithoutProperties(column, _excluded);
     var component = column.component;
     var _isView = typeof column.isView === 'boolean' ? column.isView : isView;
@@ -188,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,
@@ -212,7 +215,8 @@ var RenderFields = function RenderFields(props) {
         equalWith: onDiff || equalWith,
         requiredOnView: requiredOnView,
         globalControl: globalControl,
-        viewRender: viewRender
+        viewRender: viewRender,
+        desensitization: desensitization
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
   });

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>;
@@ -229,6 +229,8 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void | Promise<boolean | ModalFuncProps | void>>;
     /** 防抖模式 */
     debounceWait?: number;
+    /** 脱敏数据位置下标 */
+    desensitization?: [number, number] | ReactiveFunction<Values, [number, number]>;
 }
 export type ProColumnProps<T = any> = ProFormColumnProps<T> & ColumnPropsMap<T, 'ProForm'>;
 /**

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/useShouldUpdate.js

@@ -21,7 +21,8 @@ var useShouldUpdate = function useShouldUpdate(props) {
     fieldProps = props.fieldProps,
     component = props.component,
     originComponent = props.originComponent,
-    type = props.type;
+    type = props.type,
+    desensitization = props.desensitization;
   var _shouldUpdate = formItemProps.shouldUpdate,
     name = formItemProps.name,
     clearNotShow = formItemProps.clearNotShow,
@@ -38,13 +39,14 @@ var useShouldUpdate = function useShouldUpdate(props) {
   var fieldPropsRef = useRef();
   var originComponentRef = useRef();
   var dependNamesRef = useRef();
+  var desensitizationRef = useRef();
   var newComponent = originComponent || component; // 解决component默认赋值污染问题，需要使用originComponent
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     reRender = _useState2[1];
   var values = {};
   // 不是动态函数直接返回
-  if (!(dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) && !isFunction(show) && !isFunction(disabled) && !isFunction(required) && !isFunction(rules) && !isFunction(fieldProps) && !isFunction(originComponent)) {
+  if (!(dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) && !isFunction(show) && !isFunction(disabled) && !isFunction(required) && !isFunction(rules) && !isFunction(fieldProps) && !isFunction(originComponent) && !isFunction(desensitization)) {
     return {
       shouldUpdate: _shouldUpdate,
       show: show,
@@ -52,7 +54,8 @@ var useShouldUpdate = function useShouldUpdate(props) {
       required: required,
       rules: rules,
       fieldProps: fieldProps,
-      component: newComponent
+      component: newComponent,
+      desensitization: desensitization
     };
   }
   if (namePath) {
@@ -70,6 +73,15 @@ var useShouldUpdate = function useShouldUpdate(props) {
   } else {
     showRef.current = show;
   }
+  if (isFunction(desensitization)) {
+    desensitizationRef.current = desensitization(values, {
+      form: form,
+      index: index,
+      namePath: namePath
+    });
+  } else {
+    desensitizationRef.current = desensitization;
+  }
   if (isFunction(disabled)) {
     // RangePicker返回数组时，特殊处理
     if (['Group', 'RangePicker', 'ProCascader'].includes(type) && Array.isArray(disabled(values, {
@@ -176,6 +188,11 @@ var useShouldUpdate = function useShouldUpdate(props) {
         index: index,
         namePath: namePath
       }) : fieldProps;
+      var _desensitization = isFunction(desensitization) ? desensitization(_currentValues, {
+        form: form,
+        index: index,
+        namePath: namePath
+      }) : desensitization;
       // 清值防抖  多次刷新时以最后一次为准
       if (clearNotShow !== false && (name || names) && !isDeleteLine(form, namePath)) {
         // 当show为其他变为false的时候记录一次需要清值
@@ -201,13 +218,15 @@ var useShouldUpdate = function useShouldUpdate(props) {
       }
       var equalRes = isEqualWith(rulesRef.current, _rules, customEqualForFun);
       var proEqualRes = isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun);
-      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !equalRes || !proEqualRes || (_fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.transformResponse) // 防止fieldProps变更时，transformResponse根据fieldProps新值无法触发更新
+      var desensitizationRes = isEqualWith(desensitizationRef.current, _desensitization);
+      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !equalRes || !proEqualRes || !desensitizationRes || (_fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.transformResponse) // 防止fieldProps变更时，transformResponse根据fieldProps新值无法触发更新
       ) {
         showRef.current = _show;
         disabledRef.current = _disabled;
         requiredRef.current = _required;
         rulesRef.current = _rules;
         fieldPropsRef.current = _fieldProps;
+        desensitizationRef.current = _desensitization;
         reRender({});
         return false;
       }
@@ -224,7 +243,8 @@ var useShouldUpdate = function useShouldUpdate(props) {
     rules: rulesRef.current,
     required: requiredRef.current,
     component: originComponentRef.current,
-    fieldProps: fieldPropsRef.current
+    fieldProps: fieldPropsRef.current,
+    desensitization: desensitizationRef.current
   };
 };
 export default useShouldUpdate;

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

@@ -1,3 +1,5 @@
+/** 脱敏处理函数 */
+export declare const maskStringRangeWithRegex: (input: string, range: [number, number]) => string;
 declare const _default: {
     /** 年月日 */
     date: ({ type, toISOString, toCSTString, mode }: {
@@ -64,5 +66,11 @@ declare const _default: {
             value: any;
         };
     };
+    /**  脱敏 转换 */
+    desensitization: (props: any) => {
+        getValueProps: (value: any) => {
+            value: any;
+        };
+    };
 };
 export default _default;

package/es/ProForm/utils/valueType.js

@@ -1,3 +1,5 @@
+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';
 import { isEqual } from 'lodash';
@@ -188,13 +190,31 @@ var dateTransform = function dateTransform(_ref2) {
   }
   return result;
 };
+/** 脱敏处理函数 */
+export var maskStringRangeWithRegex = function maskStringRangeWithRegex(input, range) {
+  var _ref3 = range || [],
+    _ref4 = _slicedToArray(_ref3, 2),
+    start = _ref4[0],
+    end = _ref4[1];
+  if (start < 0) {
+    throw new Error('脱敏数据: start index cannot be negative');
+  }
+  var adjustedEnd = Math.min(end, input.length - 1);
+  if (start >= input.length) {
+    return '';
+  }
+  var regexPattern = "^(.{".concat(start, "})(.{").concat(adjustedEnd - start + 1, "})(.*)$");
+  var regex = new RegExp(regexPattern);
+  var maskedValue = input.replace(regex, "$1".concat('*'.repeat(adjustedEnd - start + 1), "$3"));
+  return maskedValue;
+};
 export default {
   /** 年月日 */
-  date: function date(_ref3) {
-    var type = _ref3.type,
-      toISOString = _ref3.toISOString,
-      toCSTString = _ref3.toCSTString,
-      mode = _ref3.mode;
+  date: function date(_ref5) {
+    var type = _ref5.type,
+      toISOString = _ref5.toISOString,
+      toCSTString = _ref5.toCSTString,
+      mode = _ref5.mode;
     return dateTransform({
       type: type,
       _valueType: 'date',
@@ -204,11 +224,11 @@ export default {
     });
   },
   /** 年月日 时分秒 */
-  dateTime: function dateTime(_ref4) {
-    var type = _ref4.type,
-      toISOString = _ref4.toISOString,
-      toCSTString = _ref4.toCSTString,
-      mode = _ref4.mode;
+  dateTime: function dateTime(_ref6) {
+    var type = _ref6.type,
+      toISOString = _ref6.toISOString,
+      toCSTString = _ref6.toCSTString,
+      mode = _ref6.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateTime',
@@ -218,11 +238,11 @@ export default {
     });
   },
   /** 年月日 00:00:00 */
-  dateStartTime: function dateStartTime(_ref5) {
-    var type = _ref5.type,
-      toISOString = _ref5.toISOString,
-      toCSTString = _ref5.toCSTString,
-      mode = _ref5.mode;
+  dateStartTime: function dateStartTime(_ref7) {
+    var type = _ref7.type,
+      toISOString = _ref7.toISOString,
+      toCSTString = _ref7.toCSTString,
+      mode = _ref7.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateStartTime',
@@ -232,11 +252,11 @@ export default {
     });
   },
   /** 年月日 23:59:59 */
-  dateEndTime: function dateEndTime(_ref6) {
-    var type = _ref6.type,
-      toISOString = _ref6.toISOString,
-      toCSTString = _ref6.toCSTString,
-      mode = _ref6.mode;
+  dateEndTime: function dateEndTime(_ref8) {
+    var type = _ref8.type,
+      toISOString = _ref8.toISOString,
+      toCSTString = _ref8.toCSTString,
+      mode = _ref8.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateEndTime',
@@ -246,11 +266,11 @@ export default {
     });
   },
   /** 年月日 00:00:00 ~ 年月日 23:59:59 */
-  dateStartEndTime: function dateStartEndTime(_ref7) {
-    var type = _ref7.type,
-      toISOString = _ref7.toISOString,
-      toCSTString = _ref7.toCSTString,
-      mode = _ref7.mode;
+  dateStartEndTime: function dateStartEndTime(_ref9) {
+    var type = _ref9.type,
+      toISOString = _ref9.toISOString,
+      toCSTString = _ref9.toCSTString,
+      mode = _ref9.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateStartEndTime',
@@ -260,9 +280,9 @@ export default {
     });
   },
   /** 百分比 */
-  percentage: function percentage(_ref8) {
-    var type = _ref8.type,
-      valueType = _ref8.valueType;
+  percentage: function percentage(_ref10) {
+    var type = _ref10.type,
+      valueType = _ref10.valueType;
     return transformRatio({
       type: type,
       valueType: valueType,
@@ -270,9 +290,9 @@ export default {
     });
   },
   /** 千分比 */
-  permillage: function permillage(_ref9) {
-    var type = _ref9.type,
-      valueType = _ref9.valueType;
+  permillage: function permillage(_ref11) {
+    var type = _ref11.type,
+      valueType = _ref11.valueType;
     return transformRatio({
       type: type,
       valueType: valueType,
@@ -280,8 +300,54 @@ export default {
     });
   },
   /**  开关 YN转换 */
-  switch: function _switch(_ref10) {
-    var switchValue = _ref10.switchValue;
+  switch: function _switch(_ref12) {
+    var switchValue = _ref12.switchValue;
     return switchTransform(switchValue);
+  },
+  /**  脱敏 转换 */
+  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)
+          };
+        } catch (error) {
+          return {
+            value: value
+          }; // 如果发生错误，返回原始值
+        }
+      }
+    };
   }
 };

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

@@ -78,14 +78,6 @@
             background: #fff;
             letter-spacing: 2px;
           }
-          &.pro-header-describe-items-more{
-            .pro-header-tag{
-              padding: 0;
-              background: transparent !important;
-              color: #333 ;
-            }
-
-          }
         }
       }
     }

package/es/ProTable/components/FormatColumn/index.js

@@ -78,6 +78,7 @@ export var formatColumn = function formatColumn(_ref2) {
     minWidth = column.minWidth,
     onDiff = column.onDiff,
     otherProps = _objectWithoutProperties(column, _excluded);
+  otherProps.scroll = scroll;
   // 仅在 {x: 'max-content', y: 300 } 且 column无指定 width minWidth 情况下 才开启 minWidth的自动计算
   var isMaxContentOverFlow = isObject(scroll) ? (scroll === null || scroll === void 0 ? void 0 : scroll.x) === 'max-content' && Reflect.ownKeys(scroll).includes('y') : false;
   calcMinWidth({