@zat-design/sisyphus-react 3.9.7 → 3.9.8-beta.10

package/lib/ProEditTable/utils/diffOriginal.js

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

package/lib/ProEditTable/utils/index.js

@@ -30,7 +30,7 @@ var _excluded = ["type", "label", "show", "needConfirm", "onHandle", "onClick"],
 // 渲染操作栏
 var getActionColumn = function getActionColumn(config) {
   var _cloneDeepWith = (0, _lodash.cloneDeepWith)(config, function (value) {
-      if (/*#__PURE__*/_react.default.isValidElement(value)) {
+      if ( /*#__PURE__*/_react.default.isValidElement(value)) {
         return value;
       }
     }),
@@ -87,49 +87,53 @@ 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 _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, index) {
+      var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, _ref) {
         var _form$getFieldValue;
-        var rowName, _record, onEvent, result;
+        var index, form, name, namePath, tableLength, rowName, _record, onEvent, result;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
+              index = _ref.index, form = _ref.form, name = _ref.name, namePath = _ref.namePath, tableLength = _ref.tableLength;
               index = _utils.tools.calc(firstIndex, '+', index);
               rowName = [].concat((0, _toConsumableArray2.default)(virtualRowName), [index]);
               if (!(type === 'save')) {
-                _context.next = 12;
+                _context.next = 13;
                 break;
               }
-              _context.prev = 3;
-              _context.next = 6;
+              _context.prev = 4;
+              _context.next = 7;
               return (0, _tools.customValidate)(validateKeys, form, rowName);
-            case 6:
-              _context.next = 12;
+            case 7:
+              _context.next = 13;
               break;
-            case 8:
-              _context.prev = 8;
-              _context.t0 = _context["catch"](3);
+            case 9:
+              _context.prev = 9;
+              _context.t0 = _context["catch"](4);
               (0, _tools.handleScrollToError)();
               return _context.abrupt("return", Promise.reject(_context.t0));
-            case 12:
+            case 13:
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
               _record = (_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record; // 新增事件可以设置初始默认值，当做函数的出参导出
               onEvent = onClick || onHandle;
               if (onEvent) {
-                _context.next = 18;
+                _context.next = 19;
                 break;
               }
               result = true;
-              _context.next = 21;
+              _context.next = 22;
               break;
-            case 18:
-              _context.next = 20;
-              return onEvent === null || onEvent === void 0 ? void 0 : onEvent(_record, index, {
+            case 19:
+              _context.next = 21;
+              return onEvent === null || onEvent === void 0 ? void 0 : onEvent(_record, {
                 form: form,
-                namePath: virtualRowName
+                index: index,
+                tableLength: tableLength,
+                name: name,
+                namePath: namePath
               });
-            case 20:
-              result = _context.sent;
             case 21:
+              result = _context.sent;
+            case 22:
               if (result !== false && type !== 'custom') {
                 _config.actions[type]((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
                   rowName: [].concat((0, _toConsumableArray2.default)(name), [index]),
@@ -139,14 +143,14 @@ var getActionColumn = function getActionColumn(config) {
                   validateKeys: validateKeys
                 }));
               }
-            case 22:
+            case 23:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[3, 8]]);
+        }, _callee, null, [[4, 9]]);
       }));
       return function (_x, _x2) {
-        return _ref.apply(this, arguments);
+        return _ref2.apply(this, arguments);
       };
     }();
     action.buttonProps = buttonProps;
@@ -229,16 +233,16 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     if (typeof columnTitle === 'string') {
       item.originTitle = columnTitle;
       if (tooltip) {
-        var _ref2 = tooltip || {},
-          tooltipTitle = _ref2.title,
-          icon = _ref2.icon,
-          resetProps = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
+        var _ref3 = tooltip || {},
+          tooltipTitle = _ref3.title,
+          icon = _ref3.icon,
+          resetProps = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
         item.title = (0, _jsxRuntime.jsxs)("span", {
           className: "pro-edit-table-title pro-edit-table-tooltip",
           children: [before, columnTitle, (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
             title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip
           }, resetProps), {}, {
-            children: icon ? (/*#__PURE__*/_react.default.cloneElement(icon, {
+            children: icon ? ( /*#__PURE__*/_react.default.cloneElement(icon, {
               className: 'icon-tip'
             })) : (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
               className: "icon-tip",
@@ -391,14 +395,14 @@ var transformColumns = exports.transformColumns = function transformColumns() {
   }
   // cacheMap 用来存储缓存值，若有值后不再请求
   if (JSON.stringify(cacheMap.current) === '{}') {
-    Promise.all(Object.entries(_cacheMap).map(/*#__PURE__*/function () {
-      var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(item) {
-        var _item, key, value, _ref4, service, option;
+    Promise.all(Object.entries(_cacheMap).map( /*#__PURE__*/function () {
+      var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(item) {
+        var _item, key, value, _ref5, service, option;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _item = (0, _slicedToArray2.default)(item, 2), key = _item[0], value = _item[1];
-              _ref4 = (value === null || value === void 0 ? void 0 : value.useRequest) || {}, service = _ref4.service, option = _ref4.option;
+              _ref5 = (value === null || value === void 0 ? void 0 : value.useRequest) || {}, service = _ref5.service, option = _ref5.option;
               if (!service) {
                 _context2.next = 8;
                 break;
@@ -418,7 +422,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
         }, _callee2);
       }));
       return function (_x3) {
-        return _ref3.apply(this, arguments);
+        return _ref4.apply(this, arguments);
       };
     }())).then(function (res) {
       res.forEach(function (item) {

package/lib/ProEditTable/utils/tools.js

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

package/lib/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) => import("react/jsx-runtime").JSX.Element;
+declare const Group: (props: Props) => JSX.Element;
 export default Group;

package/lib/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) => import("react/jsx-runtime").JSX.Element;
+declare const ProEnumTag: (props: Props) => JSX.Element;
 export default ProEnumTag;

package/lib/ProEnum/hooks/useEnumRequest.js

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

package/lib/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): import("react/jsx-runtime").JSX.Element;
-    getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => import("react/jsx-runtime").JSX.Element;
+    (props: ProEnumProps): JSX.Element;
+    getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => JSX.Element;
     useEnum: typeof useEnum;
 };
 export default ProEnum;

package/lib/ProEnum/index.js

@@ -158,7 +158,7 @@ var ProEnum = function ProEnum(props) {
         list = [];
       }
     }
-    if (/*#__PURE__*/_react.default.isValidElement(component)) {
+    if ( /*#__PURE__*/_react.default.isValidElement(component)) {
       var Component = component;
       return (0, _jsxRuntime.jsx)(Component, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, enumProps), {}, {
         dataSource: list,

package/lib/ProEnum/utils/eventCenter.js

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

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

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

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

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

package/lib/ProForm/components/combination/FormList/components/ActionButton.js

@@ -137,7 +137,7 @@ var ActionButton = function ActionButton(props) {
     return _actionProps;
   }, [props.actionProps]);
   var handleClick = /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(defaultCallback, callback, index, item) {
+    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(defaultCallback, callback, index, item) {
       var value, data;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -276,7 +276,7 @@ var ActionButton = function ActionButton(props) {
           },
           children: label
         }))
-      }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (/*#__PURE__*/(0, _react.createElement)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(rest, filterKeys)), {}, {
+      }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : ( /*#__PURE__*/(0, _react.createElement)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(rest, filterKeys)), {}, {
         key: "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index),
         type: "text",
         onClick: function onClick(e) {

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

@@ -20,7 +20,7 @@ var BlockTitle = function BlockTitle(props) {
   if (!title) {
     return (0, _jsxRuntime.jsx)("div", {});
   }
-  if (/*#__PURE__*/_react.default.isValidElement(title)) {
+  if ( /*#__PURE__*/_react.default.isValidElement(title)) {
     return title;
   }
   var titleContent = title;

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

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

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

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

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

@@ -76,7 +76,7 @@ var ComRender = function ComRender(props) {
       children: viewRender(componentProps)
     });
   }
-  var Component = component ? (/*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread3.default)({}, componentProps))) : (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread3.default)({}, componentProps));
+  var Component = component ? ( /*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread3.default)({}, componentProps))) : (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread3.default)({}, componentProps));
   var Com = getComRender(Component, props, componentProps);
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
     value: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, contextProps), {}, {

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

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

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

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

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

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

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

@@ -128,7 +128,7 @@ var getReactiveProps = exports.getReactiveProps = function getReactiveProps(para
     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 = (0, _lodash.isFunction)(disabled) ? disabled(values, {
     form: form,
@@ -150,17 +150,31 @@ var getReactiveProps = exports.getReactiveProps = function getReactiveProps(para
     index: index,
     namePath: namePath
   }) : fieldProps;
+  var _desensitization = (0, _lodash.isFunction)(desensitization) ? desensitization(values, {
+    form: form,
+    index: index,
+    namePath: namePath
+  }) : desensitization;
   return {
     disabled: _disabled,
     show: _show,
     component: _component,
-    fieldProps: _fieldProps
+    fieldProps: _fieldProps,
+    desensitization: _desensitization
   };
 };
 /** 获取当前字段的转换函数 */
 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;
 };
@@ -206,7 +220,9 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
     namePath = params.namePath,
     value = params.value,
     internalChange = params.onChange,
-    groupProps = params.groupProps;
+    groupProps = params.groupProps,
+    formDisabled = params.formDisabled,
+    desensitizationKey = params.desensitizationKey;
   var timerRef = (0, _react.useRef)([]);
   return columns === null || columns === void 0 ? void 0 : columns.flatMap(function (column, index) {
     var type = column.type,
@@ -219,7 +235,8 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
       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,
@@ -260,19 +277,24 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
         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/lib/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) => import("react/jsx-runtime").JSX.Element>;
+declare const _default: import("react").MemoExoticComponent<(props: ProCascaderProps) => JSX.Element>;
 export default _default;

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

@@ -29,9 +29,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 (0, _objectSpread3.default)((0, _objectSpread3.default)({}, item), {}, (0, _defineProperty2.default)({}, (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 (0, _objectSpread3.default)((0, _objectSpread3.default)({}, item), {}, (0, _defineProperty2.default)({}, (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) {
@@ -108,7 +108,7 @@ var ProCascader = function ProCascader(props) {
   }, [dics === null || dics === void 0 ? void 0 : dics[addressCode], enumData]);
   var realDataSource = (0, _react.useMemo)(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    var result = (0, _index.transformDataName)(isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
+    var result = (0, _index.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 = (0, _react.useMemo)(function () {
@@ -130,7 +130,7 @@ var ProCascader = function ProCascader(props) {
     defaultLabel = _useState4[0],
     setDefaultLabel = _useState4[1];
   var getFirstLevelOptions = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _yield$service, data, newData, transFormData, serviceData;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -149,7 +149,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 +219,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 +238,7 @@ var ProCascader = function ProCascader(props) {
     if (foundOption) {
       // 如果找到了匹配的选项，并且还有更多的 value 需要匹配，递归地在子选项中查找
       if (_value.length > 1 && foundOption.children) {
-        return _findSelectedOptions(foundOption.children, _value.slice(1), [].concat((0, _toConsumableArray2.default)(path), [foundOption]));
+        return findSelectedOptions(foundOption.children, _value.slice(1), [].concat((0, _toConsumableArray2.default)(path), [foundOption]));
       }
       // 如果没有更多的 value 需要匹配，返回当前选项（以及之前的路径）
       return [].concat((0, _toConsumableArray2.default)(path), [foundOption]);
@@ -247,7 +247,7 @@ var ProCascader = function ProCascader(props) {
     return null;
   };
   var _selectedOptions = (0, _react.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);

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

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