xydata-tools 1.1.32 → 1.1.34

package/dist/components/xyAuthLayout/index.js

@@ -166,14 +166,14 @@ var fetchSSO = /*#__PURE__*/function () {
  */
 var ssoTypeByOld = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-    var urlParams, code, commonHeaders, response, data, token;
+    var urlParams, code, commonHeaders, response, data;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
           urlParams = new URLSearchParams(window.location.search);
           code = urlParams.get('code');
           if (!code) {
-            _context3.next = 21;
+            _context3.next = 20;
             break;
           }
           commonHeaders = getCommonHeaders();
@@ -188,31 +188,30 @@ var ssoTypeByOld = /*#__PURE__*/function () {
           return response.json();
         case 10:
           data = _context3.sent;
-          token = data.data;
-          if (token) {
-            saveTokenAndRedirect(token);
-          } else if (data.rspCode !== '000000') {
-            message.error(data.rspMsg);
+          if (data.access_token) {
+            saveTokenAndRedirect(data.access_token);
+          } else if (data.rspCode === '000000' && data.data) {
+            saveTokenAndRedirect(data.data);
           } else {
-            message.error('token获取失败');
+            message.error(data.rspMsg || 'token获取失败');
           }
-          _context3.next = 19;
+          _context3.next = 18;
           break;
-        case 15:
-          _context3.prev = 15;
+        case 14:
+          _context3.prev = 14;
           _context3.t0 = _context3["catch"](4);
           console.error('/auth/token 错误:', _context3.t0);
           message.error('网络请求失败,请稍后重试');
-        case 19:
-          _context3.next = 22;
+        case 18:
+          _context3.next = 21;
           break;
-        case 21:
+        case 20:
           fetchSSO();
-        case 22:
+        case 21:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[4, 15]]);
+    }, _callee3, null, [[4, 14]]);
   }));
   return function ssoTypeByOld() {
     return _ref3.apply(this, arguments);
@@ -227,6 +226,7 @@ var removeSessionData = function removeSessionData() {
   removeSessionStorage('Token');
   removeSessionStorage('sso_redirect_url');
 };
+var aaaLoginUrl = null;
 
 // ========== 组件定义 ==========
 
@@ -244,7 +244,7 @@ var XyAuthLayout = function XyAuthLayout(props) {
   var loginType = envData.login_type || 'BOTH';
   var pathName = window.location.pathname;
   var loginId = getQueryVariable('loginId');
-  var aaaLoginUrl = envData.parent_login_url || "".concat(window.publicPath || '/', "user/login");
+  aaaLoginUrl = envData.parent_login_url || "".concat(window.publicPath || '/', "user/login");
   useEffect(function () {
     if (!token && !(loginId && ['BOTH', 'AAA'].includes(loginType))) {
       // 当登录方式为SSO_NEW或BOTH时，可在路径加上sso进行统一登陆，当登录方式固定为SSO或SSO_NEW时，直接跳转到SSO登录

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xydata-tools",
-	"version": "1.1.32",
+	"version": "1.1.34",
 	"description": "xydata tools",
 	"main": "dist/index.js",
 	"module": "dist/index.js",
@@ -61,9 +61,9 @@
 		"vue-template-compiler": "2.7.16"
 	},
 	"dependencies": {
-		"@zhengxs/js.tree": "0.5.0", 
+		"@zhengxs/js.tree": "0.5.0",
 		"querystring": "0.2.1",
 		"react-json-view": "^1.21.3",
 		"styled-components": "4.4.1"
 	}
-}
+}