@zgfe/business-lib 1.1.82-user.3 → 1.1.82-user.4

package/es/utils/ajax.js

@@ -36,7 +36,9 @@ var errorHandler = function errorHandler(error) {
     });
   } else if (!response) {
     if (Request.isCancel(error) || (error === null || error === void 0 ? void 0 : error.type) === 'AbortError') {
-      throw error;
+      var abortError = new Error('AbortError');
+      abortError.isCancel = true;
+      throw abortError;
     }
     notification.error({
       description: '您的网络发生异常，无法连接服务器',
@@ -161,14 +163,20 @@ function _request() {
         case 26:
           _context.prev = 26;
           _context.t0 = _context["catch"](0);
-          if (!(_context.t0.message === 'Request Interruption')) {
+          if (!_context.t0.isCancel) {
             _context.next = 30;
             break;
           }
-          throw new Error('Request Interruption');
+          throw _context.t0;
         case 30:
+          if (!(_context.t0.message === 'Request Interruption')) {
+            _context.next = 32;
+            break;
+          }
+          throw new Error('Request Interruption');
+        case 32:
           return _context.abrupt("return", null);
-        case 31:
+        case 33:
         case "end":
           return _context.stop();
       }

package/es/utils/demo/interruption.js

@@ -1,38 +1,40 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Button, message } from 'antd';
 import React from 'react';
 import { ajax } from '@zgfe/business-lib';
-import Request from 'umi-request';
-var CancelToken = Request.CancelToken;
-var cancel;
+import InnerDemo from '../../demoWrapper/innerDemo';
 export default (function () {
+  var _React$useState = React.useState(),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    controller = _React$useState2[0],
+    setController = _React$useState2[1];
   var getPanels = function getPanels() {
-    if (typeof cancel === 'function') {
-      cancel();
-    }
+    var control = new AbortController();
+    var signal = control.signal;
+    controller === null || controller === void 0 ? void 0 : controller.abort();
+    setController(control);
     ajax('/zg/web/v2/apppanel/panels', {
       method: 'post',
       data: {
         appId: 501648,
         platform: 0
       },
-      cancelToken: new CancelToken(function executor(c) {
-        cancel = c;
-      }),
-      responseWrapper: function responseWrapper(_url, res) {
-        if (/07$/.test(res.code)) {
-          console.log('reLogin-----');
-          throw new Error('reLogin');
-        }
-        return res;
-      }
+      signal: signal
     }).then(function (res) {
       if (!res) return;
       message.success('请求成功');
     }).catch(function (e) {
-      console.log(e);
+      if (e.isCancel) {
+        console.log('请求被取消了');
+      }
     });
   };
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Button, {
+  return /*#__PURE__*/React.createElement(InnerDemo, null, /*#__PURE__*/React.createElement(Button, {
     onClick: getPanels
   }, "\u8BF7\u6C42\u63A5\u53E3"));
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.82-user.3",
+  "version": "1.1.82-user.4",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -55,7 +55,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "16fb86446971d7caf7832ab1f46d204f95c514aa",
+  "gitHead": "b7fe45b6a2a770e850361bd6e4e7b0b868a18c5e",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }