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

package/es/ProEditTable/utils/tools.js

@@ -1,4 +1,3 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
@@ -11,6 +10,8 @@ import _isObject from "lodash/isObject";
 import _isString from "lodash/isString";
 import _cloneDeepWith from "lodash/cloneDeepWith";
 import _cloneDeep from "lodash/cloneDeep";
+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); }
 /* eslint-disable no-await-in-loop */
 /* eslint-disable no-restricted-syntax */
 import React from 'react';
@@ -214,12 +215,12 @@ export var handleScrollToError = function handleScrollToError() {
         var childOffsetTop = 0;
         while (previousSibling) {
           if (previousSibling.nodeType === 1) {
-            var _previousSibling, _previousSibling$clas, _previousSibling$clas2, _previousSibling$clas3;
+            var _previousSibling, _previousSibling$clas, _previousSibling$clas2;
             var _ref4 = previousSibling.getBoundingClientRect() || {},
               _ref4$width = _ref4.width,
               width = _ref4$width === void 0 ? 0 : _ref4$width;
             childOffsetLeft += width;
-            if ((_previousSibling = previousSibling) === null || _previousSibling === void 0 ? void 0 : (_previousSibling$clas = _previousSibling.classList) === null || _previousSibling$clas === void 0 ? void 0 : (_previousSibling$clas2 = (_previousSibling$clas3 = _previousSibling$clas).contains) === null || _previousSibling$clas2 === void 0 ? void 0 : _previousSibling$clas2.call(_previousSibling$clas3, 'ant-table-cell-fix-left')) {
+            if ((_previousSibling = previousSibling) === null || _previousSibling === void 0 ? void 0 : (_previousSibling$clas = _previousSibling.classList) === null || _previousSibling$clas === void 0 ? void 0 : (_previousSibling$clas2 = _previousSibling$clas.contains) === null || _previousSibling$clas2 === void 0 ? void 0 : _previousSibling$clas2.call(_previousSibling$clas, 'ant-table-cell-fix-left')) {
               childFixedLeft += width;
             }
           }
@@ -272,11 +273,11 @@ var _isNull = function isNull(value) {
   return value === '' || value === undefined || value === null || Array.isArray(value) && value.length === 0;
 };
 var handleCheckCellValue = /*#__PURE__*/function () {
-  var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(column, record) {
+  var _ref6 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(column, record) {
     var _column$names, _column$names2, _rules2;
-    var value, _required, _rules, _labelRequired, res, _iterator, _step, rule;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+    var value, _required, _rules, _labelRequired, res, _iterator, _step, rule, _t, _t2;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.p = _context.n) {
         case 0:
           value = null;
           if (column.name) {
@@ -300,81 +301,78 @@ var handleCheckCellValue = /*#__PURE__*/function () {
             _labelRequired = column.labelRequired(value, record);
           }
           if (!(((_column$names2 = column.names) === null || _column$names2 === void 0 ? void 0 : _column$names2.length) && _labelRequired !== null && _labelRequired !== undefined && _isNull(value))) {
-            _context.next = 11;
+            _context.n = 1;
             break;
           }
-          return _context.abrupt("return", false);
-        case 11:
+          return _context.a(2, false);
+        case 1:
           if (!(_required && _isNull(value))) {
-            _context.next = 13;
+            _context.n = 2;
             break;
           }
-          return _context.abrupt("return", false);
-        case 13:
+          return _context.a(2, false);
+        case 2:
           if (!((_rules2 = _rules) === null || _rules2 === void 0 ? void 0 : _rules2.length)) {
-            _context.next = 44;
+            _context.n = 15;
             break;
           }
           res = true;
           _iterator = _createForOfIteratorHelper(_rules);
-          _context.prev = 16;
+          _context.p = 3;
           _iterator.s();
-        case 18:
+        case 4:
           if ((_step = _iterator.n()).done) {
-            _context.next = 35;
+            _context.n = 11;
             break;
           }
           rule = _step.value;
           if (res) {
-            _context.next = 22;
+            _context.n = 5;
             break;
           }
-          return _context.abrupt("break", 35);
-        case 22:
+          return _context.a(3, 11);
+        case 5:
           if (rule.required && _isNull(value)) {
             res = false;
           }
           if (!_isFunction(rule.validator)) {
-            _context.next = 32;
+            _context.n = 9;
             break;
           }
-          _context.prev = 24;
-          _context.next = 27;
+          _context.p = 6;
+          _context.n = 7;
           return rule.validator('', value);
-        case 27:
-          _context.next = 32;
+        case 7:
+          _context.n = 9;
           break;
-        case 29:
-          _context.prev = 29;
-          _context.t0 = _context["catch"](24);
+        case 8:
+          _context.p = 8;
+          _t = _context.v;
           res = false;
-        case 32:
+        case 9:
           if (rule.type && !validate[rule.type](value)) {
             res = false;
           }
-        case 33:
-          _context.next = 18;
+        case 10:
+          _context.n = 4;
           break;
-        case 35:
-          _context.next = 40;
+        case 11:
+          _context.n = 13;
           break;
-        case 37:
-          _context.prev = 37;
-          _context.t1 = _context["catch"](16);
-          _iterator.e(_context.t1);
-        case 40:
-          _context.prev = 40;
+        case 12:
+          _context.p = 12;
+          _t2 = _context.v;
+          _iterator.e(_t2);
+        case 13:
+          _context.p = 13;
           _iterator.f();
-          return _context.finish(40);
-        case 43:
-          return _context.abrupt("return", res);
-        case 44:
-          return _context.abrupt("return", true);
-        case 45:
-        case "end":
-          return _context.stop();
+          return _context.f(13);
+        case 14:
+          return _context.a(2, res);
+        case 15:
+          return _context.a(2, true);
       }
-    }, _callee, null, [[16, 37, 40, 43], [24, 29]]);
+    }, _callee, null, [[6, 8], [3, 12, 13, 14]]);
   }));
   return function handleCheckCellValue(_x, _x2) {
     return _ref6.apply(this, arguments);
@@ -384,14 +382,14 @@ var handleCheckCellValue = /*#__PURE__*/function () {
  * 分页校验
  */
 export var onPageCheck = /*#__PURE__*/function () {
-  var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref7) {
-    var form, name, value, columns, setState, page, pagination, isView, disabled, pageNum, pageSize, pageArr, flag, errorNum, errorPageNum, _i, _pageArr, item, start, end, nextValues, _iterator2, _step2, record, _iterator3, _step3, column, result, nextState;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+  var _ref8 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref7) {
+    var form, name, value, columns, setState, page, pagination, isView, disabled, pageNum, pageSize, pageArr, flag, errorNum, errorPageNum, _i, _pageArr, item, start, end, nextValues, _iterator2, _step2, record, _iterator3, _step3, column, result, nextState, _t3, _t4, _t5, _t6;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.p = _context2.n) {
         case 0:
           form = _ref7.form, name = _ref7.name, value = _ref7.value, columns = _ref7.columns, setState = _ref7.setState, page = _ref7.page, pagination = _ref7.pagination, isView = _ref7.isView, disabled = _ref7.disabled;
           if (!(pagination && !isView && !disabled)) {
-            _context2.next = 72;
+            _context2.n = 24;
             break;
           }
           pageNum = page.pageNum, pageSize = page.pageSize;
@@ -404,18 +402,18 @@ export var onPageCheck = /*#__PURE__*/function () {
           errorNum = 0;
           errorPageNum = 0;
           _i = 0, _pageArr = pageArr;
-        case 8:
+        case 1:
           if (!(_i < _pageArr.length)) {
-            _context2.next = 60;
+            _context2.n = 20;
             break;
           }
           item = _pageArr[_i];
           if (!flag) {
-            _context2.next = 12;
+            _context2.n = 2;
             break;
           }
-          return _context2.abrupt("break", 60);
-        case 12:
+          return _context2.a(3, 20);
+        case 2:
           errorNum = 0;
           // 实现思路：截取每一页数据，手动触发每一行数据的校验，通过column配置的rule规则，
           // 依次校验每一页数据，有错误就跳出循环，跳转到错误页数，并展示错误单元格数量
@@ -423,77 +421,77 @@ export var onPageCheck = /*#__PURE__*/function () {
           end = tools.calc(start, '+', pageSize);
           nextValues = value === null || value === void 0 ? void 0 : value.slice(start, end);
           _iterator2 = _createForOfIteratorHelper(nextValues);
-          _context2.prev = 17;
+          _context2.p = 3;
           _iterator2.s();
-        case 19:
+        case 4:
           if ((_step2 = _iterator2.n()).done) {
-            _context2.next = 48;
+            _context2.n = 15;
             break;
           }
           record = _step2.value;
           _iterator3 = _createForOfIteratorHelper(columns);
-          _context2.prev = 22;
+          _context2.p = 5;
           _iterator3.s();
-        case 24:
+        case 6:
           if ((_step3 = _iterator3.n()).done) {
-            _context2.next = 38;
+            _context2.n = 11;
             break;
           }
           column = _step3.value;
-          _context2.prev = 26;
-          _context2.next = 29;
+          _context2.p = 7;
+          _context2.n = 8;
           return handleCheckCellValue(column, record);
-        case 29:
-          result = _context2.sent;
+        case 8:
+          result = _context2.v;
           if (!result) {
             errorNum += 1;
           }
-          _context2.next = 36;
+          _context2.n = 10;
           break;
-        case 33:
-          _context2.prev = 33;
-          _context2.t0 = _context2["catch"](26);
+        case 9:
+          _context2.p = 9;
+          _t3 = _context2.v;
           errorNum += 1;
-        case 36:
-          _context2.next = 24;
+        case 10:
+          _context2.n = 6;
           break;
-        case 38:
-          _context2.next = 43;
+        case 11:
+          _context2.n = 13;
           break;
-        case 40:
-          _context2.prev = 40;
-          _context2.t1 = _context2["catch"](22);
-          _iterator3.e(_context2.t1);
-        case 43:
-          _context2.prev = 43;
+        case 12:
+          _context2.p = 12;
+          _t4 = _context2.v;
+          _iterator3.e(_t4);
+        case 13:
+          _context2.p = 13;
           _iterator3.f();
-          return _context2.finish(43);
-        case 46:
-          _context2.next = 19;
+          return _context2.f(13);
+        case 14:
+          _context2.n = 4;
           break;
-        case 48:
-          _context2.next = 53;
+        case 15:
+          _context2.n = 17;
           break;
-        case 50:
-          _context2.prev = 50;
-          _context2.t2 = _context2["catch"](17);
-          _iterator2.e(_context2.t2);
-        case 53:
-          _context2.prev = 53;
+        case 16:
+          _context2.p = 16;
+          _t5 = _context2.v;
+          _iterator2.e(_t5);
+        case 17:
+          _context2.p = 17;
           _iterator2.f();
-          return _context2.finish(53);
-        case 56:
+          return _context2.f(17);
+        case 18:
           if (errorNum > 0) {
             flag = true;
             errorPageNum = item;
           }
-        case 57:
+        case 19:
           _i++;
-          _context2.next = 8;
+          _context2.n = 1;
           break;
-        case 60:
+        case 20:
           if (!(flag && errorNum > 0)) {
-            _context2.next = 72;
+            _context2.n = 24;
             break;
           }
           nextState = {
@@ -506,23 +504,22 @@ export var onPageCheck = /*#__PURE__*/function () {
             };
           }
           setState(nextState);
-          _context2.prev = 64;
-          _context2.next = 67;
+          _context2.p = 21;
+          _context2.n = 22;
           return form.validateFields([name], {
             recursive: true
           });
-        case 67:
-          _context2.next = 72;
+        case 22:
+          _context2.n = 24;
           break;
-        case 69:
-          _context2.prev = 69;
-          _context2.t3 = _context2["catch"](64);
+        case 23:
+          _context2.p = 23;
+          _t6 = _context2.v;
           handleScrollToError();
-        case 72:
-        case "end":
-          return _context2.stop();
+        case 24:
+          return _context2.a(2);
       }
-    }, _callee2, null, [[17, 50, 53, 56], [22, 40, 43, 46], [26, 33], [64, 69]]);
+    }, _callee2, null, [[21, 23], [7, 9], [5, 12, 13, 14], [3, 16, 17, 18]]);
   }));
   return function onPageCheck(_x3) {
     return _ref8.apply(this, arguments);

package/es/ProEditTable/utils/useEditTableError.js

@@ -10,8 +10,9 @@ var useEditTableError = function useEditTableError(_ref) {
     errorLength = _useState2[0],
     setErrorLength = _useState2[1];
   useEffect(function () {
+    var _containerNode$childr3;
     // 如果 isEnabled 为 false 或容器节点不存在，直接跳过监听
-    if (!isEnabled || !containerNode) {
+    if (!isEnabled || !containerNode || !(containerNode === null || containerNode === void 0 ? void 0 : containerNode.querySelector)) {
       return; // 如果未启用监听或容器节点不存在，直接返回
     }
     // 防抖处理：将 setErrorLength 函数进行防抖
@@ -25,8 +26,9 @@ var useEditTableError = function useEditTableError(_ref) {
           var target = mutation.target;
           // 检查目标节点是否包含指定的类
           if (target.classList.contains(className)) {
+            var _containerNode$childr;
             // 查找所有包含 className 的节点
-            var errorNodes = containerNode.querySelectorAll(".".concat(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));
             // 过滤这些节点，只保留那些类名完全为 `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');
@@ -46,8 +48,9 @@ var useEditTableError = function useEditTableError(_ref) {
           // 检查删除的节点是否包含指定的类名
           mutation.removedNodes.forEach(function (removedNode) {
             if (removedNode instanceof HTMLElement && removedNode.classList.contains('ant-table-row')) {
+              var _containerNode$childr2;
               // 更新错误数量
-              var _errorNodes = containerNode.querySelectorAll(".".concat(className));
+              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));
               if (errorLength === 0) {
                 debouncedSetErrorLength(0);
               }
@@ -68,7 +71,12 @@ var useEditTableError = function useEditTableError(_ref) {
       childList: true
     };
     // 启动 MutationObserver
-    observer.observe(containerNode.querySelector('tbody'), config);
+    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');
+    if (targetNode instanceof HTMLElement) {
+      observer.observe(targetNode, config);
+    } else {
+      console.error('warning: tbody element not found or invalid');
+    }
     // 清理 MutationObserver 和防抖定时器
     return function () {
       observer.disconnect();

package/es/ProEnum/hooks/useEnumRequest.js

@@ -1,15 +1,16 @@
-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 } from '../utils';
+import { diffCode, getEnumData, setEnumData, cacheFieldNames, baseCacheKey } from '../utils';
 import locale from '../../locale';
 import '../utils/eventCenter';
-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;
+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 || {},
     _ref2$main = _ref2.main,
@@ -25,7 +26,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
       children: 'children'
     } : _ref2$fieldNames,
     _ref2$cacheKey = _ref2.cacheKey,
-    cacheKey = _ref2$cacheKey === void 0 ? 'zat-design-pro-component-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,
@@ -52,40 +53,40 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     staleTime: 6e4 * 60
   }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
     setCache: function () {
-      var _setCache = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
+      var _setCache = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(res) {
         var response, _locale$ProEnum2, _useRequest$options, ignoreCodes, cacheData;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+        return _regenerator().w(function (_context) {
+          while (1) switch (_context.n) {
             case 0:
               response = res.data;
               if (!(transformResponse && typeof transformResponse === 'function')) {
-                _context.next = 10;
+                _context.n = 3;
                 break;
               }
-              _context.next = 4;
+              _context.n = 1;
               return transformResponse(res.data);
-            case 4:
-              response = _context.sent;
+            case 1:
+              response = _context.v;
               if (!(_typeof(response) !== 'object' || response == null)) {
-                _context.next = 9;
+                _context.n = 2;
                 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 9:
+            case 2:
               res.data = response;
-            case 10:
+            case 3:
               if (!(_typeof(response) !== 'object' || response === null)) {
-                _context.next = 12;
+                _context.n = 4;
                 break;
               }
               throw Error('response enum data must be object');
-            case 12:
+            case 4:
               if (!(Object.keys(response).length === 0)) {
-                _context.next = 14;
+                _context.n = 5;
                 break;
               }
               throw Error('Please return valid enumeration data');
-            case 14:
+            case 5:
               // 只返回fieldNames对象的key
               if (clear) {
                 // 忽略清洗的 codes
@@ -94,7 +95,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
                   if (!response[key] || !Array.isArray(response[key])) {
                     return;
                   }
-                  var options = _toConsumableArray(response[key]) || [];
+                  var options = _toConsumableArray(response[key]);
                   if (ignoreCodes.includes(key)) {
                     response[key] = options;
                   } else {
@@ -122,10 +123,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
                   logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum3 = locale.ProEnum) === null || _locale$ProEnum3 === void 0 ? void 0 : _locale$ProEnum3.mainInitByRequest);
                 }, 10000);
               }
-              return _context.abrupt("return", res);
-            case 21:
-            case "end":
-              return _context.stop();
+              return _context.a(2, res);
           }
         }, _callee);
       }));
@@ -162,20 +160,20 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     }
   }));
   var mergeData = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
       var cacheData, _useRequest$options2, _useRequest$options3, enumData, cacheCodes, codes, ignoreCodes, diff, response, res, _locale$ProEnum6;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regenerator().w(function (_context2) {
+        while (1) switch (_context2.n) {
           case 0:
             cacheData = getEnumData(storage, cacheKey, baseEnumStorage) || {
               data: {}
             };
             if (!(_typeof(cacheData) === 'object')) {
-              _context2.next = 28;
+              _context2.n = 7;
               break;
             }
             if (!(_typeof(cacheData.data) === 'object' && cacheData.data !== null)) {
-              _context2.next = 28;
+              _context2.n = 7;
               break;
             }
             enumData = cacheData.data;
@@ -184,38 +182,38 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
             ignoreCodes = (useRequest === null || useRequest === void 0 ? 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 = 27;
+              _context2.n = 6;
               break;
             }
-            _context2.next = 11;
+            _context2.n = 1;
             return useRequest === null || useRequest === void 0 ? void 0 : useRequest.service();
-          case 11:
-            res = _context2.sent;
+          case 1:
+            res = _context2.v;
             if (!(transformResponse && typeof transformResponse === 'function')) {
-              _context2.next = 20;
+              _context2.n = 4;
               break;
             }
-            _context2.next = 15;
+            _context2.n = 2;
             return transformResponse(res);
-          case 15:
-            response = _context2.sent;
+          case 2:
+            response = _context2.v;
             if (!(_typeof(response) !== 'object' || response == null)) {
-              _context2.next = 18;
+              _context2.n = 3;
               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 18:
-            _context2.next = 21;
+          case 3:
+            _context2.n = 5;
             break;
-          case 20:
+          case 4:
             if (res.status === 200) {
               response = res.data;
             }
-          case 21:
+          case 5:
             // 只返回fieldNames对象的key
             if (clear) {
               Object.keys(response).forEach(function (key) {
-                var options = _toConsumableArray(response[key]) || [];
+                var options = _toConsumableArray(response[key]);
                 if (ignoreCodes.includes(key)) {
                   response[key] = options;
                 } else {
@@ -232,9 +230,9 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
               type: 'setProEnumDic',
               payload: _objectSpread(_objectSpread(_objectSpread({}, dics), dataSource), cacheData.data)
             });
-            _context2.next = 28;
+            _context2.n = 7;
             break;
-          case 27:
+          case 6:
             if (dataSource && Object.keys(dataSource)) {
               // 子系统也可能会有 dataSource
               dispatch({
@@ -242,9 +240,8 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
                 payload: _objectSpread(_objectSpread({}, dics), dataSource)
               });
             }
-          case 28:
-          case "end":
-            return _context2.stop();
+          case 7:
+            return _context2.a(2);
         }
       }, _callee2);
     }));