@zat-design/sisyphus-react 4.0.12 → 4.0.13

package/es/ProEnum/hooks/useEnum.js

@@ -15,6 +15,9 @@ import { useProConfig } from "../../ProConfigProvider";
 import { getEnumData } from "../utils";
 var baseEnumStorage = (_ref = window.localStorage.getItem('zat-design-pro-component-cacheKey') && JSON.parse(window.localStorage.getItem('zat-design-pro-component-cacheKey'))) !== null && _ref !== void 0 ? _ref : null;
 
+// 模块级缓存，用于存储正在进行的 IndexedDB 读取 Promise，避免重复读取
+var indexedDBLoadingCache = new Map();
+
 /**
  * input code output [DataOption[],getEnumLabel]
  * @param code
@@ -59,7 +62,9 @@ function useEnum(codes, value, compose) {
     _ref2$fieldNames = _ref2.fieldNames,
     fieldNames = _ref2$fieldNames === void 0 ? {} : _ref2$fieldNames,
     _ref2$clear = _ref2.clear,
-    clear = _ref2$clear === void 0 ? true : _ref2$clear;
+    clear = _ref2$clear === void 0 ? true : _ref2$clear,
+    _ref2$dics = _ref2.dics,
+    dics = _ref2$dics === void 0 ? {} : _ref2$dics;
 
   // 存在子应用自管理枚举时，需要根据其指定的cacheKey进行缓存
   if (cacheKey !== 'zat-design-pro-component-cacheKey') {
@@ -68,6 +73,12 @@ function useEnum(codes, value, compose) {
 
   // 使用 state 来存储异步加载的数据
   var _useState = useState(() => {
+      // 优先使用全局状态中的 dics 数据（如果存在）
+      if (storage === 'indexedDB' && dics && Object.keys(dics).length > 0) {
+        return {
+          data: dics
+        };
+      }
       // 初始化：对于同步存储，直接返回数据；对于 IndexedDB，返回空数据
       if (storage === 'indexedDB') {
         return {
@@ -82,27 +93,76 @@ function useEnum(codes, value, compose) {
     enumData = _useState2[0],
     setEnumData = _useState2[1];
 
+  // 监听全局状态中的 dics 变化，优先使用 dics 数据
+  useEffect(() => {
+    if (storage === 'indexedDB' && dics && Object.keys(dics).length > 0) {
+      setEnumData(prevData => {
+        // 只有当 dics 有数据且与当前数据不同时才更新
+        if (JSON.stringify(dics) !== JSON.stringify(prevData === null || prevData === void 0 ? void 0 : prevData.data)) {
+          return {
+            data: dics
+          };
+        }
+        return prevData;
+      });
+    }
+  }, [storage, cacheKey, dics]);
+
   // 异步加载 IndexedDB 数据
   useEffect(() => {
     if (storage === 'indexedDB') {
-      Promise.resolve(getEnumData(storage, cacheKey, baseEnumStorage)).then(data => {
-        setEnumData(prevData => {
-          if (data && JSON.stringify(data) !== JSON.stringify(prevData)) {
-            baseEnumStorage = data;
-            return data || {
-              data: {}
-            };
-          }
-          return prevData;
-        });
-      }).catch(() => {
-        // 错误已在 getEnumData 中处理，这里只设置空数据
-        setEnumData({
-          data: {}
+      // 使用模块级缓存避免重复读取
+      var loadPromise = indexedDBLoadingCache.get(cacheKey);
+      if (!loadPromise) {
+        loadPromise = Promise.resolve(getEnumData(storage, cacheKey, baseEnumStorage)).then(data => {
+          // 读取完成后，从缓存中移除
+          indexedDBLoadingCache.delete(cacheKey);
+          return data;
+        }).catch(error => {
+          // 读取失败后，从缓存中移除
+          indexedDBLoadingCache.delete(cacheKey);
+          // 错误已在 getEnumData 中处理，这里返回空数据
+          return {
+            data: {}
+          };
         });
+        indexedDBLoadingCache.set(cacheKey, loadPromise);
+      }
+      loadPromise.then(data => {
+        // 如果数据为空或无效，且当前 enumData 也是空的，尝试重新读取
+        if ((!data || !data.data || Object.keys(data.data).length === 0) && (!enumData || !enumData.data || Object.keys(enumData.data).length === 0)) {
+          // 延迟重试，给 IndexedDB 一些时间
+          setTimeout(() => {
+            // 清除缓存，允许重新读取
+            indexedDBLoadingCache.delete(cacheKey);
+            Promise.resolve(getEnumData(storage, cacheKey, baseEnumStorage)).then(retryData => {
+              if (retryData && retryData.data && Object.keys(retryData.data).length > 0) {
+                setEnumData(prevData => {
+                  if (retryData && JSON.stringify(retryData) !== JSON.stringify(prevData)) {
+                    baseEnumStorage = retryData;
+                    return retryData;
+                  }
+                  return prevData;
+                });
+              }
+            }).catch(() => {
+              // 重试失败，保持空数据
+            });
+          }, 100);
+        } else {
+          setEnumData(prevData => {
+            if (data && JSON.stringify(data) !== JSON.stringify(prevData)) {
+              baseEnumStorage = data;
+              return data || {
+                data: {}
+              };
+            }
+            return prevData;
+          });
+        }
       });
     }
-  }, [storage, cacheKey]);
+  }, [storage, cacheKey, enumData]);
   var catchData = storage === 'indexedDB' ? enumData : getEnumData(storage, cacheKey, baseEnumStorage);
 
   // 默认枚举缓存数据（仅同步存储）

package/es/ProEnum/propsType.d.ts

@@ -79,7 +79,12 @@ export interface ProEnumConfigType {
      * @description 字段别名
      * @default { label: 'label', value: 'value', children: 'children' }
      */
-    fieldNames?: Record<'label' | 'value' | 'children', string>;
+    fieldNames?: {
+        label?: string;
+        value?: string;
+        children?: string;
+        [key: string]: string | undefined;
+    };
     /**
      * @description 缓存的key、默认 zat-design-pro-component-cacheKey
      * @default "zat-design-pro-component-cacheKey"

package/es/ProEnum/utils/index.js

@@ -376,10 +376,12 @@ export function cacheFieldNames(fieldNames, dataSource) {
     restFieldNames = _objectWithoutProperties(fieldNames, _excluded);
   var result = {};
   Object.keys(restFieldNames).forEach(key => {
-    if (![undefined, null].includes(dataSource[restFieldNames[key]])) {
-      result[key] = dataSource[restFieldNames[key]];
-    } else {
-      result[key] = dataSource[key];
+    var sourceKey = restFieldNames[key];
+    var sourceVal = dataSource[sourceKey];
+    var fallbackVal = dataSource[key];
+    var val = ![undefined, null, ''].includes(sourceVal) ? sourceVal : fallbackVal;
+    if (![undefined, null, ''].includes(val)) {
+      result[key] = val;
     }
   });
   // 递归去对数据进行清洗

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

@@ -76,28 +76,28 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     show?: boolean | ReactiveFunction<any, boolean>;
     component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
     children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
+    isView?: boolean;
     id?: string;
     prefixCls?: string;
     className?: string;
     style?: React.CSSProperties;
     rootClassName?: string;
-    status?: "" | "warning" | "error" | "success" | "validating";
-    isView?: boolean;
-    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
     hidden?: boolean;
     onReset?: () => void;
+    status?: "" | "warning" | "error" | "success" | "validating";
     vertical?: boolean;
+    validateTrigger?: string | false | string[];
+    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
     desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
-    trim?: boolean;
-    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
+    valueType?: import("../../../render/propsType").ProFormValueType;
     colon?: boolean;
     htmlFor?: string;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
     labelCol?: import("antd").ColProps;
     getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
+    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
     trigger?: string;
-    validateTrigger?: string | false | string[];
     validateDebounce?: number;
     valuePropName?: string;
     messageVariables?: Record<string, string>;
@@ -115,8 +115,6 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     wrapperCol?: import("antd").ColProps;
     help?: React.ReactNode;
     fieldId?: string;
-    toCSTString?: boolean;
-    valueType?: import("../../../render/propsType").ProFormValueType;
     switchValue?: [any, any];
     viewRender?: (value: any, record: any, { form, index, namePath, }: {
         [key: string]: any;
@@ -124,8 +122,10 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
         index?: number;
     }) => string | React.ReactElement<any, any>;
     viewType?: import("../../../render/propsType").ViewType;
+    trim?: boolean;
     upperCase?: boolean;
     toISOString?: boolean;
+    toCSTString?: boolean;
     clearNotShow?: boolean;
     name: any;
     dependencies: any[];
@@ -141,7 +141,7 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
  * 创建组件属性
  */
 export declare const createComponentProps: (column: FlexibleGroupColumnType, formItemProps: any) => {
-    componentProps: import("lodash").Omit<any, "toCSTString" | "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "clearNotShow" | "precision">;
+    componentProps: import("lodash").Omit<any, "precision" | "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;

package/lib/ProEnum/hooks/useEnum.js

@@ -21,6 +21,9 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var baseEnumStorage = (_ref = window.localStorage.getItem('zat-design-pro-component-cacheKey') && JSON.parse(window.localStorage.getItem('zat-design-pro-component-cacheKey'))) !== null && _ref !== void 0 ? _ref : null;
 
+// 模块级缓存，用于存储正在进行的 IndexedDB 读取 Promise，避免重复读取
+var indexedDBLoadingCache = new Map();
+
 /**
  * input code output [DataOption[],getEnumLabel]
  * @param code
@@ -65,7 +68,9 @@ function useEnum(codes, value, compose) {
     _ref2$fieldNames = _ref2.fieldNames,
     fieldNames = _ref2$fieldNames === void 0 ? {} : _ref2$fieldNames,
     _ref2$clear = _ref2.clear,
-    clear = _ref2$clear === void 0 ? true : _ref2$clear;
+    clear = _ref2$clear === void 0 ? true : _ref2$clear,
+    _ref2$dics = _ref2.dics,
+    dics = _ref2$dics === void 0 ? {} : _ref2$dics;
 
   // 存在子应用自管理枚举时，需要根据其指定的cacheKey进行缓存
   if (cacheKey !== 'zat-design-pro-component-cacheKey') {
@@ -74,6 +79,12 @@ function useEnum(codes, value, compose) {
 
   // 使用 state 来存储异步加载的数据
   var _useState = (0, _react.useState)(() => {
+      // 优先使用全局状态中的 dics 数据（如果存在）
+      if (storage === 'indexedDB' && dics && Object.keys(dics).length > 0) {
+        return {
+          data: dics
+        };
+      }
       // 初始化：对于同步存储，直接返回数据；对于 IndexedDB，返回空数据
       if (storage === 'indexedDB') {
         return {
@@ -88,27 +99,76 @@ function useEnum(codes, value, compose) {
     enumData = _useState2[0],
     setEnumData = _useState2[1];
 
+  // 监听全局状态中的 dics 变化，优先使用 dics 数据
+  (0, _react.useEffect)(() => {
+    if (storage === 'indexedDB' && dics && Object.keys(dics).length > 0) {
+      setEnumData(prevData => {
+        // 只有当 dics 有数据且与当前数据不同时才更新
+        if (JSON.stringify(dics) !== JSON.stringify(prevData === null || prevData === void 0 ? void 0 : prevData.data)) {
+          return {
+            data: dics
+          };
+        }
+        return prevData;
+      });
+    }
+  }, [storage, cacheKey, dics]);
+
   // 异步加载 IndexedDB 数据
   (0, _react.useEffect)(() => {
     if (storage === 'indexedDB') {
-      Promise.resolve((0, _utils.getEnumData)(storage, cacheKey, baseEnumStorage)).then(data => {
-        setEnumData(prevData => {
-          if (data && JSON.stringify(data) !== JSON.stringify(prevData)) {
-            baseEnumStorage = data;
-            return data || {
-              data: {}
-            };
-          }
-          return prevData;
-        });
-      }).catch(() => {
-        // 错误已在 getEnumData 中处理，这里只设置空数据
-        setEnumData({
-          data: {}
+      // 使用模块级缓存避免重复读取
+      var loadPromise = indexedDBLoadingCache.get(cacheKey);
+      if (!loadPromise) {
+        loadPromise = Promise.resolve((0, _utils.getEnumData)(storage, cacheKey, baseEnumStorage)).then(data => {
+          // 读取完成后，从缓存中移除
+          indexedDBLoadingCache.delete(cacheKey);
+          return data;
+        }).catch(error => {
+          // 读取失败后，从缓存中移除
+          indexedDBLoadingCache.delete(cacheKey);
+          // 错误已在 getEnumData 中处理，这里返回空数据
+          return {
+            data: {}
+          };
         });
+        indexedDBLoadingCache.set(cacheKey, loadPromise);
+      }
+      loadPromise.then(data => {
+        // 如果数据为空或无效，且当前 enumData 也是空的，尝试重新读取
+        if ((!data || !data.data || Object.keys(data.data).length === 0) && (!enumData || !enumData.data || Object.keys(enumData.data).length === 0)) {
+          // 延迟重试，给 IndexedDB 一些时间
+          setTimeout(() => {
+            // 清除缓存，允许重新读取
+            indexedDBLoadingCache.delete(cacheKey);
+            Promise.resolve((0, _utils.getEnumData)(storage, cacheKey, baseEnumStorage)).then(retryData => {
+              if (retryData && retryData.data && Object.keys(retryData.data).length > 0) {
+                setEnumData(prevData => {
+                  if (retryData && JSON.stringify(retryData) !== JSON.stringify(prevData)) {
+                    baseEnumStorage = retryData;
+                    return retryData;
+                  }
+                  return prevData;
+                });
+              }
+            }).catch(() => {
+              // 重试失败，保持空数据
+            });
+          }, 100);
+        } else {
+          setEnumData(prevData => {
+            if (data && JSON.stringify(data) !== JSON.stringify(prevData)) {
+              baseEnumStorage = data;
+              return data || {
+                data: {}
+              };
+            }
+            return prevData;
+          });
+        }
       });
     }
-  }, [storage, cacheKey]);
+  }, [storage, cacheKey, enumData]);
   var catchData = storage === 'indexedDB' ? enumData : (0, _utils.getEnumData)(storage, cacheKey, baseEnumStorage);
 
   // 默认枚举缓存数据（仅同步存储）

package/lib/ProEnum/propsType.d.ts

@@ -79,7 +79,12 @@ export interface ProEnumConfigType {
      * @description 字段别名
      * @default { label: 'label', value: 'value', children: 'children' }
      */
-    fieldNames?: Record<'label' | 'value' | 'children', string>;
+    fieldNames?: {
+        label?: string;
+        value?: string;
+        children?: string;
+        [key: string]: string | undefined;
+    };
     /**
      * @description 缓存的key、默认 zat-design-pro-component-cacheKey
      * @default "zat-design-pro-component-cacheKey"

package/lib/ProEnum/utils/index.js

@@ -388,10 +388,12 @@ function cacheFieldNames(fieldNames, dataSource) {
     restFieldNames = _objectWithoutProperties(fieldNames, _excluded);
   var result = {};
   Object.keys(restFieldNames).forEach(key => {
-    if (![undefined, null].includes(dataSource[restFieldNames[key]])) {
-      result[key] = dataSource[restFieldNames[key]];
-    } else {
-      result[key] = dataSource[key];
+    var sourceKey = restFieldNames[key];
+    var sourceVal = dataSource[sourceKey];
+    var fallbackVal = dataSource[key];
+    var val = ![undefined, null, ''].includes(sourceVal) ? sourceVal : fallbackVal;
+    if (![undefined, null, ''].includes(val)) {
+      result[key] = val;
     }
   });
   // 递归去对数据进行清洗

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

@@ -76,28 +76,28 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     show?: boolean | ReactiveFunction<any, boolean>;
     component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
     children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
+    isView?: boolean;
     id?: string;
     prefixCls?: string;
     className?: string;
     style?: React.CSSProperties;
     rootClassName?: string;
-    status?: "" | "warning" | "error" | "success" | "validating";
-    isView?: boolean;
-    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
     hidden?: boolean;
     onReset?: () => void;
+    status?: "" | "warning" | "error" | "success" | "validating";
     vertical?: boolean;
+    validateTrigger?: string | false | string[];
+    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
     desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
-    trim?: boolean;
-    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
+    valueType?: import("../../../render/propsType").ProFormValueType;
     colon?: boolean;
     htmlFor?: string;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
     labelCol?: import("antd").ColProps;
     getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
+    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
     trigger?: string;
-    validateTrigger?: string | false | string[];
     validateDebounce?: number;
     valuePropName?: string;
     messageVariables?: Record<string, string>;
@@ -115,8 +115,6 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     wrapperCol?: import("antd").ColProps;
     help?: React.ReactNode;
     fieldId?: string;
-    toCSTString?: boolean;
-    valueType?: import("../../../render/propsType").ProFormValueType;
     switchValue?: [any, any];
     viewRender?: (value: any, record: any, { form, index, namePath, }: {
         [key: string]: any;
@@ -124,8 +122,10 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
         index?: number;
     }) => string | React.ReactElement<any, any>;
     viewType?: import("../../../render/propsType").ViewType;
+    trim?: boolean;
     upperCase?: boolean;
     toISOString?: boolean;
+    toCSTString?: boolean;
     clearNotShow?: boolean;
     name: any;
     dependencies: any[];
@@ -141,7 +141,7 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
  * 创建组件属性
  */
 export declare const createComponentProps: (column: FlexibleGroupColumnType, formItemProps: any) => {
-    componentProps: import("lodash").Omit<any, "toCSTString" | "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "clearNotShow" | "precision">;
+    componentProps: import("lodash").Omit<any, "precision" | "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;

package/package.json

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