@zat-design/sisyphus-react 3.13.18 → 3.13.19-beta.2

package/lib/ProEnum/hooks/useFrequentEnumRequest.js

@@ -0,0 +1,85 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _ahooks = require("ahooks");
+var _frequentEnum = require("../utils/frequentEnum");
+var useFrequentEnumRequest = function useFrequentEnumRequest(props, dispatch) {
+  var frequentEnums = props.frequentEnums,
+    fieldNames = props.fieldNames,
+    _props$clear = props.clear,
+    clear = _props$clear === void 0 ? true : _props$clear,
+    _props$storage = props.storage,
+    storage = _props$storage === void 0 ? 'localStorage' : _props$storage,
+    _props$cacheKey = props.cacheKey,
+    cacheKey = _props$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _props$cacheKey,
+    dics = props.dics,
+    dataSource = props.dataSource;
+  var frequentEnumRes = (0, _ahooks.useRequest)((frequentEnums === null || frequentEnums === void 0 ? void 0 : frequentEnums.service) || function () {
+    return Promise.resolve({
+      data: {}
+    });
+  }, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    manual: true,
+    cacheTime: 0,
+    staleTime: 0
+  }, frequentEnums === null || frequentEnums === void 0 ? void 0 : frequentEnums.options), {}, {
+    onSuccess: function () {
+      var _onSuccess = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(res) {
+        var _response;
+        var response, enumData, updatedCacheData;
+        return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              response = res; // 使用frequentEnums的独立transformResponse处理
+              if ((frequentEnums === null || frequentEnums === void 0 ? void 0 : frequentEnums.transformResponse) && typeof frequentEnums.transformResponse === 'function') {
+                response = frequentEnums.transformResponse(res);
+              }
+              // 确保response.data存在，如果不存在则使用response本身
+              enumData = ((_response = response) === null || _response === void 0 ? void 0 : _response.data) || response; // 替换缓存中的指定枚举
+              updatedCacheData = (0, _frequentEnum.replaceFrequentEnumCache)({
+                storage: storage,
+                cacheKey: cacheKey,
+                enums: (frequentEnums === null || frequentEnums === void 0 ? void 0 : frequentEnums.enums) || [],
+                newData: enumData,
+                fieldNames: fieldNames,
+                clear: clear
+              }); // 同步数据到全局状态
+              dispatch({
+                type: 'setProEnumDic',
+                payload: (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, dics), dataSource), updatedCacheData.data)
+              });
+            case 5:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function onSuccess(_x) {
+        return _onSuccess.apply(this, arguments);
+      }
+      return onSuccess;
+    }(),
+    onError: function onError(error) {
+      console.warn('ProEnum: Frequent enum request failed:', error);
+    }
+  }));
+  // 处理频繁枚举请求
+  (0, _ahooks.useDeepCompareEffect)(function () {
+    var _frequentEnums$enums;
+    if (frequentEnums && (frequentEnums === null || frequentEnums === void 0 ? void 0 : frequentEnums.service) && (frequentEnums === null || frequentEnums === void 0 ? void 0 : (_frequentEnums$enums = frequentEnums.enums) === null || _frequentEnums$enums === void 0 ? void 0 : _frequentEnums$enums.length)) {
+      var _ref = (frequentEnums === null || frequentEnums === void 0 ? void 0 : frequentEnums.options) || {},
+        defaultParams = _ref.defaultParams;
+      var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
+      frequentEnumRes.run(params);
+    }
+  }, [frequentEnums === null || frequentEnums === void 0 ? void 0 : frequentEnums.options]);
+  return frequentEnumRes;
+};
+var _default = exports.default = useFrequentEnumRequest;

package/lib/ProEnum/index.js

@@ -40,7 +40,7 @@ var _locale = _interopRequireDefault(require("../locale"));
 require("./style/index.less");
 var _useFieldProps2 = require("../ProForm/utils/useFieldProps");
 var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component", "onChange", "transformResponse", "otherProps", "isView"],
-  _excluded2 = ["fieldNames", "clear", "cacheKey", "showCodeName"];
+  _excluded2 = ["fieldNames", "clear", "storage", "cacheKey", "showCodeName", "useRequest", "transformResponse"];
 var ProEnum = function ProEnum(props) {
   var _otherProps$isView, _enumProps$showCodeNa;
   var code = props.code,
@@ -64,10 +64,18 @@ var ProEnum = function ProEnum(props) {
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
     clear = _ref2$clear === void 0 ? true : _ref2$clear,
+    _ref2$storage = _ref2.storage,
+    storage = _ref2$storage === void 0 ? 'localStorage' : _ref2$storage,
     _ref2$cacheKey = _ref2.cacheKey,
     cacheKey = _ref2$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref2$cacheKey,
     showCodeName = _ref2.showCodeName,
+    configUseRequest = _ref2.useRequest,
+    configTransformResponse = _ref2.transformResponse,
     resProps = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
+  // 优先使用props中的配置，如果没有则使用全局配置
+  var finalUseRequest = useRequest || configUseRequest;
+  var finalTransformResponse = transformResponse || configTransformResponse;
+  var cacheData = (0, _utils.getEnumData)(storage, cacheKey);
   var _isView = isView !== undefined && isView !== null ? isView : (_otherProps$isView = otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView) !== null && _otherProps$isView !== void 0 ? _otherProps$isView : configIsView;
   enumProps.showCodeName = (_enumProps$showCodeNa = enumProps.showCodeName) !== null && _enumProps$showCodeNa !== void 0 ? _enumProps$showCodeNa : showCodeName;
   var label = 'label';
@@ -93,7 +101,7 @@ var ProEnum = function ProEnum(props) {
     fieldValue = 'value';
   }
   // 这种时候优先级最高、完全走自定义
-  if ((useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) && props.fieldNames) {
+  if ((finalUseRequest === null || finalUseRequest === void 0 ? void 0 : finalUseRequest.service) && props.fieldNames) {
     var _props$fieldNames5, _props$fieldNames6;
     if ((_props$fieldNames5 = props.fieldNames) === null || _props$fieldNames5 === void 0 ? void 0 : _props$fieldNames5.label) label = props.fieldNames.label;
     if ((_props$fieldNames6 = props.fieldNames) === null || _props$fieldNames6 === void 0 ? void 0 : _props$fieldNames6.value) fieldValue = props.fieldNames.value;
@@ -101,13 +109,13 @@ var ProEnum = function ProEnum(props) {
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProEnum'),
     _useProConfig$dics = _useProConfig.dics,
     dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
-  var _useRequestFunc = (0, _ahooks.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  var _useRequestFunc = (0, _ahooks.useRequest)(finalUseRequest === null || finalUseRequest === void 0 ? void 0 : finalUseRequest.service, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       manual: true,
       cacheTime: -1
-    }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
+    }, finalUseRequest === null || finalUseRequest === void 0 ? void 0 : finalUseRequest.options), {}, {
       onSuccess: function onSuccess(res) {
-        if (transformResponse && typeof transformResponse === 'function') {
-          var responseData = transformResponse(res);
+        if (finalTransformResponse && typeof finalTransformResponse === 'function') {
+          var responseData = finalTransformResponse(res);
           if ((0, _typeof2.default)(responseData) !== 'object') {
             var _locale$ProEnum;
             return _message2.default.error((_locale$ProEnum = _locale.default.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorMessage);
@@ -138,13 +146,14 @@ var ProEnum = function ProEnum(props) {
     run = _useRequestFunc.run;
   // 自定义请求
   (0, _ahooks.useDeepCompareEffect)(function () {
-    var _ref3 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
+    var _ref3 = (finalUseRequest === null || finalUseRequest === void 0 ? void 0 : finalUseRequest.options) || {},
       defaultParams = _ref3.defaultParams;
     var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
-    if (useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) {
+    // 如果缓存数据存在，则不请求
+    if ((finalUseRequest === null || finalUseRequest === void 0 ? void 0 : finalUseRequest.service) && (!Object.keys(cacheData).length || (cacheData === null || cacheData === void 0 ? void 0 : cacheData.data) && !Object.keys(cacheData === null || cacheData === void 0 ? void 0 : cacheData.data).length)) {
       run(params);
     }
-  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
+  }, [finalUseRequest === null || finalUseRequest === void 0 ? void 0 : finalUseRequest.options]);
   var enumLists = (0, _react.useMemo)(function () {
     var lists = [];
     if ((0, _isString2.default)(code)) {
@@ -157,14 +166,14 @@ var ProEnum = function ProEnum(props) {
       });
     }
     return lists;
-  }, [dics, code]);
+  }, [code, JSON.stringify(dics)]); // 添加JSON.stringify(dics)作为额外依赖项
   var renderComponent = function renderComponent() {
     var list = [];
     // 优先使用组件内部自己传入的数据源或者请求得到的数据
     list = (0, _cloneDeep2.default)(dataList && dataList.length ? dataList : enumLists);
     // 对数据进行一系列的过滤等操作
-    if (!(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) && transformResponse) {
-      list = transformResponse(list);
+    if (!(finalUseRequest === null || finalUseRequest === void 0 ? void 0 : finalUseRequest.service) && finalTransformResponse) {
+      list = finalTransformResponse(list);
       if (!Array.isArray(list)) {
         var _locale$ProEnum3;
         console.error((_locale$ProEnum3 = _locale.default.ProEnum) === null || _locale$ProEnum3 === void 0 ? void 0 : _locale$ProEnum3.errorArrayMessage);

package/lib/ProEnum/propsType.d.ts

@@ -27,6 +27,30 @@ export interface DataOptionType {
      */
     [key: string]: any;
 }
+/**
+ * @description 频繁变动的枚举配置
+ */
+export interface FrequentEnumConfig {
+    /**
+     * @description 需要替换的缓存枚举code列表
+     */
+    enums: string[];
+    /**
+     * @description 请求服务函数
+     */
+    service: Service<any, any>;
+    /**
+     * @description 请求选项配置
+     */
+    options?: Options<any, any>;
+    /**
+     * @description 对频繁枚举返回数据进行格式化（独立于全局transformResponse）
+     * @param data 后台返回的数据
+     * @returns 格式化后的枚举数据
+     * @default -
+     */
+    transformResponse?: (data: any) => Record<string, DataOptionType[]> | Promise<Record<string, DataOptionType[]>>;
+}
 /**
  * @description ProEnum配置类型
  */
@@ -108,6 +132,11 @@ export interface ProEnumConfigType {
             ignoreCodes?: string[];
         };
     };
+    /**
+     * @description 频繁变动的枚举配置
+     * @default -
+     */
+    frequentEnums?: FrequentEnumConfig;
     /**
      * @description 字典数据
      * @default {}

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

@@ -0,0 +1,40 @@
+import type { FrequentEnumConfig } from '../propsType';
+type StorageType = 'localStorage' | 'sessionStorage';
+/**
+ * 替换频繁枚举缓存数据的参数接口
+ */
+export interface ReplaceFrequentEnumCacheParams {
+    /** 存储类型 */
+    storage: StorageType;
+    /** 缓存key */
+    cacheKey: string;
+    /** 需要替换的枚举code列表 */
+    enums: string[];
+    /** 新的枚举数据 */
+    newData: any;
+    /** 字段映射 */
+    fieldNames: any;
+    /** 是否清洗数据 */
+    clear: boolean;
+}
+/**
+ * 替换频繁枚举缓存数据
+ * @param params 参数对象
+ * @returns 更新后的缓存数据
+ */
+export declare function replaceFrequentEnumCache(params: ReplaceFrequentEnumCacheParams): any;
+/**
+ * 验证频繁枚举配置
+ * @param config 频繁枚举配置
+ * @returns 是否有效
+ */
+export declare function validateFrequentEnumConfig(config: FrequentEnumConfig): boolean;
+/**
+ * 合并频繁枚举数据到全局状态
+ * @param cacheData 缓存数据
+ * @param dics 现有字典数据
+ * @param dataSource 数据源
+ * @returns 合并后的数据
+ */
+export declare function mergeFrequentEnumData(cacheData: any, dics: any, dataSource: any): any;
+export {};

package/lib/ProEnum/utils/frequentEnum.js

@@ -0,0 +1,88 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mergeFrequentEnumData = mergeFrequentEnumData;
+exports.replaceFrequentEnumCache = replaceFrequentEnumCache;
+exports.validateFrequentEnumConfig = validateFrequentEnumConfig;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _index = require("./index");
+/**
+ * 替换频繁枚举缓存数据
+ * @param params 参数对象
+ * @returns 更新后的缓存数据
+ */
+function replaceFrequentEnumCache(params) {
+  var _params$storage = params.storage,
+    storage = _params$storage === void 0 ? 'localStorage' : _params$storage,
+    _params$cacheKey = params.cacheKey,
+    cacheKey = _params$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _params$cacheKey,
+    _params$enums = params.enums,
+    enums = _params$enums === void 0 ? [] : _params$enums,
+    _params$newData = params.newData,
+    newData = _params$newData === void 0 ? {} : _params$newData,
+    _params$fieldNames = params.fieldNames,
+    fieldNames = _params$fieldNames === void 0 ? {
+      label: 'label',
+      value: 'value',
+      children: 'children'
+    } : _params$fieldNames,
+    _params$clear = params.clear,
+    clear = _params$clear === void 0 ? true : _params$clear;
+  // 参数验证
+  if (!storage || !cacheKey) {
+    console.warn('ProEnum: storage and cacheKey are required for replaceFrequentEnumCache');
+    return {
+      data: {}
+    };
+  }
+  if (!enums.length) {
+    console.warn('ProEnum: enums array is empty, no data to replace');
+    return {
+      data: {}
+    };
+  }
+  var cacheData = (0, _index.getEnumData)(storage, cacheKey) || {
+    data: {}
+  };
+  // 确保cacheData.data存在
+  if (!cacheData.data) {
+    cacheData.data = {};
+  }
+  // 只替换指定的枚举
+  enums.forEach(function (code) {
+    if (newData[code]) {
+      var processedData = newData[code];
+      // 应用数据清洗逻辑
+      if (clear && Array.isArray(processedData)) {
+        processedData = processedData.map(function (item) {
+          return (0, _index.cacheFieldNames)(fieldNames, item);
+        });
+      }
+      cacheData.data[code] = processedData;
+    }
+  });
+  (0, _index.setEnumData)(storage, cacheKey, cacheData);
+  return cacheData;
+}
+/**
+ * 验证频繁枚举配置
+ * @param config 频繁枚举配置
+ * @returns 是否有效
+ */
+function validateFrequentEnumConfig(config) {
+  var _config$enums;
+  return !!((config === null || config === void 0 ? void 0 : (_config$enums = config.enums) === null || _config$enums === void 0 ? void 0 : _config$enums.length) && (config === null || config === void 0 ? void 0 : config.service));
+}
+/**
+ * 合并频繁枚举数据到全局状态
+ * @param cacheData 缓存数据
+ * @param dics 现有字典数据
+ * @param dataSource 数据源
+ * @returns 合并后的数据
+ */
+function mergeFrequentEnumData(cacheData, dics, dataSource) {
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, dics), dataSource), cacheData.data);
+}

package/lib/ProForm/components/combination/ProNumberRange/style/index.less

@@ -2,6 +2,11 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-number-range {
+  display: block;
+  .@{ant-prefix}-space-compact {
+    display: block;
+  }
+
   .range-split {
     width: 32px !important;
     text-align: center !important;

package/lib/ProTree/components/ProTreeSelect/index.js

@@ -223,7 +223,6 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     if (fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.cacheKey) {
       if (transformResponse && typeof transformResponse === 'function') {
         var responseData = transformResponse(fetchFunction.data);
-        // debugger;
         var resultData = transferDataSource(responseData, showCodeName);
         setState({
           selectList: countChild(resultData),

package/package.json

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

package/tests/__mocks__/fileMock.js

@@ -1 +0,0 @@
-module.exports = 'test-file-stub';

package/tests/__mocks__/zatUtils.js

@@ -1,27 +0,0 @@
-// Mock @zat-design/utils
-module.exports = {
-  tools: {
-    isValidUrl: jest.fn(() => true),
-    formatCurrency: jest.fn((value) => `¥${value}`),
-    formatDate: jest.fn((date) => new Date(date).toLocaleDateString()),
-  },
-  transforms: {
-    transformDate: jest.fn((value, params) => {
-      if (!value) return '';
-      return new Date(value).toLocaleDateString();
-    }),
-    transformSwitch: jest.fn((value) => value ? '是' : '否'),
-    transformMoney: jest.fn((value) => `¥${value || 0}`),
-    transformPercent: jest.fn((value) => `${(value || 0) * 100}%`),
-  },
-  validate: {
-    isEmail: jest.fn((email) => /\S+@\S+\.\S+/.test(email)),
-    isPhone: jest.fn((phone) => /^1[3-9]\d{9}$/.test(phone)),
-    isIdCard: jest.fn(() => true),
-  },
-  validateNameMap: {
-    email: 'isEmail',
-    phone: 'isPhone',
-    idCard: 'isIdCard',
-  },
-};