xydata-tools 1.1.19 → 1.1.20

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

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

package/dist/utils/request.js

@@ -9,9 +9,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 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";
@@ -51,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 xyRequest = extend({
-  errorHandler: errorHandler
-});
-
-// request拦截器
-xyRequest.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拦截器
-xyRequest.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 - 请求地址
@@ -191,30 +122,92 @@ xyRequest.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", xyRequest(url, _objectSpread({
+          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
-          }, options)));
-        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 { xyRequest, doRequest };
 export default doRequest;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xydata-tools",
-	"version": "1.1.19",
+	"version": "1.1.20",
 	"description": "xydata tools",
 	"main": "dist/index.js",
 	"module": "dist/index.js",