xydata-tools 1.1.7 → 1.1.9

package/dist/components/xyAuthLayout/index.js

@@ -437,7 +437,8 @@ export var logout = /*#__PURE__*/function () {
  * }
  */
 export var handleUnauthorized = function handleUnauthorized(envData) {
-  var actualLoginType = envData.login_type || envData.aaaLogin !== undefined ? envData.aaaLogin ? 'AAA' : 'SSO' : 'BOTH';
+  // 这里兼容以前的aaaLogin属性
+  var actualLoginType = envData.login_type || (envData.aaaLogin !== undefined ? envData.aaaLogin ? 'AAA' : 'SSO' : 'BOTH');
   if (actualLoginType === 'BOTH') {
     var redirectUrl = getSessionStorage('sso_redirect_url');
     actualLoginType = redirectUrl ? 'SSO' : 'AAA';

package/dist/utils/request.js

@@ -37,24 +37,34 @@ var buildHeaders = function buildHeaders() {
  */
 var safeParseJSON = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
+    var text;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.prev = 0;
           _context.next = 3;
-          return response.json();
+          return response.text();
         case 3:
-          return _context.abrupt("return", _context.sent);
-        case 6:
-          _context.prev = 6;
-          _context.t0 = _context["catch"](0);
-          console.error('JSON 解析失败:', _context.t0);
+          text = _context.sent;
+          _context.prev = 4;
+          return _context.abrupt("return", JSON.parse(text));
+        case 8:
+          _context.prev = 8;
+          _context.t0 = _context["catch"](4);
+          return _context.abrupt("return", text);
+        case 11:
+          _context.next = 17;
+          break;
+        case 13:
+          _context.prev = 13;
+          _context.t1 = _context["catch"](0);
+          console.error('响应解析失败:', _context.t1);
           return _context.abrupt("return", null);
-        case 10:
+        case 17:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0, 6]]);
+    }, _callee, null, [[0, 13], [4, 8]]);
   }));
   return function safeParseJSON(_x) {
     return _ref.apply(this, arguments);
@@ -193,28 +203,54 @@ export default function doRequest(_x3, _x4, _x5, _x6) {
   return _doRequest.apply(this, arguments);
 }
 function _doRequest() {
-  _doRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(url, method, data, params) {
+  _doRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(url, method, data, params) {
     var options,
       headers,
-      _args3 = arguments;
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+      _args4 = arguments;
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
         case 0:
-          options = _args3.length > 4 && _args3[4] !== undefined ? _args3[4] : {};
+          options = _args4.length > 4 && _args4[4] !== undefined ? _args4[4] : {};
           headers = buildHeaders();
-          return _context3.abrupt("return", request(url, _objectSpread({
+          return _context4.abrupt("return", request(url, _objectSpread({
             method: method,
             params: params,
             data: data,
             headers: _objectSpread(_objectSpread({}, headers), options.headers),
             getResponse: true,
+            parseResponse: false,
+            // 禁用自动解析，手动处理
             skipErrorHandler: true
-          }, options)).then(handleSuccessResponse).catch(handleErrorResponse));
+          }, options)).then( /*#__PURE__*/function () {
+            var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref4) {
+              var response, data;
+              return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                while (1) switch (_context3.prev = _context3.next) {
+                  case 0:
+                    response = _ref4.response;
+                    _context3.next = 3;
+                    return safeParseJSON(response.clone());
+                  case 3:
+                    data = _context3.sent;
+                    return _context3.abrupt("return", {
+                      data: data,
+                      response: response
+                    });
+                  case 5:
+                  case "end":
+                    return _context3.stop();
+                }
+              }, _callee3);
+            }));
+            return function (_x7) {
+              return _ref5.apply(this, arguments);
+            };
+          }()).then(handleSuccessResponse).catch(handleErrorResponse));
         case 3:
         case "end":
-          return _context3.stop();
+          return _context4.stop();
       }
-    }, _callee3);
+    }, _callee4);
   }));
   return _doRequest.apply(this, arguments);
 }

package/package.json

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