xydata-tools 1.1.18 → 1.1.20

package/dist/types/utils/request.d.ts

@@ -1,8 +1,4 @@
 export default doRequest;
-/**
- * 配置request请求时的默认参数
- */
-export const request: import("umi-request").RequestMethod<false>;
 /**
  * 封装后的 doRequest 函数，保持与原有项目的参数兼容性
  * @param {string} url - 请求地址
@@ -10,4 +6,4 @@ export const request: import("umi-request").RequestMethod<false>;
  * @param {Object} data - 请求体数据
  * @param {Object} options - 额外配置
  */
-export function doRequest(url: string, method: string, data?: any, options?: any): Promise<any>;
+declare function doRequest(url: string, method: string, data?: any, options?: any): Promise<any>;

package/dist/utils/request.js

@@ -1,12 +1,15 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+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); }
 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); }); }; }
 /**
  * request 网络请求工具
- * api 文档: https://github.com/umijs/umi-request/blob/master/README_zh-CN.md
  */
-import { extend } from 'umi-request';
 import { notification, message } from 'antd';
 import { getSessionStorage } from "./token.js";
 import { handleUnauthorized } from "../components";
@@ -46,139 +49,72 @@ var CODE_MESSAGE = {
 
 // 请求异常处理程序。进入错误回调的，只会返回false。
 var errorHandler = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(error) {
-    var response, errorText, status, url, errorData, rspMsg;
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
+    var errorText, status, url, errorData, rspMsg;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          response = error.response;
           if (!(response && response.status)) {
-            _context.next = 23;
+            _context.next = 22;
             break;
           }
           errorText = CODE_MESSAGE[response.status] || response.statusText;
           status = response.status, url = response.url;
-          _context.prev = 4;
-          _context.next = 7;
+          _context.prev = 3;
+          _context.next = 6;
           return response.json();
-        case 7:
+        case 6:
           errorData = _context.sent;
           rspMsg = errorData.rspMsg;
           if (rspMsg) {
             message.error(rspMsg);
           }
           if (!(status == 401)) {
-            _context.next = 14;
+            _context.next = 13;
             break;
           }
           handleUnauthorized(ENV_DATA);
-          _context.next = 16;
+          _context.next = 15;
           break;
-        case 14:
+        case 13:
           if (!(status !== 200)) {
-            _context.next = 16;
+            _context.next = 15;
             break;
           }
           throw new Error();
-        case 16:
-          _context.next = 21;
+        case 15:
+          _context.next = 20;
           break;
-        case 18:
-          _context.prev = 18;
-          _context.t0 = _context["catch"](4);
+        case 17:
+          _context.prev = 17;
+          _context.t0 = _context["catch"](3);
           notification.error({
             message: "\u8BF7\u6C42\u9519\u8BEF ".concat(status, ": ").concat(url),
             description: errorText
           });
-        case 21:
-          _context.next = 24;
+        case 20:
+          _context.next = 23;
           break;
-        case 23:
+        case 22:
           if (!response) {
-            console.error(error);
             notification.error({
               message: '网络异常',
               description: '您的网络发生异常，无法连接服务器'
             });
           }
-        case 24:
+        case 23:
           return _context.abrupt("return", false);
-        case 25:
+        case 24:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[4, 18]]);
+    }, _callee, null, [[3, 17]]);
   }));
   return function errorHandler(_x) {
     return _ref.apply(this, arguments);
   };
 }();
 
-/**
- * 配置request请求时的默认参数
- */
-var request = extend({
-  errorHandler: errorHandler
-});
-
-// request拦截器
-request.interceptors.request.use(function (url, options) {
-  options.headers = {
-    'Content-Type': 'application/json; charset=utf-8',
-    Accept: 'application/json',
-    UserId: getSessionStorage('userId'),
-    OrgId: getSessionStorage('orgId'),
-    service: getSessionStorage('service') || 'unknown',
-    SID: SID
-  };
-  // 过滤不需要TOKEN的请求，统一加上Authorization
-  if (!NO_TOKEN_URLS.includes(url)) {
-    // TOKEN在每次调用的时候获取最新值
-    var token = getSessionStorage('Token');
-    options.headers.Authorization = token ? "Bearer ".concat(token) : '';
-  }
-  return {
-    url: url,
-    options: options
-  };
-});
-
-// response拦截器
-request.interceptors.response.use( /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(response, options) {
-    var data, rspCode;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          if (!response.ok) {
-            _context2.next = 7;
-            break;
-          }
-          _context2.next = 3;
-          return response.clone().json();
-        case 3:
-          data = _context2.sent;
-          rspCode = data.rspCode; // 状态编码只有在已定义的，需要处理的编码里才会返回响应，否则会进入错误回调
-          if (!(rspCode && PROCESS_RESPONSE_CODES.includes(rspCode))) {
-            _context2.next = 7;
-            break;
-          }
-          return _context2.abrupt("return", data);
-        case 7:
-          throw {
-            response: response
-          };
-        case 8:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2);
-  }));
-  return function (_x2, _x3) {
-    return _ref2.apply(this, arguments);
-  };
-}());
-
 /**
  * 封装后的 doRequest 函数，保持与原有项目的参数兼容性
  * @param {string} url - 请求地址
@@ -186,30 +122,92 @@ request.interceptors.response.use( /*#__PURE__*/function () {
  * @param {Object} data - 请求体数据
  * @param {Object} options - 额外配置
  */
-function doRequest(_x4, _x5) {
+function doRequest(_x2, _x3) {
   return _doRequest.apply(this, arguments);
 }
 function _doRequest() {
-  _doRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(url, method) {
+  _doRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(url, method) {
     var data,
       options,
-      _args3 = arguments;
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+      headers,
+      token,
+      response,
+      fetchOptions,
+      result,
+      rspCode,
+      _args2 = arguments;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          data = _args3.length > 2 && _args3[2] !== undefined ? _args3[2] : {};
-          options = _args3.length > 3 && _args3[3] !== undefined ? _args3[3] : {};
-          return _context3.abrupt("return", request(url, {
+          data = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : {};
+          options = _args2.length > 3 && _args2[3] !== undefined ? _args2[3] : {};
+          // 构建请求头（原 request 拦截器逻辑）
+          headers = {
+            'Content-Type': 'application/json; charset=utf-8',
+            Accept: 'application/json',
+            UserId: getSessionStorage('userId'),
+            OrgId: getSessionStorage('orgId'),
+            service: getSessionStorage('service') || 'unknown',
+            SID: SID
+          }; // 过滤不需要TOKEN的请求，统一加上Authorization
+          if (!NO_TOKEN_URLS.includes(url)) {
+            // TOKEN在每次调用的时候获取最新值
+            token = getSessionStorage('Token');
+            headers.Authorization = token ? "Bearer ".concat(token) : '';
+          }
+          _context2.prev = 4;
+          fetchOptions = {
             method: method,
-            data: data
-          }));
-        case 3:
+            headers: _objectSpread(_objectSpread({}, headers), options.headers)
+          }; // GET 请求不携带 body
+          if (method.toUpperCase() !== 'GET') {
+            fetchOptions.body = JSON.stringify(data);
+          }
+          _context2.next = 9;
+          return fetch(url, fetchOptions);
+        case 9:
+          response = _context2.sent;
+          _context2.next = 16;
+          break;
+        case 12:
+          _context2.prev = 12;
+          _context2.t0 = _context2["catch"](4);
+          // 网络异常，无法连接服务器
+          console.error(_context2.t0);
+          return _context2.abrupt("return", errorHandler(null));
+        case 16:
+          if (!response.ok) {
+            _context2.next = 30;
+            break;
+          }
+          _context2.prev = 17;
+          _context2.next = 20;
+          return response.clone().json();
+        case 20:
+          result = _context2.sent;
+          rspCode = result.rspCode; // 状态编码只有在已定义的，需要处理的编码里才会返回响应，否则会进入错误回调
+          if (!(rspCode && PROCESS_RESPONSE_CODES.includes(rspCode))) {
+            _context2.next = 24;
+            break;
+          }
+          return _context2.abrupt("return", result);
+        case 24:
+          _context2.next = 30;
+          break;
+        case 26:
+          _context2.prev = 26;
+          _context2.t1 = _context2["catch"](17);
+          // JSON 解析失败，按网络异常处理
+          console.error(_context2.t1);
+          return _context2.abrupt("return", errorHandler(null));
+        case 30:
+          return _context2.abrupt("return", errorHandler(response));
+        case 31:
         case "end":
-          return _context3.stop();
+          return _context2.stop();
       }
-    }, _callee3);
+    }, _callee2, null, [[4, 12], [17, 26]]);
   }));
   return _doRequest.apply(this, arguments);
 }
-export { request, doRequest };
 export default doRequest;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xydata-tools",
-	"version": "1.1.18",
+	"version": "1.1.20",
 	"description": "xydata tools",
 	"main": "dist/index.js",
 	"module": "dist/index.js",
@@ -66,6 +66,6 @@
 		"querystring": "0.2.1",
 		"react-json-view": "^1.21.3",
 		"styled-components": "4.4.1",
-		"umi-request": "^1.4.0"
+		"umi-request": "1.4.0"
 	}
 }