@zat-design/sisyphus-react 4.5.9 → 4.5.10-beta.2

package/es/ProEnum/hooks/useEnumRequest.js

@@ -1,17 +1,27 @@
-import { useEffect, useMemo, useRef } from 'react';
-import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
-import { diffCode, getEnumData, setEnumData, removeEnumData, cacheFieldNames, cleanEnumResponse, baseCacheKey, baseStorage } from "../utils";
+import { useEffect, useMemo, useRef } from "react";
+import { useDeepCompareEffect, useRequest as useRequestFunc } from "ahooks";
+import {
+  diffCode,
+  getEnumData,
+  setEnumData,
+  removeEnumData,
+  cacheFieldNames,
+  cleanEnumResponse,
+  baseCacheKey,
+  baseStorage
+} from "../utils";
 import locale from "../../locale";
 import "../utils/eventCenter";
 const useEnumRequest = (props, dispatch) => {
+  var _a, _b;
   const {
     main = false,
     share = false,
     clear = true,
     fieldNames = {
-      label: 'label',
-      value: 'value',
-      children: 'children'
+      label: "label",
+      value: "value",
+      children: "children"
     },
     cacheKey = baseCacheKey,
     requestRefresh = false,
@@ -21,228 +31,196 @@ const useEnumRequest = (props, dispatch) => {
     transformResponse,
     dics = {}
   } = props || {};
-  if (typeof dataSource === 'object' && dataSource === null) {
-    throw new Error(locale?.ProEnum?.errorDataSource);
+  if (typeof dataSource === "object" && dataSource === null) {
+    throw new Error((_b = (_a = locale) == null ? void 0 : _a.ProEnum) == null ? void 0 : _b.errorDataSource);
   }
-  const logDebug = msg => {
+  const logDebug = (msg) => {
     if (props.debugger) {
-      console.warn('proEnum：', msg);
+      console.warn("proEnum：", msg);
     }
   };
-
-  // IndexedDB 缓存策略：包装 service，在 service 层面返回缓存数据，
-  // 而非跳过 run()。这样 enumRes.data/loading 正常变更，
-  // ProConfigProvider 的 onSuccess 回调能正常触发（修复白屏问题）。
   const fromCacheRef = useRef(null);
-  const originalService = useRequest?.service;
+  const errorReportedRef = useRef(false);
+  const originalService = useRequest == null ? void 0 : useRequest.service;
   const serviceForRequest = useMemo(() => {
-    if (!originalService || storage !== 'indexedDB') {
+    if (!originalService || storage !== "indexedDB") {
       return originalService;
     }
     return async (...args) => {
       if (!requestRefresh) {
         const cached = await Promise.resolve(getEnumData(storage, cacheKey));
-        if (cached?.data && Object.keys(cached.data).length > 0 && cached?.time && Date.now() - cached.time <= 6e4 * 60) {
+        if ((cached == null ? void 0 : cached.data) && Object.keys(cached.data).length > 0 && (cached == null ? void 0 : cached.time) && Date.now() - cached.time <= 6e4 * 60) {
           fromCacheRef.current = cached.data;
-          return {
-            status: 200,
-            data: cached.data
-          };
+          return { status: 200, data: cached.data };
         }
       }
       fromCacheRef.current = null;
       return originalService(...args);
     };
   }, [originalService, storage, requestRefresh, cacheKey]);
+  const reportBackgroundError = (error, params = []) => {
+    var _a2, _b2;
+    if (errorReportedRef.current) {
+      return;
+    }
+    errorReportedRef.current = true;
+    const normalizedError = error instanceof Error ? error : new Error(String(error));
+    (_b2 = (_a2 = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _a2.onError) == null ? void 0 : _b2.call(_a2, normalizedError, params);
+  };
   const enumRes = useRequestFunc(serviceForRequest, {
     manual: true,
     cacheKey,
     cacheTime: -1,
     staleTime: 6e4 * 60,
-    ...useRequest?.options,
-    setCache: async res => {
-      // 缓存命中时跳过 transformResponse 和重复处理，直接 dispatch
-      if (fromCacheRef.current) {
-        const cachedData = fromCacheRef.current;
-        const mergedPayload = {
-          ...dics,
-          ...cachedData,
-          ...dataSource
+    ...useRequest == null ? void 0 : useRequest.options,
+    onBefore: (params) => {
+      var _a2, _b2;
+      errorReportedRef.current = false;
+      (_b2 = (_a2 = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _a2.onBefore) == null ? void 0 : _b2.call(_a2, params);
+    },
+    onError: reportBackgroundError,
+    setCache: async (res) => {
+      var _a2, _b2, _c;
+      try {
+        if (fromCacheRef.current) {
+          const cachedData = fromCacheRef.current;
+          const mergedPayload2 = { ...dics, ...cachedData, ...dataSource };
+          dispatch({
+            type: "setProEnumDic",
+            payload: mergedPayload2
+          });
+          if (main) {
+            setTimeout(() => {
+              var _a3, _b3, _c2;
+              (_a3 = window == null ? void 0 : window.eventCenter) == null ? void 0 : _a3.publish("pro-enum-event", cachedData);
+              logDebug((_c2 = (_b3 = locale) == null ? void 0 : _b3.ProEnum) == null ? void 0 : _c2.mainInitByCache);
+            }, 1e4);
+          }
+          fromCacheRef.current = null;
+          return res;
+        }
+        let response = res.data;
+        if (transformResponse && typeof transformResponse === "function") {
+          response = await transformResponse(res.data);
+          if (typeof response !== "object" || response == null) {
+            throw new Error((_b2 = (_a2 = locale) == null ? void 0 : _a2.ProEnum) == null ? void 0 : _b2.errorMessage);
+          } else {
+            res.data = response;
+          }
+        }
+        if (typeof response !== "object" || response === null) {
+          throw Error("response enum data must be object");
+        }
+        if (Object.keys(response).length === 0) {
+          throw Error("Please return valid enumeration data");
+        }
+        if (clear) {
+          const ignoreCodes = ((_c = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _c.ignoreCodes) || [];
+          Object.keys(response).forEach((key) => {
+            if (!response[key] || !Array.isArray(response[key])) {
+              return;
+            }
+            const options = [...response[key]];
+            if (ignoreCodes.includes(key)) {
+              response[key] = options;
+            } else {
+              response[key] = options.map((item) => {
+                return cacheFieldNames(fieldNames, item);
+              });
+            }
+          });
+          res.data = response;
+        }
+        const cacheData = await Promise.resolve(getEnumData(storage, cacheKey) || { data: {} });
+        res.data = {
+          ...cacheData == null ? void 0 : cacheData.data,
+          ...res.data
         };
+        await Promise.resolve(setEnumData(storage, cacheKey, res));
+        const mergedPayload = { ...dics, ...res.data, ...dataSource };
         dispatch({
-          type: 'setProEnumDic',
+          type: "setProEnumDic",
           payload: mergedPayload
         });
         if (main) {
           setTimeout(() => {
-            window?.eventCenter?.publish('pro-enum-event', cachedData);
-            logDebug(locale?.ProEnum?.mainInitByCache);
-          }, 10000);
+            var _a3, _b3, _c2;
+            (_a3 = window == null ? void 0 : window.eventCenter) == null ? void 0 : _a3.publish("pro-enum-event", res.data);
+            logDebug((_c2 = (_b3 = locale) == null ? void 0 : _b3.ProEnum) == null ? void 0 : _c2.mainInitByRequest);
+          }, 1e4);
         }
-        fromCacheRef.current = null;
+        return res;
+      } catch (error) {
+        reportBackgroundError(error);
         return res;
       }
-      let response = res.data;
-      if (transformResponse && typeof transformResponse === 'function') {
-        response = await transformResponse(res.data);
-        if (typeof response !== 'object' || response == null) {
-          throw new Error(locale?.ProEnum?.errorMessage);
-        } else {
-          res.data = response;
-        }
-      }
-      if (typeof response !== 'object' || response === null) {
-        throw Error('response enum data must be object');
-      }
-      if (Object.keys(response).length === 0) {
-        throw Error('Please return valid enumeration data');
-      }
-
-      // 只返回fieldNames对象的key
-      if (clear) {
-        // 忽略清洗的 codes
-        const ignoreCodes = useRequest?.options?.ignoreCodes || [];
-        Object.keys(response).forEach(key => {
-          if (!response[key] || !Array.isArray(response[key])) {
-            return;
-          }
-          const options = [...response[key]];
-          if (ignoreCodes.includes(key)) {
-            response[key] = options;
-          } else {
-            response[key] = options.map(item => {
-              return cacheFieldNames(fieldNames, item);
-            });
-          }
-        });
-        res.data = response;
-      }
-
-      // 获取缓存数据（支持异步）
-      const cacheData = await Promise.resolve(getEnumData(storage, cacheKey) || {
-        data: {}
-      });
-
-      // 合并缓存数据
-      res.data = {
-        ...cacheData?.data,
-        ...res.data
-      };
-
-      // 设置缓存数据（支持异步）
-      await Promise.resolve(setEnumData(storage, cacheKey, res));
-
-      // 同步数据到全局
-      const mergedPayload = {
-        ...dics,
-        ...res.data,
-        ...dataSource
-      };
-      dispatch({
-        type: 'setProEnumDic',
-        payload: mergedPayload
-      });
-      if (main) {
-        setTimeout(() => {
-          window?.eventCenter?.publish('pro-enum-event', res.data);
-          logDebug(locale?.ProEnum?.mainInitByRequest);
-        }, 10000);
-      }
-      return res;
     },
-    getCache: params => {
-      if (storage === 'indexedDB') {
-        return undefined;
+    getCache: (params) => {
+      if (storage === "indexedDB") {
+        return void 0;
       }
-
-      // 同步存储的处理（原始逻辑）
-      const res = getEnumData(storage, cacheKey) || {
-        data: {}
-      };
-      const mergedPayload = {
-        ...dics,
-        ...res?.data,
-        ...dataSource
-      };
+      const res = getEnumData(storage, cacheKey) || { data: {} };
+      const mergedPayload = { ...dics, ...res == null ? void 0 : res.data, ...dataSource };
       dispatch({
-        type: 'setProEnumDic',
+        type: "setProEnumDic",
         payload: mergedPayload
       });
       if (main) {
         setTimeout(() => {
-          window?.eventCenter?.publish('pro-enum-event', res.data);
-          logDebug(locale?.ProEnum?.mainInitByCache);
-        }, 10000);
+          var _a2, _b2, _c;
+          (_a2 = window == null ? void 0 : window.eventCenter) == null ? void 0 : _a2.publish("pro-enum-event", res.data);
+          logDebug((_c = (_b2 = locale) == null ? void 0 : _b2.ProEnum) == null ? void 0 : _c.mainInitByCache);
+        }, 1e4);
       }
       return res;
     },
-    onSuccess: res => {
-      const {
-        status = 200,
-        message: msg
-      } = res;
+    onSuccess: (res) => {
+      var _a2, _b2;
+      const { status = 200, message: msg } = res;
       if (status !== 200) {
-        throw new Error(locale?.ProEnum?.requestError);
+        throw new Error((_b2 = (_a2 = locale) == null ? void 0 : _a2.ProEnum) == null ? void 0 : _b2.requestError);
       }
     }
   });
   const mergeData = async () => {
-    const cacheData = await Promise.resolve(getEnumData(storage, cacheKey) || {
-      data: {}
-    });
-    if (typeof cacheData === 'object') {
-      if (typeof cacheData.data === 'object' && cacheData.data !== null) {
+    var _a2, _b2, _c, _d;
+    const cacheData = await Promise.resolve(getEnumData(storage, cacheKey) || { data: {} });
+    if (typeof cacheData === "object") {
+      if (typeof cacheData.data === "object" && cacheData.data !== null) {
         const enumData = cacheData.data;
         const cacheCodes = Object.keys(enumData);
-        const codes = useRequest?.options?.codes || []; // 缓存的所有 codes
-        const ignoreCodes = useRequest?.options?.ignoreCodes || []; // 忽略清洗的 codes
-
+        const codes = ((_a2 = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _a2.codes) || [];
+        const ignoreCodes = ((_b2 = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _b2.ignoreCodes) || [];
         const diff = diffCode(cacheCodes, codes);
         if (diff) {
           let response;
-          const res = await useRequest?.service();
-          if (transformResponse && typeof transformResponse === 'function') {
+          const res = await (useRequest == null ? void 0 : useRequest.service());
+          if (transformResponse && typeof transformResponse === "function") {
             response = await transformResponse(res);
-            if (typeof response !== 'object' || response == null) {
-              throw new Error(locale?.ProEnum?.errorMessage);
+            if (typeof response !== "object" || response == null) {
+              throw new Error((_d = (_c = locale) == null ? void 0 : _c.ProEnum) == null ? void 0 : _d.errorMessage);
             }
           } else if (res.status === 200) {
             response = res.data;
           }
-          // 只返回fieldNames对象的key（非数组值会被安全跳过，避免展开报错）
-          response = cleanEnumResponse(response, {
-            clear,
-            ignoreCodes,
-            fieldNames
-          });
-          cacheData.data = {
-            ...cacheData.data,
-            ...response
-          };
+          response = cleanEnumResponse(response, { clear, ignoreCodes, fieldNames });
+          cacheData.data = { ...cacheData.data, ...response };
           await Promise.resolve(setEnumData(storage, cacheKey, cacheData));
-          // 同步数据到全局
           dispatch({
-            type: 'setProEnumDic',
-            payload: {
-              ...dics,
-              ...cacheData.data,
-              ...dataSource
-            }
+            type: "setProEnumDic",
+            payload: { ...dics, ...cacheData.data, ...dataSource }
           });
         } else if (dataSource && Object.keys(dataSource).length > 0) {
-          // 子系统也可能会有 dataSource，并需要同步写入缓存
-          const mergedPayload = {
-            ...dics,
-            ...cacheData.data,
-            ...dataSource
-          };
-          await Promise.resolve(setEnumData(storage, cacheKey, {
-            ...cacheData,
-            data: mergedPayload,
-            time: Date.now()
-          }));
+          const mergedPayload = { ...dics, ...cacheData.data, ...dataSource };
+          await Promise.resolve(
+            setEnumData(storage, cacheKey, {
+              ...cacheData,
+              data: mergedPayload,
+              time: Date.now()
+            })
+          );
           dispatch({
-            type: 'setProEnumDic',
+            type: "setProEnumDic",
             payload: mergedPayload
           });
         }
@@ -250,79 +228,71 @@ const useEnumRequest = (props, dispatch) => {
     }
   };
   useDeepCompareEffect(() => {
+    errorReportedRef.current = false;
     const executeAsync = async () => {
-      if (useRequest && useRequest?.service) {
-        const {
-          defaultParams
-        } = useRequest?.options || {};
-        const params = Array.isArray(defaultParams) ? defaultParams?.[0] : defaultParams || {};
+      if (useRequest && (useRequest == null ? void 0 : useRequest.service)) {
+        const { defaultParams } = (useRequest == null ? void 0 : useRequest.options) || {};
+        const params = Array.isArray(defaultParams) ? defaultParams == null ? void 0 : defaultParams[0] : defaultParams || {};
         if (requestRefresh) {
           window.localStorage.removeItem(cacheKey);
           window.sessionStorage.removeItem(cacheKey);
-          if (storage === 'indexedDB') {
-            await removeEnumData('indexedDB', cacheKey);
+          if (storage === "indexedDB") {
+            await removeEnumData("indexedDB", cacheKey);
           }
         }
         enumRes.run(params);
-        mergeData();
+        void mergeData().catch(reportBackgroundError);
       } else if (dataSource && Object.keys(dataSource).length > 0) {
-        const res = await Promise.resolve(getEnumData(storage, cacheKey) || {
-          data: {}
-        });
-        const mergedData = {
-          ...res?.data,
-          ...dataSource
-        };
-        await Promise.resolve(setEnumData(storage, cacheKey, {
-          ...res,
-          data: mergedData,
-          time: Date.now()
-        }));
+        const res = await Promise.resolve(getEnumData(storage, cacheKey) || { data: {} });
+        const mergedData = { ...res == null ? void 0 : res.data, ...dataSource };
+        await Promise.resolve(
+          setEnumData(storage, cacheKey, {
+            ...res,
+            data: mergedData,
+            time: Date.now()
+          })
+        );
         dispatch({
-          type: 'setProEnumDic',
+          type: "setProEnumDic",
           payload: mergedData
         });
       } else {
-        const res = await Promise.resolve(getEnumData(storage, cacheKey) || {
-          data: {}
-        });
+        const res = await Promise.resolve(getEnumData(storage, cacheKey) || { data: {} });
         dispatch({
-          type: 'setProEnumDic',
-          payload: {
-            ...res?.data
-          }
+          type: "setProEnumDic",
+          payload: { ...res == null ? void 0 : res.data }
         });
       }
     };
-    executeAsync();
-  }, [useRequest?.options]);
-  const shareProEnumDic = async cacheData => {
+    void executeAsync().catch(reportBackgroundError);
+  }, [useRequest == null ? void 0 : useRequest.options]);
+  const shareProEnumDic = async (cacheData) => {
     logDebug(cacheData);
-    const storageData = await Promise.resolve(getEnumData(storage, cacheKey) || {
-      data: {}
-    });
+    const storageData = await Promise.resolve(getEnumData(storage, cacheKey) || { data: {} });
+    const storagePayload = typeof (storageData == null ? void 0 : storageData.data) === "object" && storageData.data !== null ? storageData.data : storageData;
     dispatch({
-      type: 'setProEnumDic',
-      payload: {
-        ...dataSource,
-        ...cacheData,
-        ...storageData
-      }
+      type: "setProEnumDic",
+      payload: { ...dataSource, ...cacheData, ...storagePayload }
     });
   };
   useEffect(() => {
+    var _a2, _b2, _c, _d, _e, _f;
     if (main) {
-      window?.eventCenter?.publish('pro-enum-event', {});
-      logDebug(locale?.ProEnum?.mainInitOnce);
+      (_a2 = window == null ? void 0 : window.eventCenter) == null ? void 0 : _a2.publish("pro-enum-event", {});
+      logDebug((_c = (_b2 = locale) == null ? void 0 : _b2.ProEnum) == null ? void 0 : _c.mainInitOnce);
     }
     if (!main && share) {
-      window?.eventCenter?.subscribe('pro-enum-event', shareProEnumDic);
-      logDebug(locale?.ProEnum?.sonInitEvent);
+      (_d = window == null ? void 0 : window.eventCenter) == null ? void 0 : _d.subscribe("pro-enum-event", shareProEnumDic);
+      logDebug((_f = (_e = locale) == null ? void 0 : _e.ProEnum) == null ? void 0 : _f.sonInitEvent);
     }
     return () => {
-      window?.eventCenter?.unsubscribe('pro-enum-event', shareProEnumDic);
+      var _a3;
+      (_a3 = window == null ? void 0 : window.eventCenter) == null ? void 0 : _a3.unsubscribe("pro-enum-event", shareProEnumDic);
     };
   }, []);
   return enumRes;
 };
-export default useEnumRequest;
+var useEnumRequest_default = useEnumRequest;
+export {
+  useEnumRequest_default as default
+};

package/es/ProEnum/hooks/useFrequentEnumRequest.js

@@ -1,4 +1,4 @@
-import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
+import { useDeepCompareEffect, useRequest as useRequestFunc } from "ahooks";
 import { replaceFrequentEnumCache } from "../utils/frequentEnum";
 import { baseCacheKey } from "../utils";
 const useFrequentEnumRequest = (props, dispatch) => {
@@ -6,61 +6,53 @@ const useFrequentEnumRequest = (props, dispatch) => {
     frequentEnums,
     fieldNames,
     clear = true,
-    storage = 'localStorage',
+    storage = "localStorage",
     cacheKey = baseCacheKey,
     dics,
     dataSource
   } = props;
-  const frequentEnumRes = useRequestFunc(frequentEnums?.service || (() => Promise.resolve({
-    data: {}
-  })), {
-    manual: true,
-    ...frequentEnums?.options,
-    onSuccess: async res => {
-      let response = res;
-      // 使用frequentEnums的独立transformResponse处理
-      if (frequentEnums?.transformResponse && typeof frequentEnums.transformResponse === 'function') {
-        response = frequentEnums.transformResponse(res);
-      }
-
-      // 确保response.data存在，如果不存在则使用response本身
-      const enumData = response?.data || response;
-
-      // 替换缓存中的指定枚举（支持异步）
-      const updatedCacheData = await Promise.resolve(replaceFrequentEnumCache({
-        storage,
-        cacheKey,
-        enums: frequentEnums?.enums || [],
-        newData: enumData,
-        fieldNames,
-        clear
-      }));
-
-      // 同步数据到全局状态
-      dispatch({
-        type: 'setProEnumDic',
-        payload: {
-          ...dics,
-          ...dataSource,
-          ...updatedCacheData.data
+  const frequentEnumRes = useRequestFunc(
+    (frequentEnums == null ? void 0 : frequentEnums.service) || (() => Promise.resolve({ data: {} })),
+    {
+      manual: true,
+      ...frequentEnums == null ? void 0 : frequentEnums.options,
+      onSuccess: async (res) => {
+        let response = res;
+        if ((frequentEnums == null ? void 0 : frequentEnums.transformResponse) && typeof frequentEnums.transformResponse === "function") {
+          response = frequentEnums.transformResponse(res);
         }
-      });
-    },
-    onError: error => {
-      console.warn('ProEnum: Frequent enum request failed:', error);
+        const enumData = (response == null ? void 0 : response.data) || response;
+        const updatedCacheData = await Promise.resolve(
+          replaceFrequentEnumCache({
+            storage,
+            cacheKey,
+            enums: (frequentEnums == null ? void 0 : frequentEnums.enums) || [],
+            newData: enumData,
+            fieldNames,
+            clear
+          })
+        );
+        dispatch({
+          type: "setProEnumDic",
+          payload: { ...dics, ...dataSource, ...updatedCacheData.data }
+        });
+      },
+      onError: (error) => {
+        console.warn("ProEnum: Frequent enum request failed:", error);
+      }
     }
-  });
-
-  // 处理频繁枚举请求
+  );
   useDeepCompareEffect(() => {
-    if (frequentEnums && frequentEnums?.service && frequentEnums?.enums?.length) {
-      const {
-        defaultParams
-      } = frequentEnums?.options || {};
-      const params = Array.isArray(defaultParams) ? defaultParams?.[0] : defaultParams || {};
+    var _a;
+    if (frequentEnums && (frequentEnums == null ? void 0 : frequentEnums.service) && ((_a = frequentEnums == null ? void 0 : frequentEnums.enums) == null ? void 0 : _a.length)) {
+      const { defaultParams } = (frequentEnums == null ? void 0 : frequentEnums.options) || {};
+      const params = Array.isArray(defaultParams) ? defaultParams == null ? void 0 : defaultParams[0] : defaultParams || {};
       frequentEnumRes.run(params);
     }
-  }, [frequentEnums?.options]);
+  }, [frequentEnums == null ? void 0 : frequentEnums.options]);
   return frequentEnumRes;
 };
-export default useFrequentEnumRequest;
+var useFrequentEnumRequest_default = useFrequentEnumRequest;
+export {
+  useFrequentEnumRequest_default as default
+};