@zat-design/sisyphus-react 4.2.0-beta.2 → 4.2.0-beta.3

package/es/ProEnum/hooks/useEnumRequest.js

@@ -1,155 +1,112 @@
-var _ref;
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == typeof h && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(typeof e + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { useEffect } from 'react';
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
 import { diffCode, getEnumData, setEnumData, removeEnumData, cacheFieldNames, baseCacheKey } from "../utils";
 import locale from "../../locale";
 import "../utils/eventCenter";
-var baseEnumStorage = (_ref = window.localStorage.getItem(baseCacheKey) && JSON.parse(window.localStorage.getItem(baseCacheKey))) !== null && _ref !== void 0 ? _ref : null;
-var useEnumRequest = (props, dispatch) => {
-  var _ref2 = props || {},
-    _ref2$main = _ref2.main,
-    main = _ref2$main === void 0 ? false : _ref2$main,
-    _ref2$share = _ref2.share,
-    share = _ref2$share === void 0 ? false : _ref2$share,
-    _ref2$clear = _ref2.clear,
-    clear = _ref2$clear === void 0 ? true : _ref2$clear,
-    _ref2$fieldNames = _ref2.fieldNames,
-    fieldNames = _ref2$fieldNames === void 0 ? {
+const baseEnumStorage = (window.localStorage.getItem(baseCacheKey) && JSON.parse(window.localStorage.getItem(baseCacheKey))) ?? null;
+const useEnumRequest = (props, dispatch) => {
+  const {
+    main = false,
+    share = false,
+    clear = true,
+    fieldNames = {
       label: 'label',
       value: 'value',
       children: 'children'
-    } : _ref2$fieldNames,
-    _ref2$cacheKey = _ref2.cacheKey,
-    cacheKey = _ref2$cacheKey === void 0 ? baseCacheKey : _ref2$cacheKey,
-    _ref2$requestRefresh = _ref2.requestRefresh,
-    requestRefresh = _ref2$requestRefresh === void 0 ? false : _ref2$requestRefresh,
-    _ref2$storage = _ref2.storage,
-    storage = _ref2$storage === void 0 ? 'localStorage' : _ref2$storage,
-    _ref2$dataSource = _ref2.dataSource,
-    dataSource = _ref2$dataSource === void 0 ? {} : _ref2$dataSource,
-    useRequest = _ref2.useRequest,
-    transformResponse = _ref2.transformResponse,
-    _ref2$dics = _ref2.dics,
-    dics = _ref2$dics === void 0 ? {} : _ref2$dics;
+    },
+    cacheKey = baseCacheKey,
+    requestRefresh = false,
+    storage = 'localStorage',
+    dataSource = {},
+    useRequest,
+    transformResponse,
+    dics = {}
+  } = props || {};
   if (typeof dataSource === 'object' && dataSource === null) {
-    var _locale$ProEnum;
-    throw new Error(locale === null || locale === void 0 || (_locale$ProEnum = locale.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorDataSource);
+    throw new Error(locale?.ProEnum?.errorDataSource);
   }
-  var logDebug = msg => {
+  const logDebug = msg => {
     if (props.debugger) {
       console.warn('proEnum：', msg);
     }
   };
-  var enumRes = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread(_objectSpread({
+  const enumRes = useRequestFunc(useRequest?.service, {
     manual: true,
     cacheKey,
     cacheTime: -1,
-    staleTime: 6e4 * 60
-  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
-    setCache: function () {
-      var _setCache = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
-        var response, _locale$ProEnum2, _useRequest$options, ignoreCodes, cacheData;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              response = res.data;
-              if (!(transformResponse && typeof transformResponse === 'function')) {
-                _context.next = 10;
-                break;
-              }
-              _context.next = 4;
-              return transformResponse(res.data);
-            case 4:
-              response = _context.sent;
-              if (!(typeof response !== 'object' || response == null)) {
-                _context.next = 9;
-                break;
-              }
-              throw new Error(locale === null || locale === void 0 || (_locale$ProEnum2 = locale.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
-            case 9:
-              res.data = response;
-            case 10:
-              if (!(typeof response !== 'object' || response === null)) {
-                _context.next = 12;
-                break;
-              }
-              throw Error('response enum data must be object');
-            case 12:
-              if (!(Object.keys(response).length === 0)) {
-                _context.next = 14;
-                break;
-              }
-              throw Error('Please return valid enumeration data');
-            case 14:
-              // 只返回fieldNames对象的key
-              if (clear) {
-                // 忽略清洗的 codes
-                ignoreCodes = (useRequest === null || useRequest === void 0 || (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.ignoreCodes) || [];
-                Object.keys(response).forEach(key => {
-                  if (!response[key] || !Array.isArray(response[key])) {
-                    return;
-                  }
-                  var options = [...response[key]];
-                  if (ignoreCodes.includes(key)) {
-                    response[key] = options;
-                  } else {
-                    response[key] = options.map(item => {
-                      return cacheFieldNames(fieldNames, item);
-                    });
-                  }
-                });
-                res.data = response;
-              }
-
-              // 获取缓存数据（支持异步）
-              _context.next = 17;
-              return Promise.resolve(getEnumData(storage, cacheKey, baseEnumStorage) || {
-                data: {}
-              });
-            case 17:
-              cacheData = _context.sent;
-              // 合并缓存数据
-              res.data = _objectSpread(_objectSpread({}, cacheData === null || cacheData === void 0 ? void 0 : cacheData.data), res.data);
+    staleTime: 6e4 * 60,
+    ...useRequest?.options,
+    setCache: async 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');
+      }
 
-              // 设置缓存数据（支持异步）
-              _context.next = 21;
-              return Promise.resolve(setEnumData(storage, cacheKey, res));
-            case 21:
-              // 同步数据到全局
-              dispatch({
-                type: 'setProEnumDic',
-                payload: _objectSpread(_objectSpread(_objectSpread({}, dics), dataSource), res.data)
-              });
-              if (main) {
-                setTimeout(() => {
-                  var _window, _locale$ProEnum3;
-                  (_window = window) === null || _window === void 0 || (_window = _window.eventCenter) === null || _window === void 0 || _window.publish('zat-design-pro-component-event', res.data);
-                  logDebug(locale === null || locale === void 0 || (_locale$ProEnum3 = locale.ProEnum) === null || _locale$ProEnum3 === void 0 ? void 0 : _locale$ProEnum3.mainInitByRequest);
-                }, 10000);
-              }
-              return _context.abrupt("return", res);
-            case 24:
-            case "end":
-              return _context.stop();
+      // 只返回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);
+            });
           }
-        }, _callee);
-      }));
-      function setCache(_x) {
-        return _setCache.apply(this, arguments);
+        });
+        res.data = response;
       }
-      return setCache;
-    }(),
+
+      // 获取缓存数据（支持异步）
+      const cacheData = await Promise.resolve(getEnumData(storage, cacheKey, baseEnumStorage) || {
+        data: {}
+      });
+
+      // 合并缓存数据
+      res.data = {
+        ...cacheData?.data,
+        ...res.data
+      };
+
+      // 设置缓存数据（支持异步）
+      await Promise.resolve(setEnumData(storage, cacheKey, res));
+
+      // 同步数据到全局
+      dispatch({
+        type: 'setProEnumDic',
+        payload: {
+          ...dics,
+          ...dataSource,
+          ...res.data
+        }
+      });
+      if (main) {
+        setTimeout(() => {
+          window?.eventCenter?.publish('zat-design-pro-component-event', res.data);
+          logDebug(locale?.ProEnum?.mainInitByRequest);
+        }, 10000);
+      }
+      return res;
+    },
     getCache: () => {
       // 支持异步读取
-      var cachePromise = Promise.resolve(getEnumData(storage, cacheKey, baseEnumStorage) || {
+      const cachePromise = Promise.resolve(getEnumData(storage, cacheKey, baseEnumStorage) || {
         data: {}
       });
 
@@ -158,13 +115,16 @@ var useEnumRequest = (props, dispatch) => {
         return cachePromise.then(res => {
           dispatch({
             type: 'setProEnumDic',
-            payload: _objectSpread(_objectSpread(_objectSpread({}, dics), dataSource), res === null || res === void 0 ? void 0 : res.data)
+            payload: {
+              ...dics,
+              ...dataSource,
+              ...res?.data
+            }
           });
           if (main) {
             setTimeout(() => {
-              var _window2, _locale$ProEnum4;
-              (_window2 = window) === null || _window2 === void 0 || (_window2 = _window2.eventCenter) === null || _window2 === void 0 || _window2.publish('zat-design-pro-component-event', res.data);
-              logDebug(locale === null || locale === void 0 || (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.mainInitByCache);
+              window?.eventCenter?.publish('zat-design-pro-component-event', res.data);
+              logDebug(locale?.ProEnum?.mainInitByCache);
             }, 10000);
           }
           return res;
@@ -172,242 +132,167 @@ var useEnumRequest = (props, dispatch) => {
       }
 
       // 同步存储的处理
-      var res = getEnumData(storage, cacheKey, baseEnumStorage) || {
+      const res = getEnumData(storage, cacheKey, baseEnumStorage) || {
         data: {}
       };
       dispatch({
         type: 'setProEnumDic',
-        payload: _objectSpread(_objectSpread(_objectSpread({}, dics), dataSource), res === null || res === void 0 ? void 0 : res.data)
+        payload: {
+          ...dics,
+          ...dataSource,
+          ...res?.data
+        }
       });
       if (main) {
         setTimeout(() => {
-          var _window3, _locale$ProEnum5;
-          (_window3 = window) === null || _window3 === void 0 || (_window3 = _window3.eventCenter) === null || _window3 === void 0 || _window3.publish('zat-design-pro-component-event', res.data);
-          logDebug(locale === null || locale === void 0 || (_locale$ProEnum5 = locale.ProEnum) === null || _locale$ProEnum5 === void 0 ? void 0 : _locale$ProEnum5.mainInitByCache);
+          window?.eventCenter?.publish('zat-design-pro-component-event', res.data);
+          logDebug(locale?.ProEnum?.mainInitByCache);
         }, 10000);
       }
       return res;
     },
     onSuccess: res => {
-      var _res$status = res.status,
-        status = _res$status === void 0 ? 200 : _res$status,
-        msg = res.message;
+      const {
+        status = 200,
+        message: msg
+      } = res;
       if (status !== 200) {
-        var _locale$ProEnum6;
-        throw new Error(locale === null || locale === void 0 || (_locale$ProEnum6 = locale.ProEnum) === null || _locale$ProEnum6 === void 0 ? void 0 : _locale$ProEnum6.requestError);
+        throw new Error(locale?.ProEnum?.requestError);
       }
     }
-  }));
-  var mergeData = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var cacheData, _useRequest$options2, _useRequest$options3, enumData, cacheCodes, codes, ignoreCodes, diff, response, res, _locale$ProEnum7;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            _context2.next = 2;
-            return Promise.resolve(getEnumData(storage, cacheKey, baseEnumStorage) || {
-              data: {}
-            });
-          case 2:
-            cacheData = _context2.sent;
-            if (!(typeof cacheData === 'object')) {
-              _context2.next = 31;
-              break;
-            }
-            if (!(typeof cacheData.data === 'object' && cacheData.data !== null)) {
-              _context2.next = 31;
-              break;
-            }
-            enumData = cacheData.data;
-            cacheCodes = Object.keys(enumData);
-            codes = (useRequest === null || useRequest === void 0 || (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.codes) || []; // 缓存的所有 codes
-            ignoreCodes = (useRequest === null || useRequest === void 0 || (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.ignoreCodes) || []; // 忽略清洗的 codes
-            diff = diffCode(cacheCodes, codes);
-            if (!diff) {
-              _context2.next = 30;
-              break;
-            }
-            _context2.next = 13;
-            return useRequest === null || useRequest === void 0 ? void 0 : useRequest.service();
-          case 13:
-            res = _context2.sent;
-            if (!(transformResponse && typeof transformResponse === 'function')) {
-              _context2.next = 22;
-              break;
-            }
-            _context2.next = 17;
-            return transformResponse(res);
-          case 17:
-            response = _context2.sent;
-            if (!(typeof response !== 'object' || response == null)) {
-              _context2.next = 20;
-              break;
-            }
-            throw new Error(locale === null || locale === void 0 || (_locale$ProEnum7 = locale.ProEnum) === null || _locale$ProEnum7 === void 0 ? void 0 : _locale$ProEnum7.errorMessage);
-          case 20:
-            _context2.next = 23;
-            break;
-          case 22:
-            if (res.status === 200) {
-              response = res.data;
-            }
-          case 23:
-            // 只返回fieldNames对象的key
-            if (clear) {
-              Object.keys(response).forEach(key => {
-                var options = [...response[key]];
-                if (ignoreCodes.includes(key)) {
-                  response[key] = options;
-                } else {
-                  response[key] = options.map(item => {
-                    return cacheFieldNames(fieldNames, item);
-                  });
-                }
-              });
+  });
+  const mergeData = async () => {
+    const cacheData = await Promise.resolve(getEnumData(storage, cacheKey, baseEnumStorage) || {
+      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 diff = diffCode(cacheCodes, codes);
+        if (diff) {
+          let response;
+          const res = await useRequest?.service();
+          if (transformResponse && typeof transformResponse === 'function') {
+            response = await transformResponse(res);
+            if (typeof response !== 'object' || response == null) {
+              throw new Error(locale?.ProEnum?.errorMessage);
             }
-            cacheData.data = _objectSpread(_objectSpread({}, cacheData.data), response);
-            _context2.next = 27;
-            return Promise.resolve(setEnumData(storage, cacheKey, cacheData));
-          case 27:
-            // 同步数据到全局
-            dispatch({
-              type: 'setProEnumDic',
-              payload: _objectSpread(_objectSpread(_objectSpread({}, dics), dataSource), cacheData.data)
+          } else if (res.status === 200) {
+            response = res.data;
+          }
+          // 只返回fieldNames对象的key
+          if (clear) {
+            Object.keys(response).forEach(key => {
+              const options = [...response[key]];
+              if (ignoreCodes.includes(key)) {
+                response[key] = options;
+              } else {
+                response[key] = options.map(item => {
+                  return cacheFieldNames(fieldNames, item);
+                });
+              }
             });
-            _context2.next = 31;
-            break;
-          case 30:
-            if (dataSource && Object.keys(dataSource)) {
-              // 子系统也可能会有 dataSource
-              dispatch({
-                type: 'setProEnumDic',
-                payload: _objectSpread(_objectSpread({}, dics), dataSource)
-              });
+          }
+          cacheData.data = {
+            ...cacheData.data,
+            ...response
+          };
+          await Promise.resolve(setEnumData(storage, cacheKey, cacheData));
+          // 同步数据到全局
+          dispatch({
+            type: 'setProEnumDic',
+            payload: {
+              ...dics,
+              ...dataSource,
+              ...cacheData.data
             }
-          case 31:
-          case "end":
-            return _context2.stop();
+          });
+        } else if (dataSource && Object.keys(dataSource)) {
+          // 子系统也可能会有 dataSource
+          dispatch({
+            type: 'setProEnumDic',
+            payload: {
+              ...dics,
+              ...dataSource
+            }
+          });
         }
-      }, _callee2);
-    }));
-    return function mergeData() {
-      return _ref3.apply(this, arguments);
-    };
-  }();
+      }
+    }
+  };
   useDeepCompareEffect(() => {
-    var executeAsync = /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var _ref5, defaultParams, _params, res, _res;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              if (!(useRequest && useRequest !== null && useRequest !== void 0 && useRequest.service)) {
-                _context3.next = 13;
-                break;
-              }
-              _ref5 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {}, defaultParams = _ref5.defaultParams;
-              _params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
-              if (!requestRefresh) {
-                _context3.next = 9;
-                break;
-              }
-              window.localStorage.removeItem(cacheKey);
-              window.sessionStorage.removeItem(cacheKey);
-              // 清除 IndexedDB
-              if (!(storage === 'indexedDB')) {
-                _context3.next = 9;
-                break;
-              }
-              _context3.next = 9;
-              return removeEnumData('indexedDB', cacheKey);
-            case 9:
-              enumRes.run(_params);
-
-              // TODO 这段代码目前看起来是没啥用的、没起到作用
-              mergeData();
-              _context3.next = 24;
-              break;
-            case 13:
-              if (!Object.keys(dataSource)) {
-                _context3.next = 20;
-                break;
-              }
-              _context3.next = 16;
-              return Promise.resolve(getEnumData(storage, cacheKey, baseEnumStorage) || {
-                data: {}
-              });
-            case 16:
-              res = _context3.sent;
-              dispatch({
-                type: 'setProEnumDic',
-                payload: _objectSpread(_objectSpread({}, dataSource), res === null || res === void 0 ? void 0 : res.data)
-              });
-              _context3.next = 24;
-              break;
-            case 20:
-              _context3.next = 22;
-              return Promise.resolve(getEnumData(storage, cacheKey, baseEnumStorage) || {
-                data: {}
-              });
-            case 22:
-              _res = _context3.sent;
-              dispatch({
-                type: 'setProEnumDic',
-                payload: _objectSpread({}, _res === null || _res === void 0 ? void 0 : _res.data)
-              });
-            case 24:
-            case "end":
-              return _context3.stop();
+    const executeAsync = async () => {
+      if (useRequest && useRequest?.service) {
+        const {
+          defaultParams
+        } = useRequest?.options || {};
+        const params = Array.isArray(defaultParams) ? defaultParams?.[0] : defaultParams || {};
+        if (requestRefresh) {
+          window.localStorage.removeItem(cacheKey);
+          window.sessionStorage.removeItem(cacheKey);
+          // 清除 IndexedDB
+          if (storage === 'indexedDB') {
+            await removeEnumData('indexedDB', cacheKey);
           }
-        }, _callee3);
-      }));
-      return function executeAsync() {
-        return _ref4.apply(this, arguments);
-      };
-    }();
-    executeAsync();
-  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
-  var shareProEnumDic = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(cacheData) {
-      var storageData;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
-          case 0:
-            logDebug(cacheData);
-            _context4.next = 3;
-            return Promise.resolve(getEnumData(storage, cacheKey, baseEnumStorage) || {
-              data: {}
-            });
-          case 3:
-            storageData = _context4.sent;
-            dispatch({
-              type: 'setProEnumDic',
-              payload: _objectSpread(_objectSpread(_objectSpread({}, dataSource), cacheData), storageData)
-            });
-          case 5:
-          case "end":
-            return _context4.stop();
         }
-      }, _callee4);
-    }));
-    return function shareProEnumDic(_x2) {
-      return _ref6.apply(this, arguments);
+        enumRes.run(params);
+
+        // TODO 这段代码目前看起来是没啥用的、没起到作用
+        mergeData();
+      } else if (Object.keys(dataSource)) {
+        const res = await Promise.resolve(getEnumData(storage, cacheKey, baseEnumStorage) || {
+          data: {}
+        });
+        dispatch({
+          type: 'setProEnumDic',
+          payload: {
+            ...dataSource,
+            ...res?.data
+          }
+        });
+      } else {
+        const res = await Promise.resolve(getEnumData(storage, cacheKey, baseEnumStorage) || {
+          data: {}
+        });
+        dispatch({
+          type: 'setProEnumDic',
+          payload: {
+            ...res?.data
+          }
+        });
+      }
     };
-  }();
+    executeAsync();
+  }, [useRequest?.options]);
+  const shareProEnumDic = async cacheData => {
+    logDebug(cacheData);
+    const storageData = await Promise.resolve(getEnumData(storage, cacheKey, baseEnumStorage) || {
+      data: {}
+    });
+    dispatch({
+      type: 'setProEnumDic',
+      payload: {
+        ...dataSource,
+        ...cacheData,
+        ...storageData
+      }
+    });
+  };
   useEffect(() => {
     if (main) {
-      var _window4, _locale$ProEnum8;
-      (_window4 = window) === null || _window4 === void 0 || (_window4 = _window4.eventCenter) === null || _window4 === void 0 || _window4.publish('zat-design-pro-component-event', {});
-      logDebug(locale === null || locale === void 0 || (_locale$ProEnum8 = locale.ProEnum) === null || _locale$ProEnum8 === void 0 ? void 0 : _locale$ProEnum8.mainInitOnce);
+      window?.eventCenter?.publish('zat-design-pro-component-event', {});
+      logDebug(locale?.ProEnum?.mainInitOnce);
     }
     if (!main && share) {
-      var _window5, _locale$ProEnum9;
-      (_window5 = window) === null || _window5 === void 0 || (_window5 = _window5.eventCenter) === null || _window5 === void 0 || _window5.subscribe('zat-design-pro-component-event', shareProEnumDic);
-      logDebug(locale === null || locale === void 0 || (_locale$ProEnum9 = locale.ProEnum) === null || _locale$ProEnum9 === void 0 ? void 0 : _locale$ProEnum9.sonInitEvent);
+      window?.eventCenter?.subscribe('zat-design-pro-component-event', shareProEnumDic);
+      logDebug(locale?.ProEnum?.sonInitEvent);
     }
     return () => {
-      var _window6;
-      (_window6 = window) === null || _window6 === void 0 || (_window6 = _window6.eventCenter) === null || _window6 === void 0 || _window6.unsubscribe('zat-design-pro-component-event', shareProEnumDic);
+      window?.eventCenter?.unsubscribe('zat-design-pro-component-event', shareProEnumDic);
     };
   }, []);
   return enumRes;