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

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

@@ -29,7 +29,8 @@ var RenderColumn = function RenderColumn(props) {
     _props$toolTipProps = props.toolTipProps,
     toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps,
     minWidth = props.minWidth,
-    isInNewRowFlag = props.isInNewRowFlag;
+    isInNewRowFlag = props.isInNewRowFlag,
+    scroll = props.scroll;
   var _useSetState = useSetState({
       tooltip: false
     }),
@@ -43,8 +44,9 @@ var RenderColumn = function RenderColumn(props) {
   // 比对场景走的逻辑
   if (!isInNewRowFlag && isBoolean(props === null || props === void 0 ? void 0 : props.isChanged)) {
     var renderNode = value ? node : '-';
+    var isXMaxContent = (scroll === null || scroll === void 0 ? void 0 : scroll.x) === 'max-content';
     if (ellipsis || (props === null || props === void 0 ? void 0 : props.isChanged)) {
-      renderNode = _jsx(Text, {
+      renderNode = !isXMaxContent ? _jsx(Text, {
         style: {
           width: currentValue === '-' ? 32.5 : width,
           minWidth: minWidth
@@ -53,6 +55,12 @@ var RenderColumn = function RenderColumn(props) {
           tooltip: false
         },
         children: ellipsis ? currentValue : renderNode
+      }) : _jsx("div", {
+        style: {
+          minWidth: minWidth,
+          width: width
+        },
+        children: ellipsis ? currentValue : renderNode
       });
       if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
         return renderNode;

package/es/ProTable/propsType.d.ts

@@ -46,6 +46,8 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     viewRender?: ({ value, record, index, originalValue, originalRecord, }: any) => 'same' | 'changed' | 'add' | undefined;
     isChanged?: boolean | null;
     children?: ProTableColumn[];
+    /** table透传下来的scroll配置 */
+    scroll?: any;
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

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

@@ -104,7 +104,7 @@ var RenderToolbar = function RenderToolbar(config) {
             case 7:
               result = _context.sent;
             case 8:
-              if (result && type !== 'custom') {
+              if (result !== false && type !== 'custom') {
                 _config.actions[type]((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
                   index: index,
                   record: record,

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

@@ -51,7 +51,8 @@ var Render = function Render(props) {
     confirm = props.confirm,
     globalControl = props.globalControl,
     diffConfig = props.diffConfig,
-    viewRender = props.viewRender;
+    viewRender = props.viewRender,
+    desensitization = props.desensitization;
   var colProps = props.colProps;
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
@@ -75,7 +76,8 @@ var Render = function Render(props) {
       fieldProps: fieldProps,
       component: component,
       originComponent: originComponent,
-      type: type
+      type: type,
+      desensitization: desensitization
     }),
     shouldUpdate = _useShouldUpdate.shouldUpdate,
     _show = _useShouldUpdate.show,
@@ -83,7 +85,8 @@ var Render = function Render(props) {
     _rules = _useShouldUpdate.rules,
     _required = _useShouldUpdate.required,
     _fieldProps = _useShouldUpdate.fieldProps,
-    AutoComponent = _useShouldUpdate.component;
+    AutoComponent = _useShouldUpdate.component,
+    _desensitization = _useShouldUpdate.desensitization;
   otherFormItemProps.shouldUpdate = shouldUpdate;
   var namesStr = (0, _react.useMemo)(function () {
     var _otherProps$names;
@@ -121,11 +124,16 @@ var Render = function Render(props) {
     if (type === 'Input') {
       valueType = valueType || 'trim';
     }
+    if (_desensitization === null || _desensitization === void 0 ? void 0 : _desensitization.length) {
+      valueType = 'desensitization';
+    }
     // 不存在valueType返回空
     if (!valueType) {
       return {};
     }
-    var params = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), otherFormItemProps);
+    var params = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), otherFormItemProps), {}, {
+      desensitization: _desensitization
+    });
     return (0, _lodash.isFunction)(_valueType.default[valueType]) ? _valueType.default[valueType](params) : {};
   };
   /**

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

@@ -17,7 +17,7 @@ var componentMap = _interopRequireWildcard(require("../index"));
 var _utils = require("../../utils");
 var _useFieldProps = require("../../utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../../../locale"));
-var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "equalWith", "onDiff", "clearNotShow", "required", "confirm"];
+var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "equalWith", "onDiff", "clearNotShow", "required", "confirm", "desensitization"];
 var RenderFields = function RenderFields(props) {
   var isView = props.isView,
     _props$columns = props.columns,
@@ -82,6 +82,7 @@ var RenderFields = function RenderFields(props) {
       clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,
       columnRequired = column.required,
       confirm = column.confirm,
+      desensitization = column.desensitization,
       otherFormItemProps = (0, _objectWithoutProperties2.default)(column, _excluded);
     var component = column.component;
     var _isView = typeof column.isView === 'boolean' ? column.isView : isView;
@@ -220,7 +221,8 @@ var RenderFields = function RenderFields(props) {
         equalWith: onDiff || equalWith,
         requiredOnView: requiredOnView,
         globalControl: globalControl,
-        viewRender: viewRender
+        viewRender: viewRender,
+        desensitization: desensitization
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
   });

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

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

package/lib/ProForm/utils/useShouldUpdate.js

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

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

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

package/lib/ProForm/utils/valueType.js

@@ -4,7 +4,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.maskStringRangeWithRegex = exports.default = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _big = _interopRequireDefault(require("big.js"));
 var _lodash = require("lodash");
@@ -195,13 +196,31 @@ var dateTransform = function dateTransform(_ref2) {
   }
   return result;
 };
+/** 脱敏处理函数 */
+var maskStringRangeWithRegex = exports.maskStringRangeWithRegex = function maskStringRangeWithRegex(input, range) {
+  var _ref3 = range || [],
+    _ref4 = (0, _slicedToArray2.default)(_ref3, 2),
+    start = _ref4[0],
+    end = _ref4[1];
+  if (start < 0) {
+    throw new Error('脱敏数据: start index cannot be negative');
+  }
+  var adjustedEnd = Math.min(end, input.length - 1);
+  if (start >= input.length) {
+    return '';
+  }
+  var regexPattern = "^(.{".concat(start, "})(.{").concat(adjustedEnd - start + 1, "})(.*)$");
+  var regex = new RegExp(regexPattern);
+  var maskedValue = input.replace(regex, "$1".concat('*'.repeat(adjustedEnd - start + 1), "$3"));
+  return maskedValue;
+};
 var _default = exports.default = {
   /** 年月日 */
-  date: function date(_ref3) {
-    var type = _ref3.type,
-      toISOString = _ref3.toISOString,
-      toCSTString = _ref3.toCSTString,
-      mode = _ref3.mode;
+  date: function date(_ref5) {
+    var type = _ref5.type,
+      toISOString = _ref5.toISOString,
+      toCSTString = _ref5.toCSTString,
+      mode = _ref5.mode;
     return dateTransform({
       type: type,
       _valueType: 'date',
@@ -211,11 +230,11 @@ var _default = exports.default = {
     });
   },
   /** 年月日 时分秒 */
-  dateTime: function dateTime(_ref4) {
-    var type = _ref4.type,
-      toISOString = _ref4.toISOString,
-      toCSTString = _ref4.toCSTString,
-      mode = _ref4.mode;
+  dateTime: function dateTime(_ref6) {
+    var type = _ref6.type,
+      toISOString = _ref6.toISOString,
+      toCSTString = _ref6.toCSTString,
+      mode = _ref6.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateTime',
@@ -225,11 +244,11 @@ var _default = exports.default = {
     });
   },
   /** 年月日 00:00:00 */
-  dateStartTime: function dateStartTime(_ref5) {
-    var type = _ref5.type,
-      toISOString = _ref5.toISOString,
-      toCSTString = _ref5.toCSTString,
-      mode = _ref5.mode;
+  dateStartTime: function dateStartTime(_ref7) {
+    var type = _ref7.type,
+      toISOString = _ref7.toISOString,
+      toCSTString = _ref7.toCSTString,
+      mode = _ref7.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateStartTime',
@@ -239,11 +258,11 @@ var _default = exports.default = {
     });
   },
   /** 年月日 23:59:59 */
-  dateEndTime: function dateEndTime(_ref6) {
-    var type = _ref6.type,
-      toISOString = _ref6.toISOString,
-      toCSTString = _ref6.toCSTString,
-      mode = _ref6.mode;
+  dateEndTime: function dateEndTime(_ref8) {
+    var type = _ref8.type,
+      toISOString = _ref8.toISOString,
+      toCSTString = _ref8.toCSTString,
+      mode = _ref8.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateEndTime',
@@ -253,11 +272,11 @@ var _default = exports.default = {
     });
   },
   /** 年月日 00:00:00 ~ 年月日 23:59:59 */
-  dateStartEndTime: function dateStartEndTime(_ref7) {
-    var type = _ref7.type,
-      toISOString = _ref7.toISOString,
-      toCSTString = _ref7.toCSTString,
-      mode = _ref7.mode;
+  dateStartEndTime: function dateStartEndTime(_ref9) {
+    var type = _ref9.type,
+      toISOString = _ref9.toISOString,
+      toCSTString = _ref9.toCSTString,
+      mode = _ref9.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateStartEndTime',
@@ -267,9 +286,9 @@ var _default = exports.default = {
     });
   },
   /** 百分比 */
-  percentage: function percentage(_ref8) {
-    var type = _ref8.type,
-      valueType = _ref8.valueType;
+  percentage: function percentage(_ref10) {
+    var type = _ref10.type,
+      valueType = _ref10.valueType;
     return transformRatio({
       type: type,
       valueType: valueType,
@@ -277,9 +296,9 @@ var _default = exports.default = {
     });
   },
   /** 千分比 */
-  permillage: function permillage(_ref9) {
-    var type = _ref9.type,
-      valueType = _ref9.valueType;
+  permillage: function permillage(_ref11) {
+    var type = _ref11.type,
+      valueType = _ref11.valueType;
     return transformRatio({
       type: type,
       valueType: valueType,
@@ -287,8 +306,25 @@ var _default = exports.default = {
     });
   },
   /**  开关 YN转换 */
-  switch: function _switch(_ref10) {
-    var switchValue = _ref10.switchValue;
+  switch: function _switch(_ref12) {
+    var switchValue = _ref12.switchValue;
     return switchTransform(switchValue);
+  },
+  /**  脱敏 转换 */
+  desensitization: function desensitization(_ref13) {
+    var _desensitization = _ref13.desensitization;
+    return {
+      getValueProps: function getValueProps(value) {
+        try {
+          return {
+            value: maskStringRangeWithRegex(value, _desensitization)
+          };
+        } catch (error) {
+          return {
+            value: value
+          }; // 如果发生错误，返回原始值
+        }
+      }
+    };
   }
 };

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

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

package/lib/ProTable/components/RenderColumn/index.d.ts

@@ -15,6 +15,8 @@ interface Props {
     isChanged?: boolean;
     /** 新增单元格字段 */
     isAddCell?: boolean;
+    /** 表格透传下来的scroll配置 */
+    scroll?: any;
 }
 declare const RenderColumn: FC<Props>;
 export default RenderColumn;

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

@@ -31,7 +31,8 @@ var RenderColumn = function RenderColumn(props) {
     _props$toolTipProps = props.toolTipProps,
     toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps,
     minWidth = props.minWidth,
-    isInNewRowFlag = props.isInNewRowFlag;
+    isInNewRowFlag = props.isInNewRowFlag,
+    scroll = props.scroll;
   var _useSetState = (0, _ahooks.useSetState)({
       tooltip: false
     }),
@@ -45,8 +46,9 @@ var RenderColumn = function RenderColumn(props) {
   // 比对场景走的逻辑
   if (!isInNewRowFlag && (0, _lodash.isBoolean)(props === null || props === void 0 ? void 0 : props.isChanged)) {
     var renderNode = value ? node : '-';
+    var isXMaxContent = (scroll === null || scroll === void 0 ? void 0 : scroll.x) === 'max-content';
     if (ellipsis || (props === null || props === void 0 ? void 0 : props.isChanged)) {
-      renderNode = (0, _jsxRuntime.jsx)(Text, {
+      renderNode = !isXMaxContent ? (0, _jsxRuntime.jsx)(Text, {
         style: {
           width: currentValue === '-' ? 32.5 : width,
           minWidth: minWidth
@@ -55,6 +57,12 @@ var RenderColumn = function RenderColumn(props) {
           tooltip: false
         },
         children: ellipsis ? currentValue : renderNode
+      }) : (0, _jsxRuntime.jsx)("div", {
+        style: {
+          minWidth: minWidth,
+          width: width
+        },
+        children: ellipsis ? currentValue : renderNode
       });
       if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
         return renderNode;

package/lib/ProTable/propsType.d.ts

@@ -46,6 +46,8 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     viewRender?: ({ value, record, index, originalValue, originalRecord, }: any) => 'same' | 'changed' | 'add' | undefined;
     isChanged?: boolean | null;
     children?: ProTableColumn[];
+    /** table透传下来的scroll配置 */
+    scroll?: any;
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.9.8-beta.1",
+  "version": "3.9.8-beta.3",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",