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

package/lib/ProForm/utils/valueType.js

@@ -4,7 +4,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.maskStringRangeWithRegex = exports.default = void 0;
+var _readOnlyError2 = _interopRequireDefault(require("@babel/runtime/helpers/readOnlyError"));
+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 +197,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 +231,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 +245,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 +259,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 +273,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 +287,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 +297,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 +307,54 @@ 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(props) {
+    var desensitization = props.desensitization,
+      type = props.type,
+      mode = props.mode,
+      names = props.names;
+    // 判断是否是地址控件，并带地址详情场景
+    if (type === 'ProCascader' && mode === 'address' && (names === null || names === void 0 ? void 0 : names.length) === 4) {
+      return {
+        getValueProps: function getValueProps(value) {
+          try {
+            if (value === null || value === void 0 ? void 0 : value.length) {
+              var _value = (0, _slicedToArray2.default)(value, 4),
+                province = _value[0],
+                city = _value[1],
+                county = _value[2],
+                address = _value[3];
+              return {
+                value: [province, city, county, maskStringRangeWithRegex(address, desensitization)]
+              };
+            }
+            return {
+              value: value
+            };
+          } catch (error) {
+            return {
+              value: value
+            }; // 如果发生错误，返回原始值
+          }
+        }
+      };
+    }
+    return {
+      getValueProps: function getValueProps(value) {
+        try {
+          return {
+            value: maskStringRangeWithRegex(value, desensitization)
+          };
+        } catch (error) {
+          return {
+            value: value
+          }; // 如果发生错误，返回原始值
+        }
+      }
+    };
   }
 };

package/lib/ProLayout/components/ProHeader/style/index.less

@@ -78,14 +78,6 @@
             background: #fff;
             letter-spacing: 2px;
           }
-          &.pro-header-describe-items-more{
-            .pro-header-tag{
-              padding: 0;
-              background: transparent !important;
-              color: #333 ;
-            }
-
-          }
         }
       }
     }

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/hooks/useAntdTable.js

@@ -226,16 +226,17 @@ function useAntdTable(service, options, useRequestOptions) {
       pageNum: 1,
       pageSize: page.pageSize
     };
+    var _values = (0, _utils.removeEmptyKeys)(values);
     onPageChange(newPage);
     setState({
-      searchValues: values,
+      searchValues: _values,
       allSelected: false,
       selectedRecords: [],
       selectedRowKeys: []
     });
     run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
       page: newPage
-    }, extraFilter), values)));
+    }, extraFilter), _values)));
   }, [extraFilter, page.pageSize, run, getTransformParams]);
   var resetParams = (0, _react.useCallback)(function () {
     var page = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initPage;

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/lib/ProTable/utils/index.d.ts

@@ -29,3 +29,7 @@ export declare const isListResult: (data: {
     [key: string]: any;
 }) => boolean;
 export declare const getRowKey: (rowKey: any, record: any) => any;
+/** 移除对象中的 null , undefined, '' 的key */
+export declare const removeEmptyKeys: (obj: any) => {
+    [k: string]: unknown;
+};

package/lib/ProTable/utils/index.js

@@ -1,9 +1,11 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isListResult = exports.getRowKey = exports.getOriginalValue = exports.getDecimalDigits = exports.getColumnDataIndex = void 0;
+exports.removeEmptyKeys = exports.isListResult = exports.getRowKey = exports.getOriginalValue = exports.getDecimalDigits = exports.getColumnDataIndex = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _lodash = require("lodash");
 var _utils = require("@zat-design/utils");
 var isEmpty = _utils.validate.isEmpty;
@@ -76,4 +78,18 @@ var getRowKey = exports.getRowKey = function getRowKey(rowKey, record) {
     key = (_ref = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref !== void 0 ? _ref : key;
   }
   return key;
+};
+/** 移除对象中的 null , undefined, '' 的key */
+var removeEmptyKeys = exports.removeEmptyKeys = function removeEmptyKeys(obj) {
+  // 使用 Object.entries() 将对象转换为键值对数组
+  var entries = Object.entries(obj);
+  // 过滤掉值为 null, undefined, 或 '' 的键值对
+  var filteredEntries = entries.filter(function (_ref2) {
+    var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
+      key = _ref3[0],
+      value = _ref3[1];
+    return !isEmpty(value);
+  });
+  // 使用 Object.fromEntries() 将过滤后的键值对数组转换回对象
+  return Object.fromEntries(filteredEntries);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.9.8-beta.1",
+  "version": "3.9.8-beta.11",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -9,6 +9,7 @@
     "analyze": "ANALYZE=1 dumi build",
     "build": "npm run build-lib && npm run build-es && npm run build-dist",
     "build-dist": "father-build",
+    "build-umd": "cross-env BUILD_TYPE=umd father-build",
     "build-es": "cross-env BUILD_TYPE=es father-build",
     "build-lib": "father-build && cross-env BUILD_TYPE=lib father-build",
     "docs": "dumi build",