@zat-design/sisyphus-react 3.10.1 → 3.10.2-beta.1

package/es/ProForm/utils/transformValue.js

@@ -20,13 +20,17 @@ export var transformValue = function transformValue(names, form, fieldName, _nor
       });
       return _value;
     },
-    getValueProps: function getValueProps(value) {
+    getValueProps: function getValueProps(value, isOrg) {
       var _curValue;
       var _value = [];
-      names.forEach(function (name, index) {
-        var value = form.getFieldValue(name);
-        _value[index] = value;
-      });
+      if (!isOrg) {
+        names.forEach(function (name, index) {
+          var value = form.getFieldValue(name);
+          _value[index] = value;
+        });
+      } else {
+        _value = value;
+      }
       // 支持外部传入转换函数
       var res = (_getValueProps === null || _getValueProps === void 0 ? void 0 : _getValueProps(_value)) || {
         value: _value

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

@@ -66,11 +66,5 @@ declare const _default: {
             value: any;
         };
     };
-    /**  脱敏 转换 */
-    desensitization: (props: any) => {
-        getValueProps: (value: any) => {
-            value: any;
-        };
-    };
 };
 export default _default;

package/es/ProForm/utils/valueType.js

@@ -1,4 +1,3 @@
-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';
@@ -192,6 +191,7 @@ var dateTransform = function dateTransform(_ref2) {
 };
 /** 脱敏处理函数 */
 export var maskStringRangeWithRegex = function maskStringRangeWithRegex(input, range) {
+  var _input$replace;
   var _ref3 = range || [],
     _ref4 = _slicedToArray(_ref3, 2),
     start = _ref4[0],
@@ -199,13 +199,13 @@ export var maskStringRangeWithRegex = function maskStringRangeWithRegex(input, r
   if (start < 0) {
     throw new Error('脱敏数据: start index cannot be negative');
   }
-  var adjustedEnd = Math.min(end, input.length - 1);
-  if (start >= input.length) {
+  var adjustedEnd = Math.min(end, (input === null || input === void 0 ? void 0 : input.length) - 1);
+  if (start >= (input === null || input === void 0 ? void 0 : 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"));
+  var maskedValue = input === null || input === void 0 ? void 0 : (_input$replace = input.replace) === null || _input$replace === void 0 ? void 0 : _input$replace.call(input, regex, "$1".concat('*'.repeat(adjustedEnd - start + 1), "$3"));
   return maskedValue;
 };
 export default {
@@ -303,51 +303,5 @@ export default {
   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/ProSelect/index.js

@@ -12,7 +12,7 @@ import _Select from "antd/es/select";
 var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "getValueProps", "isView"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
-import React, { useImperativeHandle, useState, forwardRef } from 'react';
+import React, { useImperativeHandle, useState, forwardRef, isValidElement } from 'react';
 import { isFunction, isObject, isString, omit, isNumber } from 'lodash';
 import { useProConfig } from '../ProConfigProvider';
 import Container from '../ProForm/components/Container';
@@ -216,7 +216,15 @@ export var ProSelect = function ProSelect(props, ref) {
     }
     return props.children;
   };
-  var handleChange = function handleChange(value, option) {
+  var isReactElement = function isReactElement(element) {
+    return /*#__PURE__*/isValidElement(element);
+  };
+  var handleChange = function handleChange(value, _option) {
+    // option/其第一层子节点是react节点且是labelInValue就拿record
+    var option = _option;
+    if (labelInValue && (isReactElement(_option) || isReactElement(_option === null || _option === void 0 ? void 0 : _option.children))) {
+      option = _option === null || _option === void 0 ? void 0 : _option.record;
+    }
     var getChangeValue = selectProps.getChangeValue;
     if (selectProps.mode && selectProps.mode === 'multiple') {
       if (Array.isArray(option)) {
@@ -234,7 +242,7 @@ export var ProSelect = function ProSelect(props, ref) {
     } else if (!selectProps.mode && labelInValue) {
       onChange(getChangeValue ? getChangeValue(getValueObject(value)) : getValueObject(value), option);
     } else {
-      onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(value) : value, option === null || option === void 0 ? void 0 : option.record);
+      onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(value) : value, _option === null || _option === void 0 ? void 0 : _option.record);
     }
   };
   /**

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

@@ -1,8 +1,8 @@
 import "antd/es/space/style";
 import _Space from "antd/es/space";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/typography/style";
 import _Typography from "antd/es/typography";
@@ -41,6 +41,45 @@ var RenderColumn = function RenderColumn(props) {
     'varied-cell': props === null || props === void 0 ? void 0 : props.isChanged,
     'add-cell': props === null || props === void 0 ? void 0 : props.isAddCell
   });
+  var getPadding = function getPadding(el) {
+    var style = window.getComputedStyle(el, null);
+    var paddingLeft = Number.parseInt(style.paddingLeft, 10) || 0;
+    var paddingRight = Number.parseInt(style.paddingRight, 10) || 0;
+    var paddingTop = Number.parseInt(style.paddingTop, 10) || 0;
+    var paddingBottom = Number.parseInt(style.paddingBottom, 10) || 0;
+    return {
+      pLeft: paddingLeft,
+      pRight: paddingRight,
+      pTop: paddingTop,
+      pBottom: paddingBottom
+    };
+  };
+  var checkEllipsis = function checkEllipsis(box) {
+    var range = document.createRange();
+    range.setStart(box, 0);
+    range.setEnd(box, box.childNodes.length);
+    var rangeWidth = range.getBoundingClientRect().width;
+    var _getPadding = getPadding(box),
+      pLeft = _getPadding.pLeft,
+      pRight = _getPadding.pRight,
+      pTop = _getPadding.pTop,
+      pBottom = _getPadding.pBottom;
+    var horizontalPadding = pLeft + pRight;
+    if (rangeWidth + horizontalPadding > box.clientWidth) {
+      return true;
+    }
+    return false;
+  };
+  var handleMouseOver = function handleMouseOver(e) {
+    setState({
+      tooltip: checkEllipsis(e.target)
+    });
+  };
+  var tooltipProps = _objectSpread({
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentNode;
+    }
+  }, toolTipProps);
   // 比对场景走的逻辑
   if (!isInNewRowFlag && isBoolean(props === null || props === void 0 ? void 0 : props.isChanged)) {
     var renderNode = value ? node : '-';
@@ -58,11 +97,36 @@ var RenderColumn = function RenderColumn(props) {
       }) : _jsx("div", {
         style: {
           minWidth: minWidth,
-          width: width
+          width: width,
+          overflow: 'hidden',
+          textOverflow: 'ellipsis',
+          whiteSpace: 'nowrap'
         },
         children: ellipsis ? currentValue : renderNode
       });
       if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
+        if (ellipsis) {
+          return _jsx(_Tooltip, _objectSpread(_objectSpread({
+            title: renderNode,
+            onOpenChange: function onOpenChange(open) {
+              setState({
+                tooltip: false
+              });
+            },
+            open: tooltip
+          }, tooltipProps), {}, {
+            children: _jsx(Text, {
+              style: {
+                width: width,
+                minWidth: minWidth
+              },
+              ellipsis: true,
+              onMouseOver: handleMouseOver,
+              onFocus: handleMouseOver,
+              children: renderNode
+            })
+          }));
+        }
         return renderNode;
       }
       if (Array.isArray(originalValue)) {
@@ -86,7 +150,7 @@ var RenderColumn = function RenderColumn(props) {
         title: _jsx(_Space, {
           direction: "vertical",
           className: "changed-tooltip",
-          children: (props === null || props === void 0 ? void 0 : props.isChanged) ? _jsxs(_Fragment, {
+          children: (props === null || props === void 0 ? void 0 : props.isChanged) && !(props === null || props === void 0 ? void 0 : props.isAddCell) ? _jsxs(_Fragment, {
             children: [_jsxs(_Space, {
               align: "start",
               className: "original-value-container",
@@ -138,45 +202,6 @@ var RenderColumn = function RenderColumn(props) {
     });
   }
   if (ellipsis) {
-    var getPadding = function getPadding(el) {
-      var style = window.getComputedStyle(el, null);
-      var paddingLeft = Number.parseInt(style.paddingLeft, 10) || 0;
-      var paddingRight = Number.parseInt(style.paddingRight, 10) || 0;
-      var paddingTop = Number.parseInt(style.paddingTop, 10) || 0;
-      var paddingBottom = Number.parseInt(style.paddingBottom, 10) || 0;
-      return {
-        pLeft: paddingLeft,
-        pRight: paddingRight,
-        pTop: paddingTop,
-        pBottom: paddingBottom
-      };
-    };
-    var checkEllipsis = function checkEllipsis(box) {
-      var range = document.createRange();
-      range.setStart(box, 0);
-      range.setEnd(box, box.childNodes.length);
-      var rangeWidth = range.getBoundingClientRect().width;
-      var _getPadding = getPadding(box),
-        pLeft = _getPadding.pLeft,
-        pRight = _getPadding.pRight,
-        pTop = _getPadding.pTop,
-        pBottom = _getPadding.pBottom;
-      var horizontalPadding = pLeft + pRight;
-      if (rangeWidth + horizontalPadding > box.clientWidth) {
-        return true;
-      }
-      return false;
-    };
-    var handleMouseOver = function handleMouseOver(e) {
-      setState({
-        tooltip: checkEllipsis(e.target)
-      });
-    };
-    var tooltipProps = _objectSpread({
-      getPopupContainer: function getPopupContainer(triggerNode) {
-        return triggerNode.parentNode;
-      }
-    }, toolTipProps);
     if (!value) {
       return _jsx("div", {
         style: {

package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js

@@ -106,7 +106,6 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   var _ref3 = diffConfig || {},
     _ref3$scrollFollowPar = _ref3.scrollFollowParent,
     scrollFollowParent = _ref3$scrollFollowPar === void 0 ? true : _ref3$scrollFollowPar;
-  var contentRef = (0, _react.useRef)(null);
   var namePath = toNamePath(namesStr || name);
   var originalNamePath = toNamePath(originalName);
   var originalNamePaths = originalNames && toNamePaths(originalNames);
@@ -147,7 +146,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   var tipContent = (0, _react.useMemo)(function () {
     var _getValueProps;
     if (!isWatch || noChange) return undefined;
-    var orgValue = getValueProps && !names ? (_getValueProps = getValueProps(originalValue)) === null || _getValueProps === void 0 ? void 0 : _getValueProps[valuePropName] : originalValue;
+    var orgValue = getValueProps ? (_getValueProps = getValueProps(originalValue, true)) === null || _getValueProps === void 0 ? void 0 : _getValueProps[valuePropName] : originalValue;
     // 兼容viewRender函数和Element场景
     var _children = children;
     if (viewRender) {

package/lib/ProEditTable/components/RenderField/index.js

@@ -180,7 +180,9 @@ var RenderField = function RenderField(_ref) {
     fieldProps: column === null || column === void 0 ? void 0 : column.fieldProps
   });
   // 允许formItem的属性放在column最外层
-  var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), resetProps), internalRule);
+  var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), resetProps), internalRule), {}, {
+    validateTrigger: validateTrigger
+  });
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
     _valueType = 'switch';
@@ -202,20 +204,14 @@ var RenderField = function RenderField(_ref) {
    * @returns {}
    */
   var valueTypeTransform = function valueTypeTransform() {
-    var _fieldProps3, _desensitization2;
+    var _fieldProps3;
     // SwitchCheckbox默认YN, 兼容已有组件
     if (type === 'SwitchCheckbox') {
       _valueType = 'switch';
     }
     var params = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
-      mode: (_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.mode,
-      desensitization: _desensitization
+      mode: (_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.mode
     });
-    var isDesensit = sessionStorage.getItem(otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey);
-    // 仅查看模式下进行数据脱敏
-    if (((_desensitization2 = _desensitization) === null || _desensitization2 === void 0 ? void 0 : _desensitization2.length) && _disabled && isDesensit === 'ON') {
-      _valueType = 'desensitization';
-    }
     return (0, _lodash.isFunction)(_valueType2.default[_valueType]) ? _valueType2.default[_valueType](params) : {};
   };
   if ((_names = names) === null || _names === void 0 ? void 0 : _names.length) {
@@ -244,14 +240,10 @@ var RenderField = function RenderField(_ref) {
   var namesTransform = function namesTransform() {
     var _names3;
     if (!((_names3 = names) === null || _names3 === void 0 ? void 0 : _names3.length)) {
-      return {};
+      return valueTypeTransform();
     }
     var namesStr = [].concat((0, _toConsumableArray2.default)(baseName), [index, dataIndex]);
-    var transform = {};
-    if (_valueType) {
-      transform = valueTypeTransform();
-    }
-    return (0, _transformNames.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _formItemProps), transform), form, names, namesStr, type);
+    return (0, _transformNames.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _formItemProps), valueTypeTransform()), form, names, namesStr, type);
   };
   if (!_editRender && typeof type === 'string') {
     var _componentMap$type;
@@ -563,7 +555,7 @@ var RenderField = function RenderField(_ref) {
   if (['Select', 'ProSelect', 'ProEnum'].includes(type)) {
     componentProps.scrollFollowParent = false;
   }
-  Object.assign(_formItemProps, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultTransform()), valueTypeTransform()), namesTransform()), (0, _utils.isTrim)(type, trim, (0, _ProConfigProvider.useProConfig)())));
+  Object.assign(_formItemProps, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultTransform()), namesTransform()), (0, _utils.isTrim)(type, trim, (0, _ProConfigProvider.useProConfig)())));
   // 编辑&保存模式，在查看状态下移除表单的rules不做校验
   if (isView) {
     delete _formItemProps.rules;

package/lib/ProForm/components/base/Input/index.js

@@ -8,13 +8,15 @@ exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _react = _interopRequireDefault(require("react"));
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _index = _interopRequireDefault(require("../../../index"));
-var _excluded = ["label", "form", "placeholder", "fieldName", "otherProps"];
+var _valueType = require("../../../utils/valueType");
+var _excluded = ["label", "form", "placeholder", "fieldName", "otherProps", "desensitization"];
 // 参数优先级
 // 组件内默认值 < config默认值 < props
 var Input = function Input(props) {
@@ -23,6 +25,7 @@ var Input = function Input(props) {
     placeholder = props.placeholder,
     fieldName = props.fieldName,
     otherProps = props.otherProps,
+    desensitization = props.desensitization,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = _index.default.useFieldProps() || {},
     isViewCon = _ref.isView,
@@ -35,10 +38,28 @@ var Input = function Input(props) {
       children: rest.value
     });
   }
-  return (0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  var ComInput = (0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     allowClear: true,
     autoComplete: "off",
     placeholder: placeholder || "".concat(_locale.default.ProForm.inputPlaceholder)
   }, (0, _lodash.omit)(initialConfig, ['trim'])), rest));
+  // 仅查看模式下进行数据脱敏
+  if ((desensitization === null || desensitization === void 0 ? void 0 : desensitization.length) && (props === null || props === void 0 ? void 0 : props.disabled)) {
+    var isDesensit = sessionStorage.getItem(otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey);
+    if (isDesensit === 'ON') {
+      if (typeof rest.value === 'number') {
+        var _rest$value, _rest$value$toString;
+        rest.value = rest === null || rest === void 0 ? void 0 : (_rest$value = rest.value) === null || _rest$value === void 0 ? void 0 : (_rest$value$toString = _rest$value.toString) === null || _rest$value$toString === void 0 ? void 0 : _rest$value$toString.call(_rest$value);
+      }
+      return /*#__PURE__*/_react.default.cloneElement(ComInput, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+        allowClear: true,
+        autoComplete: 'off',
+        placeholder: placeholder || "".concat(_locale.default.ProForm.inputPlaceholder)
+      }, (0, _lodash.omit)(initialConfig, ['trim'])), rest), {}, {
+        value: (0, _valueType.maskStringRangeWithRegex)(rest.value, desensitization)
+      }));
+    }
+  }
+  return ComInput;
 };
 var _default = exports.default = Input;

package/lib/ProForm/components/base/Input/propsType.d.ts

@@ -12,4 +12,6 @@ export interface ProFieldProps<T = any> {
 export interface IProps extends InputProps, ProFieldProps {
     otherProps?: ProFormOtherProps;
     isView?: boolean;
+    /** 脱敏数据位置下标 */
+    desensitization?: [number, number];
 }

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

@@ -166,15 +166,7 @@ var getReactiveProps = exports.getReactiveProps = function getReactiveProps(para
 /** 获取当前字段的转换函数 */
 var getValueTypeTrans = exports.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 = _valueType.default[valueType]) === null || _valueTypeMap$valueTy === void 0 ? void 0 : _valueTypeMap$valueTy.call(_valueType.default, params);
   return transform;
 };
@@ -284,17 +276,13 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
     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,
-      desensitizationKey: desensitizationKey,
-      disabled: isDisabled,
-      desensitization: reactiveProps.desensitization
+      mode: mode
     });
     var newValue;
     var handleChange = function handleChange() {

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

@@ -18,11 +18,12 @@ var _antd = require("antd");
 var _lodash = require("lodash");
 var _index = require("./utils/index");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
+var _Input = _interopRequireDefault(require("../../base/Input"));
 var _useEnum = _interopRequireDefault(require("../../../../ProEnum/hooks/useEnum"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ = _interopRequireDefault(require("../../.."));
 var _Container = _interopRequireDefault(require("../../Container"));
-var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder", "scrollFollowParent"];
+var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder", "scrollFollowParent", "desensitization", "otherProps"];
 var Text = _antd.Typography.Text;
 var defaultFieldNames = {
   label: 'name',
@@ -88,7 +89,9 @@ var ProCascader = function ProCascader(props) {
     separator = _props$separator === void 0 ? '/' : _props$separator,
     detailPlaceholder = props.detailPlaceholder,
     scrollFollowParent = props.scrollFollowParent,
-    otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+    desensitization = props.desensitization,
+    otherProps = props.otherProps,
+    restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref3 = _.default.useFieldProps() || {},
     isViewCon = _ref3.isView,
     viewEmpty = _ref3.viewEmpty;
@@ -284,23 +287,27 @@ var ProCascader = function ProCascader(props) {
       getPopupContainer: function getPopupContainer(trigger) {
         return scrollFollowParent ? trigger.parentElement : document.body;
       }
-    }, (0, _lodash.omit)(otherProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+    }, (0, _lodash.omit)(restProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: detail,
       children: (0, _jsxRuntime.jsx)("span", {
         className: "pro-address-detail",
-        children: (0, _jsxRuntime.jsx)(_antd.Input, {
+        children: (0, _jsxRuntime.jsx)(_Input.default, {
           disabled: lastDisabled[1],
+          desensitization: desensitization,
+          otherProps: otherProps,
           value: detail
         })
       })
-    }) : (0, _jsxRuntime.jsx)(_antd.Input, {
+    }) : (0, _jsxRuntime.jsx)(_Input.default, {
       allowClear: true,
       autoComplete: "off",
       disabled: lastDisabled[1],
       value: detail,
       maxLength: detailMaxLength,
       placeholder: detailPlaceholder || (_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProAddressBar2 = _locale.default.ProAddressBar) === null || _locale$ProAddressBar2 === void 0 ? void 0 : _locale$ProAddressBar2.detailPlaceholder),
-      onChange: handleAddressChange
+      onChange: handleAddressChange,
+      desensitization: desensitization,
+      otherProps: otherProps
     }))]
   });
 };

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

@@ -36,4 +36,5 @@ export interface ProCascaderProps {
     detailPlaceholder?: string;
     /** 浮窗是否跟随父级 */
     scrollFollowParent?: boolean;
+    desensitization?: [number, number];
 }

package/lib/ProForm/components/render/ChangedWrapper.js

@@ -71,7 +71,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var isChanged = diffType === 'changed';
   var tipContent = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return undefined;
-    var valueProps = getValueProps && !names ? getValueProps(originalValue) : {
+    var valueProps = getValueProps ? getValueProps(originalValue, true) : {
       value: originalValue
     };
     if (viewRender) {

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

@@ -31,7 +31,7 @@ var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className",
 /* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
-  var _ref3, _ref4, _ref5, _ref6, _otherProps$names2;
+  var _ref2, _ref3, _ref4, _ref5, _otherProps$names2;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -116,9 +116,7 @@ var Render = function Render(props) {
    */
   var valueTypeTransform = function valueTypeTransform() {
     var _ref = otherProps || {},
-      desensitizationKey = _ref.desensitizationKey;
-    var _ref2 = otherProps || {},
-      valueType = _ref2.valueType;
+      valueType = _ref.valueType;
     // SwitchCheckbox默认YN, 兼容已有组件
     if (type === 'SwitchCheckbox') {
       valueType = 'switch';
@@ -126,18 +124,11 @@ 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 = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), otherFormItemProps), {}, {
-      desensitization: _desensitization
-    });
+    var params = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), otherFormItemProps);
     return (0, _lodash.isFunction)(_valueType.default[valueType]) ? _valueType.default[valueType](params) : {};
   };
   /**
@@ -153,7 +144,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 ? (_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;
+  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;
   // ↑↑↑↑↑↑  formItem参数整理  ↑↑↑↑↑↑
   Object.assign(otherFormItemProps, transforms, {
     names: otherProps.names
@@ -183,7 +174,8 @@ var Render = function Render(props) {
    * 最新fieldProps: 更新后的组件Props
    */
   var lastComponentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), _fieldProps), {}, {
-    disabled: lastDisabled
+    disabled: lastDisabled,
+    desensitization: _desensitization
   });
   var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-width-auto', ['Switch'].includes(type)));
   if (formItemProps.hidden === true || _show === false) {
@@ -206,8 +198,8 @@ var Render = function Render(props) {
   var functionArgs = function functionArgs(args) {
     var _otherFormItemProps$n;
     var _args = (0, _toConsumableArray2.default)(args);
-    var _ref7 = otherProps || {},
-      valueType = _ref7.valueType;
+    var _ref6 = otherProps || {},
+      valueType = _ref6.valueType;
     _args[1] = form.getFieldsValue();
     _args[2] = {
       form: form
@@ -307,7 +299,7 @@ var Render = function Render(props) {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref8 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref7 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _len3,
         args,
         _key3,
@@ -334,7 +326,7 @@ var Render = function Render(props) {
       }, _callee);
     }));
     return function handleBlur() {
-      return _ref8.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
   var renderItem = function renderItem() {
@@ -424,7 +416,7 @@ var Render = function Render(props) {
       colProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
         span: lessMode ? colProps.span : 24 // 默认占一行
       });
-      return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, [].concat(filterFormItemKey, ['name', 'names']))), {}, {
+      return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
         // @ts-ignore
         _internalItemRender: internalItemRender,
         className: _className,