@zat-design/sisyphus-react 3.10.0 → 3.10.1-beta.2

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

@@ -173,7 +173,9 @@ var RenderField = function RenderField(_ref) {
     fieldProps: column === null || column === void 0 ? void 0 : column.fieldProps
   });
   // 允许formItem的属性放在column最外层
-  var _formItemProps = _objectSpread(_objectSpread(_objectSpread({}, defaultProps), resetProps), internalRule);
+  var _formItemProps = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultProps), resetProps), internalRule), {}, {
+    validateTrigger: validateTrigger
+  });
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
     _valueType = 'switch';
@@ -195,20 +197,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 = _objectSpread(_objectSpread({}, 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 isFunction(valueTypeMap[_valueType]) ? valueTypeMap[_valueType](params) : {};
   };
   if ((_names = names) === null || _names === void 0 ? void 0 : _names.length) {
@@ -237,14 +233,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(_toConsumableArray(baseName), [index, dataIndex]);
-    var transform = {};
-    if (_valueType) {
-      transform = valueTypeTransform();
-    }
-    return transformNames(_objectSpread(_objectSpread({}, _formItemProps), transform), form, names, namesStr, type);
+    return transformNames(_objectSpread(_objectSpread({}, _formItemProps), valueTypeTransform()), form, names, namesStr, type);
   };
   if (!_editRender && typeof type === 'string') {
     var _componentMap$type;
@@ -254,7 +246,7 @@ var RenderField = function RenderField(_ref) {
     if (typeof _editRender === 'function') {
       TargetComponent = _editRender.apply(void 0, rowParams);
     }
-    if ( /*#__PURE__*/React.isValidElement(_editRender)) {
+    if (/*#__PURE__*/React.isValidElement(_editRender)) {
       TargetComponent = _editRender;
     }
   }
@@ -270,7 +262,7 @@ var RenderField = function RenderField(_ref) {
         children: View
       });
     }
-    if ( /*#__PURE__*/React.isValidElement(viewRender)) {
+    if (/*#__PURE__*/React.isValidElement(viewRender)) {
       TargetComponent = viewRender;
     }
   }
@@ -313,7 +305,7 @@ var RenderField = function RenderField(_ref) {
     }, 100);
   };
   // 单元格更新数据时，加个防抖，防止更新频率过快，卡顿
-  var _onChange = debounce( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var _onChange = debounce(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _len2,
       args,
       _key2,
@@ -427,7 +419,7 @@ var RenderField = function RenderField(_ref) {
     }, _callee);
   })), 300);
   var _onblur = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var _TargetComponent3, _TargetComponent3$pro, _TargetComponent$prop4;
       var _len3,
         args,
@@ -556,7 +548,7 @@ var RenderField = function RenderField(_ref) {
   if (['Select', 'ProSelect', 'ProEnum'].includes(type)) {
     componentProps.scrollFollowParent = false;
   }
-  Object.assign(_formItemProps, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultTransform()), valueTypeTransform()), namesTransform()), isTrim(type, trim, useProConfig())));
+  Object.assign(_formItemProps, _objectSpread(_objectSpread(_objectSpread({}, defaultTransform()), namesTransform()), isTrim(type, trim, useProConfig())));
   // 编辑&保存模式，在查看状态下移除表单的rules不做校验
   if (isView) {
     delete _formItemProps.rules;
@@ -565,7 +557,7 @@ var RenderField = function RenderField(_ref) {
   var getFieldItem = function getFieldItem() {
     var _componentProps;
     var FormItem = null;
-    var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps));
+    var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? (/*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps));
     if (originalValues && !getIsNew(record)) {
       FieldComponent = _jsx(ListChangedWrapper, {
         name: cellName,

package/es/ProEditTable/components/RenderToolbar/index.d.ts

@@ -1,2 +1,2 @@
-declare const RenderToolbar: (config: any) => JSX.Element;
+declare const RenderToolbar: (config: any) => import("react/jsx-runtime").JSX.Element;
 export default RenderToolbar;

package/es/ProEditTable/components/RenderToolbar/index.js

@@ -73,7 +73,7 @@ var RenderToolbar = function RenderToolbar(config) {
     toolbar.show = show !== null && show !== void 0 ? show : true;
     toolbar.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     toolbar.onEvent = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, _ref) {
+      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, _ref) {
         var index, form, name, namePath, tableLength, selectedRows, onEvent, result;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {

package/es/ProEditTable/components/Summary/index.d.ts

@@ -8,5 +8,5 @@ interface SummaryProps<T = any> {
     };
     rowSelection: any;
 }
-declare const Summary: ({ data, summary, rowSelection, }: SummaryProps) => JSX.Element;
+declare const Summary: ({ data, summary, rowSelection, }: SummaryProps) => import("react/jsx-runtime").JSX.Element;
 export default Summary;

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

@@ -9,7 +9,7 @@ export declare const defaultBtnNameMap: {
     custom: any;
 };
 export declare const iconMap: {
-    add: JSX.Element;
+    add: import("react/jsx-runtime").JSX.Element;
 };
 export declare const defaultSingleActionKeys: string[];
 export declare const defaultMultipleActionKeys: string[];

package/es/ProEditTable/utils/config.js

@@ -63,7 +63,7 @@ export var actions = {
     });
   },
   save: function () {
-    var _save = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
+    var _save = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
       var record, editingKeys, setState, form, rowName, virtualRowName, result, updateData, nextEditingKeys, values;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -166,7 +166,7 @@ export var actions = {
     }
   },
   add: function () {
-    var _add = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
+    var _add = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
       var _tableRef$current$que, _tableRef$current$que2;
       var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, nextData, rowKey, addData, nextEditingKeys;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {

package/es/ProEditTable/utils/index.js

@@ -26,7 +26,7 @@ import locale from '../../locale';
 // 渲染操作栏
 var getActionColumn = function getActionColumn(config) {
   var _cloneDeepWith = cloneDeepWith(config, function (value) {
-      if ( /*#__PURE__*/React.isValidElement(value)) {
+      if (/*#__PURE__*/React.isValidElement(value)) {
         return value;
       }
     }),
@@ -83,7 +83,7 @@ var getActionColumn = function getActionColumn(config) {
     action.show = show !== null && show !== void 0 ? show : true;
     action.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     action.onEvent = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, _ref) {
+      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, _ref) {
         var _form$getFieldValue;
         var index, form, name, namePath, tableLength, selectedRows, rowName, _record, onEvent, result;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -239,7 +239,7 @@ export var transformColumns = function transformColumns() {
           children: [before, columnTitle, _jsx(_Tooltip, _objectSpread(_objectSpread({
             title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip
           }, resetProps), {}, {
-            children: icon ? ( /*#__PURE__*/React.cloneElement(icon, {
+            children: icon ? (/*#__PURE__*/React.cloneElement(icon, {
               className: 'icon-tip'
             })) : _jsx(ReactSVG, {
               className: "icon-tip",
@@ -392,8 +392,8 @@ export var transformColumns = function transformColumns() {
   }
   // cacheMap 用来存储缓存值，若有值后不再请求
   if (JSON.stringify(cacheMap.current) === '{}') {
-    Promise.all(Object.entries(_cacheMap).map( /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
+    Promise.all(Object.entries(_cacheMap).map(/*#__PURE__*/function () {
+      var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
         var _item, key, value, _ref5, service, option;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {

package/es/ProEditTable/utils/tools.js

@@ -6,14 +6,14 @@ export var getRandom = function getRandom() {
 };
 // 深层次对比两个对象且取出来差异值
 export var difference = function difference(object, base) {
-  var changes = function changes(object, base) {
+  var _changes = function changes(object, base) {
     return transform(object, function (result, value, key) {
       if (!isEqual(value, base[key])) {
-        result[key] = isObject(value) && isObject(base[key]) ? changes(value, base[key]) : value;
+        result[key] = isObject(value) && isObject(base[key]) ? _changes(value, base[key]) : value;
       }
     });
   };
-  return changes(object, base);
+  return _changes(object, base);
 };
 // 数组字段循环校验，解决validateFields无法批量校验的问题
 export var customValidate = function customValidate(validateKeys, form, rowName) {
@@ -206,7 +206,7 @@ export var handleScrollToError = function handleScrollToError() {
  */
 export function cloneDeepFilterNode(value) {
   return cloneDeepWith(value, function (val) {
-    if ( /*#__PURE__*/React.isValidElement(val)) {
+    if (/*#__PURE__*/React.isValidElement(val)) {
       return val;
     }
   });

package/es/ProEnum/components/Group.d.ts

@@ -6,5 +6,5 @@ interface Props extends Pick<ProEnum, 'id' | 'value' | 'onChange' | 'dataSource'
     allowClear?: boolean;
     button?: boolean;
 }
-declare const Group: (props: Props) => JSX.Element;
+declare const Group: (props: Props) => import("react/jsx-runtime").JSX.Element;
 export default Group;

package/es/ProEnum/components/Tag.d.ts

@@ -3,5 +3,5 @@ interface Props extends Pick<ProEnum, 'id' | 'value' | 'onChange' | 'dataSource'
     fieldValue: string;
     fieldLabel: string;
 }
-declare const ProEnumTag: (props: Props) => JSX.Element;
+declare const ProEnumTag: (props: Props) => import("react/jsx-runtime").JSX.Element;
 export default ProEnumTag;

package/es/ProEnum/hooks/useEnumRequest.js

@@ -52,7 +52,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     staleTime: 6e4 * 60
   }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
     setCache: function () {
-      var _setCache = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
+      var _setCache = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
         var response, _locale$ProEnum2, _useRequest$options, ignoreCodes, cacheData;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -162,7 +162,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     }
   }));
   var mergeData = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var cacheData, _useRequest$options2, _useRequest$options3, enumData, cacheCodes, codes, ignoreCodes, diff, response, res, _locale$ProEnum6;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {

package/es/ProEnum/index.d.ts

@@ -2,8 +2,8 @@ import useEnum from './hooks/useEnum';
 import { ProEnumProps } from './propsType';
 import './style/index.less';
 declare const ProEnum: {
-    (props: ProEnumProps): JSX.Element;
-    getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => JSX.Element;
+    (props: ProEnumProps): import("react/jsx-runtime").JSX.Element;
+    getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => import("react/jsx-runtime").JSX.Element;
     useEnum: typeof useEnum;
 };
 export default ProEnum;

package/es/ProEnum/index.js

@@ -157,7 +157,7 @@ var ProEnum = function ProEnum(props) {
         list = [];
       }
     }
-    if ( /*#__PURE__*/React.isValidElement(component)) {
+    if (/*#__PURE__*/React.isValidElement(component)) {
       var Component = component;
       return _jsx(Component, _objectSpread(_objectSpread({}, enumProps), {}, {
         dataSource: list,

package/es/ProEnum/utils/eventCenter.js

@@ -7,7 +7,7 @@ var SimpleEventCenter = /*#__PURE__*/function () {
     this.events = void 0;
     this.events = new Map();
   }
-  _createClass(SimpleEventCenter, [{
+  return _createClass(SimpleEventCenter, [{
     key: "subscribe",
     value: function subscribe(eventName, callback) {
       if (!this.events.has(eventName)) {
@@ -34,6 +34,5 @@ var SimpleEventCenter = /*#__PURE__*/function () {
       }
     }
   }]);
-  return SimpleEventCenter;
 }(); // 将 eventCenter 实例添加到 window 对象上
 window.eventCenter = new SimpleEventCenter();

package/es/ProEnum/utils/getEnumLabel.d.ts

@@ -1,2 +1,2 @@
-declare const getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => JSX.Element;
+declare const getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => import("react/jsx-runtime").JSX.Element;
 export default getEnumLabel;

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

@@ -1,3 +1,3 @@
 import { IProps } from './propsType';
-declare const Input: (props: IProps) => JSX.Element;
+declare const Input: (props: IProps) => import("react/jsx-runtime").JSX.Element;
 export default Input;

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

@@ -2,13 +2,15 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["label", "form", "placeholder", "fieldName", "otherProps"];
+var _excluded = ["label", "form", "placeholder", "fieldName", "otherProps", "desensitization"];
 import { jsx as _jsx } from "react/jsx-runtime";
+import React from 'react';
 import { omit } from 'lodash';
 import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
 import locale from '../../../../locale';
 import ProForm from '../../../index';
+import { maskStringRangeWithRegex } from '../../../utils/valueType';
 // 参数优先级
 // 组件内默认值 < config默认值 < props
 var Input = function Input(props) {
@@ -17,6 +19,7 @@ var Input = function Input(props) {
     placeholder = props.placeholder,
     fieldName = props.fieldName,
     otherProps = props.otherProps,
+    desensitization = props.desensitization,
     rest = _objectWithoutProperties(props, _excluded);
   var _ref = ProForm.useFieldProps() || {},
     isViewCon = _ref.isView,
@@ -29,10 +32,28 @@ var Input = function Input(props) {
       children: rest.value
     });
   }
-  return _jsx(_Input, _objectSpread(_objectSpread({
+  var ComInput = _jsx(_Input, _objectSpread(_objectSpread({
     allowClear: true,
     autoComplete: "off",
     placeholder: placeholder || "".concat(locale.ProForm.inputPlaceholder)
   }, 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.cloneElement(ComInput, _objectSpread(_objectSpread(_objectSpread({
+        allowClear: true,
+        autoComplete: 'off',
+        placeholder: placeholder || "".concat(locale.ProForm.inputPlaceholder)
+      }, omit(initialConfig, ['trim'])), rest), {}, {
+        value: maskStringRangeWithRegex(rest.value, desensitization)
+      }));
+    }
+  }
+  return ComInput;
 };
 export default Input;

package/es/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/es/ProForm/components/combination/FormList/components/ActionButton.js

@@ -136,7 +136,7 @@ var ActionButton = function ActionButton(props) {
     return _actionProps;
   }, [props.actionProps]);
   var handleClick = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, index, item) {
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, index, item) {
       var value, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -275,7 +275,7 @@ var ActionButton = function ActionButton(props) {
           },
           children: label
         }))
-      }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : ( /*#__PURE__*/_createElement(_Button, _objectSpread(_objectSpread({}, omit(rest, filterKeys)), {}, {
+      }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (/*#__PURE__*/_createElement(_Button, _objectSpread(_objectSpread({}, omit(rest, filterKeys)), {}, {
         key: "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index),
         type: "text",
         onClick: function onClick(e) {

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

@@ -13,7 +13,7 @@ var BlockTitle = function BlockTitle(props) {
   if (!title) {
     return _jsx("div", {});
   }
-  if ( /*#__PURE__*/React.isValidElement(title)) {
+  if (/*#__PURE__*/React.isValidElement(title)) {
     return title;
   }
   var titleContent = title;

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

@@ -58,7 +58,7 @@ var ToolbarButton = function ToolbarButton(props) {
     return _toolbarProps;
   }, [props.toolbarProps]);
   var handleClick = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, item) {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, item) {
       var value, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {

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

@@ -23,7 +23,7 @@ export var namesPathTransform = function namesPathTransform(_ref) {
 // 比较memo
 export var memoWith = function memoWith(pre, next) {
   return isEqualWith(pre, next, function (objValue, othValue) {
-    if ( /*#__PURE__*/React.isValidElement(objValue) && /*#__PURE__*/React.isValidElement(othValue)) {
+    if (/*#__PURE__*/React.isValidElement(objValue) && /*#__PURE__*/React.isValidElement(othValue)) {
       return true;
     }
     // 移除解决formlist函数里不更新问题

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

@@ -68,7 +68,7 @@ var ComRender = function ComRender(props) {
       children: viewRender(componentProps)
     });
   }
-  var Component = component ? ( /*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
+  var Component = component ? (/*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
   var Com = getComRender(Component, props, componentProps);
   return _jsx(FieldProvider, {
     value: _objectSpread(_objectSpread({}, contextProps), {}, {

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

@@ -158,15 +158,7 @@ export var getReactiveProps = function getReactiveProps(params) {
 /** 获取当前字段的转换函数 */
 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;
 };
@@ -276,17 +268,13 @@ export var useTransformColumns = function useTransformColumns(params) {
     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/es/ProForm/components/combination/ProCascader/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { ProCascaderProps } from './propsType';
-declare const _default: import("react").MemoExoticComponent<(props: ProCascaderProps) => JSX.Element>;
+declare const _default: import("react").MemoExoticComponent<(props: ProCascaderProps) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

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

@@ -1,5 +1,3 @@
-import "antd/es/input/style";
-import _Input from "antd/es/input";
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
 import "antd/es/cascader/style";
@@ -13,12 +11,13 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/typography/style";
 import _Typography from "antd/es/typography";
-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"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState, memo, useMemo } from 'react';
 import { omit, find as _find, isBoolean } from 'lodash';
 import { transformDataName } from './utils/index';
 import { useProConfig } from '../../../../ProConfigProvider';
+import Input from '../../base/Input';
 import useEnum from '../../../../ProEnum/hooks/useEnum';
 import locale from '../../../../locale';
 import ProForm from '../../..';
@@ -29,9 +28,9 @@ var defaultFieldNames = {
   value: 'code',
   children: 'children'
 };
-var filterDataSource = function filterDataSource(dataSource, level, fieldNames) {
+var _filterDataSource = function filterDataSource(dataSource, level, fieldNames) {
   return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
-    return _objectSpread(_objectSpread({}, item), {}, _defineProperty({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] : filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)));
+    return _objectSpread(_objectSpread({}, item), {}, _defineProperty({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] : _filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)));
   });
 };
 var getViewLabel = function getViewLabel(_ref) {
@@ -88,7 +87,9 @@ var ProCascader = function ProCascader(props) {
     separator = _props$separator === void 0 ? '/' : _props$separator,
     detailPlaceholder = props.detailPlaceholder,
     scrollFollowParent = props.scrollFollowParent,
-    otherProps = _objectWithoutProperties(props, _excluded);
+    desensitization = props.desensitization,
+    otherProps = props.otherProps,
+    restProps = _objectWithoutProperties(props, _excluded);
   var _ref3 = ProForm.useFieldProps() || {},
     isViewCon = _ref3.isView,
     viewEmpty = _ref3.viewEmpty;
@@ -108,7 +109,7 @@ var ProCascader = function ProCascader(props) {
   }, [dics === null || dics === void 0 ? void 0 : dics[addressCode], enumData]);
   var realDataSource = useMemo(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    var result = transformDataName(isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
+    var result = transformDataName(isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
     return result;
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var lastDisabled = useMemo(function () {
@@ -130,7 +131,7 @@ var ProCascader = function ProCascader(props) {
     defaultLabel = _useState4[0],
     setDefaultLabel = _useState4[1];
   var getFirstLevelOptions = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _yield$service, data, newData, transFormData, serviceData;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -149,7 +150,7 @@ var ProCascader = function ProCascader(props) {
               value: fieldNames.value,
               children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
             });
-            serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
+            serviceData = isAddressMode && realLevel === 2 ? _filterDataSource(transFormData, level, fieldNames) : transFormData;
             setServiceData(serviceData);
           case 9:
           case "end":
@@ -219,7 +220,7 @@ var ProCascader = function ProCascader(props) {
   })) === null || _ref5$filter === void 0 ? void 0 : _ref5$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
     return !!item;
   })) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
-  var findSelectedOptions = function findSelectedOptions(options, value) {
+  var _findSelectedOptions = function findSelectedOptions(options, value) {
     var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
     var _value = value !== null && value !== void 0 ? value : [];
     // 基准情况：如果 value 数组为空，且 path 不为空，说明找到了完整的路径
@@ -238,7 +239,7 @@ var ProCascader = function ProCascader(props) {
     if (foundOption) {
       // 如果找到了匹配的选项，并且还有更多的 value 需要匹配，递归地在子选项中查找
       if (_value.length > 1 && foundOption.children) {
-        return findSelectedOptions(foundOption.children, _value.slice(1), [].concat(_toConsumableArray(path), [foundOption]));
+        return _findSelectedOptions(foundOption.children, _value.slice(1), [].concat(_toConsumableArray(path), [foundOption]));
       }
       // 如果没有更多的 value 需要匹配，返回当前选项（以及之前的路径）
       return [].concat(_toConsumableArray(path), [foundOption]);
@@ -247,7 +248,7 @@ var ProCascader = function ProCascader(props) {
     return null;
   };
   var _selectedOptions = useMemo(function () {
-    return findSelectedOptions(service ? serviceData : realDataSource, addressValue);
+    return _findSelectedOptions(service ? serviceData : realDataSource, addressValue);
   }, [service, serviceData, realDataSource, addressValue]);
   var handleAddressChange = function handleAddressChange(e) {
     var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);
@@ -284,23 +285,27 @@ var ProCascader = function ProCascader(props) {
       getPopupContainer: function getPopupContainer(trigger) {
         return scrollFollowParent ? trigger.parentElement : document.body;
       }
-    }, omit(otherProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? _jsx(_Tooltip, {
+    }, omit(restProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? _jsx(_Tooltip, {
       title: detail,
       children: _jsx("span", {
         className: "pro-address-detail",
-        children: _jsx(_Input, {
+        children: _jsx(Input, {
           disabled: lastDisabled[1],
+          desensitization: desensitization,
+          otherProps: otherProps,
           value: detail
         })
       })
-    }) : _jsx(_Input, {
+    }) : _jsx(Input, {
       allowClear: true,
       autoComplete: "off",
       disabled: lastDisabled[1],
       value: detail,
       maxLength: detailMaxLength,
       placeholder: detailPlaceholder || (locale === null || locale === void 0 ? void 0 : (_locale$ProAddressBar2 = locale.ProAddressBar) === null || _locale$ProAddressBar2 === void 0 ? void 0 : _locale$ProAddressBar2.detailPlaceholder),
-      onChange: handleAddressChange
+      onChange: handleAddressChange,
+      desensitization: desensitization,
+      otherProps: otherProps
     }))]
   });
 };

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

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

package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -24,7 +24,7 @@ var useDefaultOptions = function useDefaultOptions(options) {
   });
 };
 var defaultService = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0: