@zat-design/sisyphus-react 4.0.0-beta.2 → 4.0.0-beta.4

package/es/ProEditTable/utils/useEditTableError.js

@@ -1,6 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _debounce from "lodash/debounce";
 import { useState, useEffect } from 'react';
+import { debounce } from 'lodash';
 var useEditTableError = function useEditTableError(_ref) {
   var containerNode = _ref.containerNode,
     className = _ref.className,
@@ -12,23 +12,27 @@ var useEditTableError = function useEditTableError(_ref) {
   useEffect(function () {
     var _containerNode$childr3;
     // 如果 isEnabled 为 false 或容器节点不存在，直接跳过监听
-    if (!isEnabled || !containerNode || !(containerNode === null || containerNode === void 0 ? void 0 : containerNode.querySelector)) {
+    if (!isEnabled || !containerNode || !(containerNode !== null && containerNode !== void 0 && containerNode.querySelector)) {
       return; // 如果未启用监听或容器节点不存在，直接返回
     }
+
     // 防抖处理：将 setErrorLength 函数进行防抖
-    var debouncedSetErrorLength = _debounce(function (errorCount) {
+    var debouncedSetErrorLength = debounce(function (errorCount) {
       setErrorLength(errorCount); // 更新错误数量
     }, 300); // 300ms 后更新状态
+
     var observer = new MutationObserver(function (mutations) {
       mutations.forEach(function (mutation) {
         // 只处理节点的 class 属性变化
         if (mutation.type === 'attributes' && mutation.attributeName === 'class') {
           var target = mutation.target;
+
           // 检查目标节点是否包含指定的类
           if (target.classList.contains(className)) {
             var _containerNode$childr;
             // 查找所有包含 className 的节点
-            var errorNodes = containerNode === null || containerNode === void 0 ? void 0 : (_containerNode$childr = containerNode.children[0]) === null || _containerNode$childr === void 0 ? void 0 : _containerNode$childr.querySelectorAll(".".concat(className));
+            var errorNodes = containerNode === null || containerNode === void 0 || (_containerNode$childr = containerNode.children[0]) === null || _containerNode$childr === void 0 ? void 0 : _containerNode$childr.querySelectorAll(".".concat(className));
+
             // 过滤这些节点，只保留那些类名完全为 `ant-form-item-explain-error` 的节点
             var validErrorNodes = Array.from(errorNodes).filter(function (node) {
               return node.classList.length === 1 && node.classList.contains('ant-form-item-explain-error');
@@ -43,6 +47,7 @@ var useEditTableError = function useEditTableError(_ref) {
             debouncedSetErrorLength(validErrorNodes.length);
           }
         }
+
         // 监听子节点的添加或删除
         if (mutation.type === 'childList') {
           // 检查删除的节点是否包含指定的类名
@@ -50,7 +55,7 @@ var useEditTableError = function useEditTableError(_ref) {
             if (removedNode instanceof HTMLElement && removedNode.classList.contains('ant-table-row')) {
               var _containerNode$childr2;
               // 更新错误数量
-              var _errorNodes = containerNode === null || containerNode === void 0 ? void 0 : (_containerNode$childr2 = containerNode.children[0]) === null || _containerNode$childr2 === void 0 ? void 0 : _containerNode$childr2.querySelectorAll(".".concat(className));
+              var _errorNodes = containerNode === null || containerNode === void 0 || (_containerNode$childr2 = containerNode.children[0]) === null || _containerNode$childr2 === void 0 ? void 0 : _containerNode$childr2.querySelectorAll(".".concat(className));
               if (errorLength === 0) {
                 debouncedSetErrorLength(0);
               }
@@ -66,23 +71,29 @@ var useEditTableError = function useEditTableError(_ref) {
     });
     var config = {
       attributes: true,
+      // 监听属性的变化
       subtree: true,
+      // 监听子节点的变化
       attributeFilter: ['class'],
+      // 只监听 class 属性变化
       childList: true
     };
+
     // 启动 MutationObserver
-    var targetNode = containerNode === null || containerNode === void 0 ? void 0 : (_containerNode$childr3 = containerNode.children[0]) === null || _containerNode$childr3 === void 0 ? void 0 : _containerNode$childr3.querySelector('tbody');
+    var targetNode = containerNode === null || containerNode === void 0 || (_containerNode$childr3 = containerNode.children[0]) === null || _containerNode$childr3 === void 0 ? void 0 : _containerNode$childr3.querySelector('tbody');
     if (targetNode instanceof HTMLElement) {
       observer.observe(targetNode, config);
     } else {
       console.error('warning: tbody element not found or invalid');
     }
+
     // 清理 MutationObserver 和防抖定时器
     return function () {
       observer.disconnect();
       debouncedSetErrorLength.cancel(); // 取消防抖定时器
     };
   }, [containerNode, className, isEnabled]); // 当 isEnabled 改变时会重新启动或取消监听
+
   return [errorLength];
 };
 export default useEditTableError;

package/es/ProEnum/components/Group.js

@@ -1,7 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { jsx as _jsx } from "react/jsx-runtime";
 import classNames from 'classnames';
 import { useEffect, useRef, useState } from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
 var Group = function Group(props) {
   var value = props.value,
     onChange = props.onChange,
@@ -29,26 +29,26 @@ var Group = function Group(props) {
       if (!allowClear) {
         return false;
       }
-      onChange === null || onChange === void 0 ? void 0 : onChange('');
+      onChange === null || onChange === void 0 || onChange('');
       idx.current = -1;
     } else {
       idx.current = index;
-      onChange === null || onChange === void 0 ? void 0 : onChange(val);
+      onChange === null || onChange === void 0 || onChange(val);
     }
   };
   if (dataSource.length === 0) {
-    return _jsx("span", {
+    return /*#__PURE__*/_jsx("span", {
       children: "-"
     });
   }
-  return _jsx("div", {
+  return /*#__PURE__*/_jsx("div", {
     id: id,
     className: classNames({
       'pro-enum-group-root': true,
       'pro-enum-group-root-disabled': disabled
     }),
     children: dataSource.map(function (item, index) {
-      return _jsx("div", {
+      return /*#__PURE__*/_jsx("div", {
         onClick: function onClick() {
           if (!item.disabled && !disabled) {
             handleClick(item[fieldValue], index);

package/es/ProEnum/components/Tag.js

@@ -1,7 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { jsx as _jsx } from "react/jsx-runtime";
 import classNames from 'classnames';
 import { useEffect, useState } from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
 var ProEnumTag = function ProEnumTag(props) {
   var value = props.value,
     onChange = props.onChange,
@@ -18,22 +18,24 @@ var ProEnumTag = function ProEnumTag(props) {
   }, [value]);
   var handleClick = function handleClick(val) {
     setValue(val);
-    onChange === null || onChange === void 0 ? void 0 : onChange(val);
+    onChange === null || onChange === void 0 || onChange(val);
   };
   if (dataSource.length === 0) {
-    return _jsx("span", {
+    return /*#__PURE__*/_jsx("span", {
       children: "-"
     });
   }
-  return _jsx("div", {
+  return /*#__PURE__*/_jsx("div", {
     id: id,
     className: "pro-enum-tag-root",
     children: dataSource.map(function (item) {
-      return _jsx("div", {
+      return /*#__PURE__*/_jsx("div", {
         onClick: function onClick() {
           return handleClick(item[fieldValue]);
         },
-        className: classNames('pro-enum-tag-item', checked === item[fieldValue] ? 'pro-enum-tag-item-selected' : ''),
+        className: classNames('pro-enum-tag-item', checked === item[fieldValue] ? 'pro-enum-tag-item-selected' : ''
+        // item.disabled ? 'pro-enum-tag-item-disabled' : '',
+        ),
         children: item[fieldLabel]
       }, item[fieldValue]);
     })

package/es/ProEnum/hooks/useEnum.js

@@ -1,8 +1,28 @@
 var _ref;
 /* eslint-disable no-redeclare */
-import { useProConfig } from '../../ProConfigProvider';
-import { getEnumData } from '../utils';
+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;
+
+/**
+ * input code output [DataOption[],getEnumLabel]
+ * @param code
+ * const [options,fn] = useEnum("code")
+ */
+
+/**
+ * input codes output { code1:DataOption[],code2:DataOption[] }
+ * @param codes
+ * const dicsMap = useEnum(["code1","code2"])
+ */
+
+/**
+ * input code、value output label
+ * @param code
+ * @param value
+ * @param compose 展示 value-label
+ */
+
 /**
  * 根据 code 从枚举缓存取出对应的 options 、以及回显
  * @param codes
@@ -10,6 +30,7 @@ var baseEnumStorage = (_ref = window.localStorage.getItem('zat-design-pro-compon
  * @param compose
  * @returns
  */
+
 function useEnum(codes, value, compose) {
   var _ref2 = useProConfig('globalConfig') || {},
     _ref2$storage = _ref2.storage,
@@ -21,7 +42,13 @@ function useEnum(codes, value, compose) {
     fieldNames = _ref3$fieldNames === void 0 ? {} : _ref3$fieldNames,
     _ref3$clear = _ref3.clear,
     clear = _ref3$clear === void 0 ? true : _ref3$clear;
+
+  // 存在子应用自管理枚举时，需要根据其指定的cacheKey进行缓存
+  if (cacheKey !== 'zat-design-pro-component-cacheKey') {
+    baseEnumStorage = null;
+  }
   var catchData = getEnumData(storage, cacheKey, baseEnumStorage);
+
   // 默认枚举缓存数据
   baseEnumStorage = catchData;
   if (!codes) {
@@ -39,7 +66,7 @@ function useEnum(codes, value, compose) {
   }
   if (typeof codes === 'string') {
     var _catchData$data;
-    var options = (catchData === null || catchData === void 0 ? void 0 : (_catchData$data = catchData.data) === null || _catchData$data === void 0 ? void 0 : _catchData$data[codes]) || [];
+    var options = (catchData === null || catchData === void 0 || (_catchData$data = catchData.data) === null || _catchData$data === void 0 ? void 0 : _catchData$data[codes]) || [];
     var getEnumLabel = function getEnumLabel(v, composezTow) {
       var option = options.find(function (item) {
         return item[fieldValue] === v;
@@ -63,7 +90,7 @@ function useEnum(codes, value, compose) {
     var _options = {};
     codes.forEach(function (code) {
       var _catchData$data2;
-      var values = catchData === null || catchData === void 0 ? void 0 : (_catchData$data2 = catchData.data) === null || _catchData$data2 === void 0 ? void 0 : _catchData$data2[code];
+      var values = catchData === null || catchData === void 0 || (_catchData$data2 = catchData.data) === null || _catchData$data2 === void 0 ? void 0 : _catchData$data2[code];
       if (Array.isArray(values) && values.length) {
         _options[code] = values;
       }

package/es/ProEnum/hooks/useEnumRequest.js

@@ -1,15 +1,14 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 var _ref;
-function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
-function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
 import { useEffect } from 'react';
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
-import { diffCode, getEnumData, setEnumData, cacheFieldNames, baseCacheKey } from '../utils';
-import locale from '../../locale';
-import '../utils/eventCenter';
+import { diffCode, getEnumData, setEnumData, 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 = function useEnumRequest(props, dispatch) {
   var _ref2 = props || {},
@@ -39,7 +38,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     dics = _ref2$dics === void 0 ? {} : _ref2$dics;
   if (_typeof(dataSource) === 'object' && dataSource === null) {
     var _locale$ProEnum;
-    throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum = locale.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorDataSource);
+    throw new Error(locale === null || locale === void 0 || (_locale$ProEnum = locale.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorDataSource);
   }
   var logDebug = function logDebug(msg) {
     if (props.debugger) {
@@ -53,44 +52,44 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     staleTime: 6e4 * 60
   }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
     setCache: function () {
-      var _setCache = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(res) {
+      var _setCache = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
         var response, _locale$ProEnum2, _useRequest$options, ignoreCodes, cacheData;
-        return _regenerator().w(function (_context) {
-          while (1) switch (_context.n) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
             case 0:
               response = res.data;
               if (!(transformResponse && typeof transformResponse === 'function')) {
-                _context.n = 3;
+                _context.next = 10;
                 break;
               }
-              _context.n = 1;
+              _context.next = 4;
               return transformResponse(res.data);
-            case 1:
-              response = _context.v;
+            case 4:
+              response = _context.sent;
               if (!(_typeof(response) !== 'object' || response == null)) {
-                _context.n = 2;
+                _context.next = 9;
                 break;
               }
-              throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum2 = locale.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
-            case 2:
+              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 3:
+            case 10:
               if (!(_typeof(response) !== 'object' || response === null)) {
-                _context.n = 4;
+                _context.next = 12;
                 break;
               }
               throw Error('response enum data must be object');
-            case 4:
+            case 12:
               if (!(Object.keys(response).length === 0)) {
-                _context.n = 5;
+                _context.next = 14;
                 break;
               }
               throw Error('Please return valid enumeration data');
-            case 5:
+            case 14:
               // 只返回fieldNames对象的key
               if (clear) {
                 // 忽略清洗的 codes
-                ignoreCodes = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.ignoreCodes) || [];
+                ignoreCodes = (useRequest === null || useRequest === void 0 || (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.ignoreCodes) || [];
                 Object.keys(response).forEach(function (key) {
                   if (!response[key] || !Array.isArray(response[key])) {
                     return;
@@ -111,6 +110,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
               }; // 合并缓存数据
               res.data = _objectSpread(_objectSpread({}, cacheData === null || cacheData === void 0 ? void 0 : cacheData.data), res.data);
               setEnumData(storage, cacheKey, res);
+
               // 同步数据到全局
               dispatch({
                 type: 'setProEnumDic',
@@ -120,10 +120,13 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
                 setTimeout(function () {
                   var _locale$ProEnum3;
                   window.eventCenter.publish('zat-design-pro-component-event', res.data);
-                  logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum3 = locale.ProEnum) === null || _locale$ProEnum3 === void 0 ? void 0 : _locale$ProEnum3.mainInitByRequest);
+                  logDebug(locale === null || locale === void 0 || (_locale$ProEnum3 = locale.ProEnum) === null || _locale$ProEnum3 === void 0 ? void 0 : _locale$ProEnum3.mainInitByRequest);
                 }, 10000);
               }
-              return _context.a(2, res);
+              return _context.abrupt("return", res);
+            case 21:
+            case "end":
+              return _context.stop();
           }
         }, _callee);
       }));
@@ -144,7 +147,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
         setTimeout(function () {
           var _locale$ProEnum4;
           window.eventCenter.publish('zat-design-pro-component-event', res.data);
-          logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.mainInitByCache);
+          logDebug(locale === null || locale === void 0 || (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.mainInitByCache);
         }, 10000);
       }
       return res;
@@ -155,61 +158,61 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
         msg = res.message;
       if (status !== 200) {
         var _locale$ProEnum5;
-        throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum5 = locale.ProEnum) === null || _locale$ProEnum5 === void 0 ? void 0 : _locale$ProEnum5.requestError);
+        throw new Error(locale === null || locale === void 0 || (_locale$ProEnum5 = locale.ProEnum) === null || _locale$ProEnum5 === void 0 ? void 0 : _locale$ProEnum5.requestError);
       }
     }
   }));
   var mergeData = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var cacheData, _useRequest$options2, _useRequest$options3, enumData, cacheCodes, codes, ignoreCodes, diff, response, res, _locale$ProEnum6;
-      return _regenerator().w(function (_context2) {
-        while (1) switch (_context2.n) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             cacheData = getEnumData(storage, cacheKey, baseEnumStorage) || {
               data: {}
             };
             if (!(_typeof(cacheData) === 'object')) {
-              _context2.n = 7;
+              _context2.next = 28;
               break;
             }
             if (!(_typeof(cacheData.data) === 'object' && cacheData.data !== null)) {
-              _context2.n = 7;
+              _context2.next = 28;
               break;
             }
             enumData = cacheData.data;
             cacheCodes = Object.keys(enumData);
-            codes = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.codes) || []; // 缓存的所有 codes
-            ignoreCodes = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.ignoreCodes) || []; // 忽略清洗的 codes
+            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.n = 6;
+              _context2.next = 27;
               break;
             }
-            _context2.n = 1;
+            _context2.next = 11;
             return useRequest === null || useRequest === void 0 ? void 0 : useRequest.service();
-          case 1:
-            res = _context2.v;
+          case 11:
+            res = _context2.sent;
             if (!(transformResponse && typeof transformResponse === 'function')) {
-              _context2.n = 4;
+              _context2.next = 20;
               break;
             }
-            _context2.n = 2;
+            _context2.next = 15;
             return transformResponse(res);
-          case 2:
-            response = _context2.v;
+          case 15:
+            response = _context2.sent;
             if (!(_typeof(response) !== 'object' || response == null)) {
-              _context2.n = 3;
+              _context2.next = 18;
               break;
             }
-            throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum6 = locale.ProEnum) === null || _locale$ProEnum6 === void 0 ? void 0 : _locale$ProEnum6.errorMessage);
-          case 3:
-            _context2.n = 5;
+            throw new Error(locale === null || locale === void 0 || (_locale$ProEnum6 = locale.ProEnum) === null || _locale$ProEnum6 === void 0 ? void 0 : _locale$ProEnum6.errorMessage);
+          case 18:
+            _context2.next = 21;
             break;
-          case 4:
+          case 20:
             if (res.status === 200) {
               response = res.data;
             }
-          case 5:
+          case 21:
             // 只返回fieldNames对象的key
             if (clear) {
               Object.keys(response).forEach(function (key) {
@@ -230,9 +233,9 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
               type: 'setProEnumDic',
               payload: _objectSpread(_objectSpread(_objectSpread({}, dics), dataSource), cacheData.data)
             });
-            _context2.n = 7;
+            _context2.next = 28;
             break;
-          case 6:
+          case 27:
             if (dataSource && Object.keys(dataSource)) {
               // 子系统也可能会有 dataSource
               dispatch({
@@ -240,8 +243,9 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
                 payload: _objectSpread(_objectSpread({}, dics), dataSource)
               });
             }
-          case 7:
-            return _context2.a(2);
+          case 28:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
     }));
@@ -250,7 +254,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     };
   }();
   useDeepCompareEffect(function () {
-    if (useRequest && (useRequest === null || useRequest === void 0 ? void 0 : useRequest.service)) {
+    if (useRequest && useRequest !== null && useRequest !== void 0 && useRequest.service) {
       var _ref4 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
         defaultParams = _ref4.defaultParams;
       var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
@@ -259,6 +263,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
         window.sessionStorage.removeItem(cacheKey);
       }
       enumRes.run(params);
+
       // TODO 这段代码目前看起来是没啥用的、没起到作用
       mergeData();
     } else if (Object.keys(dataSource)) {
@@ -293,12 +298,12 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     if (main) {
       var _locale$ProEnum7;
       window.eventCenter.publish('zat-design-pro-component-event', {});
-      logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum7 = locale.ProEnum) === null || _locale$ProEnum7 === void 0 ? void 0 : _locale$ProEnum7.mainInitOnce);
+      logDebug(locale === null || locale === void 0 || (_locale$ProEnum7 = locale.ProEnum) === null || _locale$ProEnum7 === void 0 ? void 0 : _locale$ProEnum7.mainInitOnce);
     }
     if (!main && share) {
       var _locale$ProEnum8;
       window.eventCenter.subscribe('zat-design-pro-component-event', shareProEnumDic);
-      logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum8 = locale.ProEnum) === null || _locale$ProEnum8 === void 0 ? void 0 : _locale$ProEnum8.sonInitEvent);
+      logDebug(locale === null || locale === void 0 || (_locale$ProEnum8 = locale.ProEnum) === null || _locale$ProEnum8 === void 0 ? void 0 : _locale$ProEnum8.sonInitEvent);
     }
     return function () {
       window.eventCenter.unsubscribe('zat-design-pro-component-event', shareProEnumDic);