@zat-design/sisyphus-react 3.9.8-beta.5 → 3.9.8-beta.7

package/.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "kisstkondoros.vscode-codemetrics"
+    ]
+}

package/dist/index.esm.css

@@ -915,11 +915,6 @@
   background: #fff;
   letter-spacing: 2px;
 }
-.pro-header .pro-header-describe .ant-space .pro-header-describe-value .pro-header-describe-items.pro-header-describe-items-more .pro-header-tag {
-  padding: 0;
-  background: transparent !important;
-  color: #333;
-}
 .pro-header .pro-header-copy {
   display: -webkit-box;
   display: -webkit-flex;

package/dist/less.esm.css

@@ -915,11 +915,6 @@
   background: #fff;
   letter-spacing: 2px;
 }
-.pro-header .pro-header-describe .ant-space .pro-header-describe-value .pro-header-describe-items.pro-header-describe-items-more .pro-header-tag {
-  padding: 0;
-  background: transparent !important;
-  color: #333;
-}
 .pro-header .pro-header-copy {
   display: -webkit-box;
   display: -webkit-flex;

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

@@ -6,11 +6,11 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "onDiff", "className", "trim", "confirm", "dependencies"];
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "onDiff", "className", "trim", "confirm", "dependencies", "desensitization"];
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
-import React, { useCallback, useEffect } from 'react';
+import React, { useEffect } from 'react';
 import classNames from 'classnames';
 import { cloneDeep, isEqual, debounce, omit, isFunction } from 'lodash';
 import valueTypeMap from '../../../ProForm/utils/valueType';
@@ -57,6 +57,7 @@ var RenderField = function RenderField(_ref) {
     trim = column.trim,
     confirm = column.confirm,
     dependencies = column.dependencies,
+    desensitization = column.desensitization,
     resetProps = _objectWithoutProperties(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -82,6 +83,7 @@ var RenderField = function RenderField(_ref) {
   var _required = required;
   var _valueType = valueType;
   var _disabled = false;
+  var _desensitization = desensitization || [];
   var isCell = mode === 'cell';
   if (isCell) {
     record['is-view'] = !isEqual(cellNamePath, cellName);
@@ -118,6 +120,9 @@ var RenderField = function RenderField(_ref) {
   if (isFunction(valueType)) {
     _valueType = valueType.apply(void 0, rowParams);
   }
+  if (isFunction(desensitization)) {
+    _desensitization = desensitization.apply(void 0, rowParams);
+  }
   // 获取最终的disabled
   _disabled = getDisabled({
     globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
@@ -189,21 +194,23 @@ var RenderField = function RenderField(_ref) {
    * 配置valueType时，基于formItem的normalize与getValueProps进行值类型转换
    * @returns {}
    */
-  var valueTypeTransform = useCallback(function () {
-    var _fieldProps3;
-    // 不存在valueType返回空
-    if (!_valueType) {
-      return {};
-    }
+  var valueTypeTransform = function valueTypeTransform() {
+    var _fieldProps3, _desensitization2;
     // SwitchCheckbox默认YN, 兼容已有组件
     if (type === 'SwitchCheckbox') {
       _valueType = 'switch';
     }
     var params = _objectSpread(_objectSpread({}, column), {}, {
-      mode: (_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.mode
+      mode: (_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.mode,
+      desensitization: _desensitization
     });
+    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) : {};
-  }, [_valueType]);
+  };
   if ((_names = names) === null || _names === void 0 ? void 0 : _names.length) {
     // 支持names配置，临时生成对应的formItem，用来存储单个对应的值
     names = names.map(function (key) {
@@ -517,6 +524,7 @@ var RenderField = function RenderField(_ref) {
     onBlur: _onblur,
     index: index,
     confirm: confirm,
+    desensitization: _desensitization,
     otherProps: {
       form: form,
       names: names,
@@ -525,7 +533,8 @@ var RenderField = function RenderField(_ref) {
       listName: cellName,
       viewEmpty: viewEmpty,
       valueType: _valueType,
-      isView: isView
+      isView: isView,
+      desensitizationKey: otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey
     }
   });
   componentProps = omit(componentProps, ['onFieldChange', 'namePath', 'index']);

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

@@ -11,7 +11,7 @@ import { useCallback, useMemo, useState } from 'react';
 import { useRequest, useSetState, useDeepCompareEffect } from 'ahooks';
 import { pickBy, isObject, merge, set, isEqual } from 'lodash';
 import { defaultPage } from '../index';
-import { isListResult } from '../utils';
+import { isListResult, removeEmptyKeys } from '../utils';
 import locale, { formatMessage } from '../../locale';
 var useDefaultOptions = function useDefaultOptions(options) {
   var _useState = useState((options === null || options === void 0 ? void 0 : options.page) || defaultPage),
@@ -219,16 +219,17 @@ function useAntdTable(service, options, useRequestOptions) {
       pageNum: 1,
       pageSize: page.pageSize
     };
+    var _values = removeEmptyKeys(values);
     onPageChange(newPage);
     setState({
-      searchValues: values,
+      searchValues: _values,
       allSelected: false,
       selectedRecords: [],
       selectedRowKeys: []
     });
     run(getTransformParams(_objectSpread(_objectSpread({
       page: newPage
-    }, extraFilter), values)));
+    }, extraFilter), _values)));
   }, [extraFilter, page.pageSize, run, getTransformParams]);
   var resetParams = useCallback(function () {
     var page = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initPage;

package/es/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/es/ProTable/utils/index.js

@@ -1,3 +1,4 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { get, isEqual } from 'lodash';
 import { validate } from '@zat-design/utils';
 var isEmpty = validate.isEmpty;
@@ -70,4 +71,18 @@ export var 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 */
+export var removeEmptyKeys = function removeEmptyKeys(obj) {
+  // 使用 Object.entries() 将对象转换为键值对数组
+  var entries = Object.entries(obj);
+  // 过滤掉值为 null, undefined, 或 '' 的键值对
+  var filteredEntries = entries.filter(function (_ref2) {
+    var _ref3 = _slicedToArray(_ref2, 2),
+      key = _ref3[0],
+      value = _ref3[1];
+    return !isEmpty(value);
+  });
+  // 使用 Object.fromEntries() 将过滤后的键值对数组转换回对象
+  return Object.fromEntries(filteredEntries);
 };

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

@@ -30,7 +30,7 @@ var _utils = require("../../../ProForm/utils");
 var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
 var _getDefaultProps = require("../../utils/getDefaultProps");
 var _ListChangedWrapper = _interopRequireDefault(require("./ListChangedWrapper"));
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "onDiff", "className", "trim", "confirm", "dependencies"];
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "onDiff", "className", "trim", "confirm", "dependencies", "desensitization"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
@@ -64,6 +64,7 @@ var RenderField = function RenderField(_ref) {
     trim = column.trim,
     confirm = column.confirm,
     dependencies = column.dependencies,
+    desensitization = column.desensitization,
     resetProps = (0, _objectWithoutProperties2.default)(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -89,6 +90,7 @@ var RenderField = function RenderField(_ref) {
   var _required = required;
   var _valueType = valueType;
   var _disabled = false;
+  var _desensitization = desensitization || [];
   var isCell = mode === 'cell';
   if (isCell) {
     record['is-view'] = !(0, _lodash.isEqual)(cellNamePath, cellName);
@@ -125,6 +127,9 @@ var RenderField = function RenderField(_ref) {
   if ((0, _lodash.isFunction)(valueType)) {
     _valueType = valueType.apply(void 0, rowParams);
   }
+  if ((0, _lodash.isFunction)(desensitization)) {
+    _desensitization = desensitization.apply(void 0, rowParams);
+  }
   // 获取最终的disabled
   _disabled = (0, _tools.getDisabled)({
     globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
@@ -196,21 +201,23 @@ var RenderField = function RenderField(_ref) {
    * 配置valueType时，基于formItem的normalize与getValueProps进行值类型转换
    * @returns {}
    */
-  var valueTypeTransform = (0, _react.useCallback)(function () {
-    var _fieldProps3;
-    // 不存在valueType返回空
-    if (!_valueType) {
-      return {};
-    }
+  var valueTypeTransform = function valueTypeTransform() {
+    var _fieldProps3, _desensitization2;
     // SwitchCheckbox默认YN, 兼容已有组件
     if (type === 'SwitchCheckbox') {
       _valueType = 'switch';
     }
     var params = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
-      mode: (_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.mode
+      mode: (_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.mode,
+      desensitization: _desensitization
     });
+    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 (0, _lodash.isFunction)(_valueType2.default[_valueType]) ? _valueType2.default[_valueType](params) : {};
-  }, [_valueType]);
+  };
   if ((_names = names) === null || _names === void 0 ? void 0 : _names.length) {
     // 支持names配置，临时生成对应的formItem，用来存储单个对应的值
     names = names.map(function (key) {
@@ -524,6 +531,7 @@ var RenderField = function RenderField(_ref) {
     onBlur: _onblur,
     index: index,
     confirm: confirm,
+    desensitization: _desensitization,
     otherProps: {
       form: form,
       names: names,
@@ -532,7 +540,8 @@ var RenderField = function RenderField(_ref) {
       listName: cellName,
       viewEmpty: viewEmpty,
       valueType: _valueType,
-      isView: isView
+      isView: isView,
+      desensitizationKey: otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey
     }
   });
   componentProps = (0, _lodash.omit)(componentProps, ['onFieldChange', 'namePath', 'index']);

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/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/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.5",
+  "version": "3.9.8-beta.7",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",