xydata-tools 1.1.31 → 1.1.33

package/README.md

@@ -25,7 +25,7 @@ react
 uniapp
 
 1. 在项目根目录执行：
-
+ .
     ```bash
     yarn dev
     ```

package/dist/components/xyAuthLayout/index.js

@@ -227,6 +227,7 @@ var removeSessionData = function removeSessionData() {
   removeSessionStorage('Token');
   removeSessionStorage('sso_redirect_url');
 };
+var aaaLoginUrl = null;
 
 // ========== 组件定义 ==========
 
@@ -244,6 +245,7 @@ var XyAuthLayout = function XyAuthLayout(props) {
   var loginType = envData.login_type || 'BOTH';
   var pathName = window.location.pathname;
   var loginId = getQueryVariable('loginId');
+  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登录
@@ -252,7 +254,7 @@ var XyAuthLayout = function XyAuthLayout(props) {
         envData.sso_type === 'new' ? ssoTypeByNew() : ssoTypeByOld();
       } else {
         // 其他情况跳转到AAA登录
-        window.location.href = "".concat(window.publicPath || '/', "user/login");
+        window.location.href = aaaLoginUrl;
       }
     } else {
       // 当有TOKEN或者AAA登录并携带loginId时可进入
@@ -370,30 +372,30 @@ export var logout = /*#__PURE__*/function () {
           // 当 loginType 为 BOTH 时，根据 sessionStorage 中的 'sso_redirect_url' 判断实际登录方式
           // 有 'sso_redirect_url' 说明使用的是 SSO 登录,否则是 AAA 登录
           actualLoginType = loginType;
+          redirectUrl = getSessionStorage('sso_redirect_url');
           if (loginType === 'BOTH') {
-            redirectUrl = getSessionStorage('sso_redirect_url');
             actualLoginType = redirectUrl ? 'SSO' : 'AAA';
           }
           if (!(actualLoginType === 'AAA')) {
-            _context5.next = 16;
+            _context5.next = 17;
             break;
           }
-          _context5.prev = 4;
-          _context5.next = 7;
+          _context5.prev = 5;
+          _context5.next = 8;
           return accountAAALogout({});
-        case 7:
+        case 8:
           removeSessionData();
-          _context5.next = 13;
+          _context5.next = 14;
           break;
-        case 10:
-          _context5.prev = 10;
-          _context5.t0 = _context5["catch"](4);
+        case 11:
+          _context5.prev = 11;
+          _context5.t0 = _context5["catch"](5);
           console.error('AAA 退出登录失败:', _context5.t0);
-        case 13:
-          window.location.href = "".concat(window.publicPath || '/', "user/login");
-          _context5.next = 17;
+        case 14:
+          window.location.href = aaaLoginUrl;
+          _context5.next = 18;
           break;
-        case 16:
+        case 17:
           try {
             fetch('/auth/logout', {
               headers: getCommonHeaders()
@@ -405,15 +407,14 @@ export var logout = /*#__PURE__*/function () {
             removeSessionData();
           } catch (e) {
             console.error('SSO 退出登录失败:', e);
-            // 即使退出失败,也清理本地数据并跳转到登录页
             removeSessionData();
-            window.location.href = "".concat(window.publicPath || '/', "user/login");
+            window.location.href = redirectUrl;
           }
-        case 17:
+        case 18:
         case "end":
           return _context5.stop();
       }
-    }, _callee5, null, [[4, 10]]);
+    }, _callee5, null, [[5, 11]]);
   }));
   return function logout() {
     return _ref5.apply(this, arguments);
@@ -450,7 +451,7 @@ export var handleUnauthorized = function handleUnauthorized(envData) {
       return;
     }
     // AAA 登录过期,跳转到 AAA 登录页面
-    window.location.href = "".concat(window.publicPath || '/', "user/login");
+    window.location.href = aaaLoginUrl;
   } else {
     // SSO 登录过期,重新进行 SSO 登录流程
     setSessionStorage('sso_redirect_url', window.location.href);

package/package.json

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