@zat-design/sisyphus-react 3.13.21-beta.1 → 3.13.21-beta.2

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

@@ -4,7 +4,7 @@ import _Input from "antd/es/input";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["label", "form", "placeholder", "fieldName", "otherProps", "desensitization"];
 import React from 'react';
-import { omit } from 'lodash';
+import { isFunction, omit } from 'lodash';
 import { useProConfig } from "../../../../ProConfigProvider";
 import Container from "../../Container";
 import locale from "../../../../locale";
@@ -28,18 +28,15 @@ var Input = function Input(props) {
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var initialConfig = useProConfig('Input');
   if (isView) {
-    if (desensitization !== null && desensitization !== void 0 && desensitization.length && props !== null && props !== 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 || (_rest$value = rest.value) === null || _rest$value === void 0 || (_rest$value$toString = _rest$value.toString) === null || _rest$value$toString === void 0 ? void 0 : _rest$value$toString.call(_rest$value);
-        }
-        return /*#__PURE__*/_jsx(Container, {
-          viewEmpty: viewEmpty,
-          children: maskStringRangeWithRegex(rest.value, desensitization)
-        });
+    if ((Array.isArray(desensitization) || isFunction(desensitization)) && props !== null && props !== void 0 && props.disabled) {
+      if (typeof rest.value === 'number') {
+        var _rest$value, _rest$value$toString;
+        rest.value = rest === null || rest === void 0 || (_rest$value = rest.value) === null || _rest$value === void 0 || (_rest$value$toString = _rest$value.toString) === null || _rest$value$toString === void 0 ? void 0 : _rest$value$toString.call(_rest$value);
       }
+      return /*#__PURE__*/_jsx(Container, {
+        viewEmpty: viewEmpty,
+        children: maskStringRangeWithRegex(rest.value, desensitization)
+      });
     }
     return /*#__PURE__*/_jsx(Container, {
       viewEmpty: viewEmpty,
@@ -53,21 +50,18 @@ var Input = function Input(props) {
   }, omit(initialConfig, ['trim', 'upperCase'])), rest));
 
   // 仅查看模式下进行数据脱敏
-  if (desensitization !== null && desensitization !== void 0 && desensitization.length && props !== null && props !== 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$value2, _rest$value2$toString;
-        rest.value = rest === null || rest === void 0 || (_rest$value2 = rest.value) === null || _rest$value2 === void 0 || (_rest$value2$toString = _rest$value2.toString) === null || _rest$value2$toString === void 0 ? void 0 : _rest$value2$toString.call(_rest$value2);
-      }
-      return /*#__PURE__*/React.cloneElement(ComInput, _objectSpread(_objectSpread(_objectSpread({
-        allowClear: true,
-        autoComplete: 'off',
-        placeholder: placeholder || `${locale.ProForm.inputPlaceholder}`
-      }, omit(initialConfig, ['trim', 'upperCase'])), rest), {}, {
-        value: maskStringRangeWithRegex(rest.value, desensitization)
-      }));
+  if ((Array.isArray(desensitization) || isFunction(desensitization)) && props !== null && props !== void 0 && props.disabled) {
+    if (typeof rest.value === 'number') {
+      var _rest$value2, _rest$value2$toString;
+      rest.value = rest === null || rest === void 0 || (_rest$value2 = rest.value) === null || _rest$value2 === void 0 || (_rest$value2$toString = _rest$value2.toString) === null || _rest$value2$toString === void 0 ? void 0 : _rest$value2$toString.call(_rest$value2);
     }
+    return /*#__PURE__*/React.cloneElement(ComInput, _objectSpread(_objectSpread(_objectSpread({
+      allowClear: true,
+      autoComplete: 'off',
+      placeholder: placeholder || `${locale.ProForm.inputPlaceholder}`
+    }, omit(initialConfig, ['trim', 'upperCase'])), rest), {}, {
+      value: maskStringRangeWithRegex(rest.value, desensitization)
+    }));
   }
   return ComInput;
 };

package/es/ProForm/components/combination/Group/hooks/index.d.ts

@@ -12,7 +12,6 @@ interface ColumnsTransformerParams {
     form: FormInstance;
     index?: number;
     formDisabled?: boolean;
-    desensitizationKey?: string;
     groupProps: GroupType;
 }
 /** 转换columns */

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

@@ -15,9 +15,7 @@ export var useTransformColumns = params => {
     namePath = params.namePath,
     value = params.value,
     internalChange = params.onChange,
-    groupProps = params.groupProps,
-    formDisabled = params.formDisabled,
-    desensitizationKey = params.desensitizationKey;
+    groupProps = params.groupProps;
   var timerRef = useRef([]);
   return columns === null || columns === void 0 ? void 0 : columns.flatMap((column, index) => {
     var type = column.type,

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

@@ -31,8 +31,6 @@ var Group = props => {
     formDisabled = props.disabled,
     _props$split = props.split,
     split = _props$split === void 0 ? '/' : _props$split;
-  var _ref = otherProps || {},
-    desensitizationKey = _ref.desensitizationKey;
   var contextProps = ProForm.useFieldProps() || {};
   var names = contextProps.names,
     name = contextProps.name,
@@ -60,8 +58,7 @@ var Group = props => {
     index,
     value,
     groupProps: props,
-    formDisabled,
-    desensitizationKey
+    formDisabled
   });
   var columns = insertSeparator(columnsProps, space);
   var nextClassName = classnames({

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

@@ -44,7 +44,6 @@ export declare const getReactiveProps: (params: Params) => {
 type ValueTypeGetterParams = Pick<ProFormColumnType, 'valueType' | 'switchValue' | 'toISOString' | 'toCSTString' | 'disabled' | 'desensitization'> & {
     type?: any;
     mode?: string;
-    desensitizationKey?: string;
 };
 /** 获取当前字段的转换函数 */
 export declare const getValueTypeTrans: (params: ValueTypeGetterParams) => any;

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

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

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

@@ -28,8 +28,7 @@ var RenderFields = props => {
     requiredOnView = props.requiredOnView,
     required = props.required,
     diffConfig = props.diffConfig,
-    globalControl = props.globalControl,
-    desensitizationKey = props.desensitizationKey;
+    globalControl = props.globalControl;
 
   // 是否包含隐藏字段
   var hiddenData = columns.filter(item => {
@@ -209,8 +208,7 @@ var RenderFields = props => {
       listName: column.listName,
       globalControl,
       formDisabled,
-      diffConfig,
-      desensitizationKey
+      diffConfig
     };
     return /*#__PURE__*/_jsx(FieldProvider, {
       value: otherProps,

package/es/ProForm/index.js

@@ -9,7 +9,7 @@ import "antd/es/space/style";
 import _Space from "antd/es/space";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize", "desensitizationKey", "stopOnFirstError"];
+var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize", "stopOnFirstError"];
 import { DoubleLeftOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
 import React, { forwardRef, useImperativeHandle, useMemo, useEffect } from 'react';
@@ -70,8 +70,6 @@ var ProForm = (props, ref) => {
     scrollToError = _props$scrollToError === void 0 ? true : _props$scrollToError,
     _props$optimize = props.optimize,
     optimize = _props$optimize === void 0 ? false : _props$optimize,
-    _props$desensitizatio = props.desensitizationKey,
-    desensitizationKey = _props$desensitizatio === void 0 ? 'zat-design-pro-component-desensitization' : _props$desensitizatio,
     _props$stopOnFirstErr = props.stopOnFirstError,
     stopOnFirstError = _props$stopOnFirstErr === void 0 ? false : _props$stopOnFirstErr,
     otherProps = _objectWithoutProperties(props, _excluded);
@@ -267,8 +265,7 @@ var ProForm = (props, ref) => {
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
         required: required,
-        globalControl: globalControl,
-        desensitizationKey: desensitizationKey
+        globalControl: globalControl
       }), footerRender()]
     })), children]
   }));

package/es/ProForm/propsType.d.ts

@@ -46,7 +46,6 @@ export interface ProFormOtherType {
     formDisabled?: boolean;
     isDiffChange?: boolean;
     diffConfig?: DiffConfigType;
-    desensitizationKey?: string;
 }
 export interface DiffConfigType<Values = any> {
     /** 比对原始数据源 */
@@ -99,8 +98,6 @@ export interface ProFormType<Values = any> extends FormProps<Values> {
      * 1. 开启不过滤names的中间态值
      */
     optimize?: boolean;
-    /** 全局脱敏开关的key、默认 zat-design-pro-component-desensitization */
-    desensitizationKey?: string;
     /** 是否在遇到第一个错误时停止验证 */
     stopOnFirstError?: boolean;
 }

package/es/ProStep/components/Anchor/index.d.ts

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

package/es/ProStep/components/Item/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ProStepItemType } from '../../propsType';
 declare const ProStepItem: ({ id, title, collapse: collapseItem, children, lazyLoad: stepLazyLoad, order, ...restProps }: ProStepItemType) => JSX.Element;
 export default ProStepItem;

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

@@ -33,18 +33,15 @@ var Input = function Input(props) {
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var initialConfig = (0, _ProConfigProvider.useProConfig)('Input');
   if (isView) {
-    if (desensitization !== null && desensitization !== void 0 && desensitization.length && props !== null && props !== 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 || (_rest$value = rest.value) === null || _rest$value === void 0 || (_rest$value$toString = _rest$value.toString) === null || _rest$value$toString === void 0 ? void 0 : _rest$value$toString.call(_rest$value);
-        }
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
-          viewEmpty: viewEmpty,
-          children: (0, _valueType.maskStringRangeWithRegex)(rest.value, desensitization)
-        });
+    if ((Array.isArray(desensitization) || (0, _lodash.isFunction)(desensitization)) && props !== null && props !== void 0 && props.disabled) {
+      if (typeof rest.value === 'number') {
+        var _rest$value, _rest$value$toString;
+        rest.value = rest === null || rest === void 0 || (_rest$value = rest.value) === null || _rest$value === void 0 || (_rest$value$toString = _rest$value.toString) === null || _rest$value$toString === void 0 ? void 0 : _rest$value$toString.call(_rest$value);
       }
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
+        viewEmpty: viewEmpty,
+        children: (0, _valueType.maskStringRangeWithRegex)(rest.value, desensitization)
+      });
     }
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
       viewEmpty: viewEmpty,
@@ -58,21 +55,18 @@ var Input = function Input(props) {
   }, (0, _lodash.omit)(initialConfig, ['trim', 'upperCase'])), rest));
 
   // 仅查看模式下进行数据脱敏
-  if (desensitization !== null && desensitization !== void 0 && desensitization.length && props !== null && props !== 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$value2, _rest$value2$toString;
-        rest.value = rest === null || rest === void 0 || (_rest$value2 = rest.value) === null || _rest$value2 === void 0 || (_rest$value2$toString = _rest$value2.toString) === null || _rest$value2$toString === void 0 ? void 0 : _rest$value2$toString.call(_rest$value2);
-      }
-      return /*#__PURE__*/_react.default.cloneElement(ComInput, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-        allowClear: true,
-        autoComplete: 'off',
-        placeholder: placeholder || `${_locale.default.ProForm.inputPlaceholder}`
-      }, (0, _lodash.omit)(initialConfig, ['trim', 'upperCase'])), rest), {}, {
-        value: (0, _valueType.maskStringRangeWithRegex)(rest.value, desensitization)
-      }));
+  if ((Array.isArray(desensitization) || (0, _lodash.isFunction)(desensitization)) && props !== null && props !== void 0 && props.disabled) {
+    if (typeof rest.value === 'number') {
+      var _rest$value2, _rest$value2$toString;
+      rest.value = rest === null || rest === void 0 || (_rest$value2 = rest.value) === null || _rest$value2 === void 0 || (_rest$value2$toString = _rest$value2.toString) === null || _rest$value2$toString === void 0 ? void 0 : _rest$value2$toString.call(_rest$value2);
     }
+    return /*#__PURE__*/_react.default.cloneElement(ComInput, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+      allowClear: true,
+      autoComplete: 'off',
+      placeholder: placeholder || `${_locale.default.ProForm.inputPlaceholder}`
+    }, (0, _lodash.omit)(initialConfig, ['trim', 'upperCase'])), rest), {}, {
+      value: (0, _valueType.maskStringRangeWithRegex)(rest.value, desensitization)
+    }));
   }
   return ComInput;
 };

package/lib/ProForm/components/combination/Group/hooks/index.d.ts

@@ -12,7 +12,6 @@ interface ColumnsTransformerParams {
     form: FormInstance;
     index?: number;
     formDisabled?: boolean;
-    desensitizationKey?: string;
     groupProps: GroupType;
 }
 /** 转换columns */

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

@@ -23,9 +23,7 @@ var useTransformColumns = params => {
     namePath = params.namePath,
     value = params.value,
     internalChange = params.onChange,
-    groupProps = params.groupProps,
-    formDisabled = params.formDisabled,
-    desensitizationKey = params.desensitizationKey;
+    groupProps = params.groupProps;
   var timerRef = (0, _react.useRef)([]);
   return columns === null || columns === void 0 ? void 0 : columns.flatMap((column, index) => {
     var type = column.type,

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

@@ -36,8 +36,6 @@ var _jsxRuntime = require("react/jsx-runtime");
     formDisabled = props.disabled,
     _props$split = props.split,
     split = _props$split === void 0 ? '/' : _props$split;
-  var _ref = otherProps || {},
-    desensitizationKey = _ref.desensitizationKey;
   var contextProps = _ProForm.default.useFieldProps() || {};
   var names = contextProps.names,
     name = contextProps.name,
@@ -65,8 +63,7 @@ var _jsxRuntime = require("react/jsx-runtime");
     index,
     value,
     groupProps: props,
-    formDisabled,
-    desensitizationKey
+    formDisabled
   });
   var columns = (0, _utils.insertSeparator)(columnsProps, space);
   var nextClassName = (0, _classnames.default)({

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

@@ -44,7 +44,6 @@ export declare const getReactiveProps: (params: Params) => {
 type ValueTypeGetterParams = Pick<ProFormColumnType, 'valueType' | 'switchValue' | 'toISOString' | 'toCSTString' | 'disabled' | 'desensitization'> & {
     type?: any;
     mode?: string;
-    desensitizationKey?: string;
 };
 /** 获取当前字段的转换函数 */
 export declare const getValueTypeTrans: (params: ValueTypeGetterParams) => any;

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

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

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

@@ -35,8 +35,7 @@ var RenderFields = props => {
     requiredOnView = props.requiredOnView,
     required = props.required,
     diffConfig = props.diffConfig,
-    globalControl = props.globalControl,
-    desensitizationKey = props.desensitizationKey;
+    globalControl = props.globalControl;
 
   // 是否包含隐藏字段
   var hiddenData = columns.filter(item => {
@@ -216,8 +215,7 @@ var RenderFields = props => {
       listName: column.listName,
       globalControl,
       formDisabled,
-      diffConfig,
-      desensitizationKey
+      diffConfig
     };
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
       value: otherProps,

package/lib/ProForm/index.js

@@ -33,7 +33,7 @@ var _useWatch = _interopRequireDefault(require("./utils/useWatch"));
 var _FormsProvider = _interopRequireWildcard(require("../FormsProvider"));
 var _ProStep = require("../ProStep");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize", "desensitizationKey", "stopOnFirstError"];
+var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize", "stopOnFirstError"];
 var ProForm = (props, ref) => {
   var _localStorage, _ref3;
   var _props$mode = props.mode,
@@ -77,8 +77,6 @@ var ProForm = (props, ref) => {
     scrollToError = _props$scrollToError === void 0 ? true : _props$scrollToError,
     _props$optimize = props.optimize,
     optimize = _props$optimize === void 0 ? false : _props$optimize,
-    _props$desensitizatio = props.desensitizationKey,
-    desensitizationKey = _props$desensitizatio === void 0 ? 'zat-design-pro-component-desensitization' : _props$desensitizatio,
     _props$stopOnFirstErr = props.stopOnFirstError,
     stopOnFirstError = _props$stopOnFirstErr === void 0 ? false : _props$stopOnFirstErr,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
@@ -274,8 +272,7 @@ var ProForm = (props, ref) => {
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
         required: required,
-        globalControl: globalControl,
-        desensitizationKey: desensitizationKey
+        globalControl: globalControl
       }), footerRender()]
     })), children]
   }));

package/lib/ProForm/propsType.d.ts

@@ -46,7 +46,6 @@ export interface ProFormOtherType {
     formDisabled?: boolean;
     isDiffChange?: boolean;
     diffConfig?: DiffConfigType;
-    desensitizationKey?: string;
 }
 export interface DiffConfigType<Values = any> {
     /** 比对原始数据源 */
@@ -99,8 +98,6 @@ export interface ProFormType<Values = any> extends FormProps<Values> {
      * 1. 开启不过滤names的中间态值
      */
     optimize?: boolean;
-    /** 全局脱敏开关的key、默认 zat-design-pro-component-desensitization */
-    desensitizationKey?: string;
     /** 是否在遇到第一个错误时停止验证 */
     stopOnFirstError?: boolean;
 }

package/lib/ProStep/components/Anchor/index.d.ts

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

package/lib/ProStep/components/Item/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ProStepItemType } from '../../propsType';
 declare const ProStepItem: ({ id, title, collapse: collapseItem, children, lazyLoad: stepLazyLoad, order, ...restProps }: ProStepItemType) => JSX.Element;
 export default ProStepItem;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.13.21-beta.1",
+  "version": "3.13.21-beta.2",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",