Merge pull request #2975 from hLinx/hotfix_3.8.x

feat: 登录小窗修改为使用window.open #2973
TencentBlueKing · May 13, 2024 · 99d15db · 99d15db
2 parents cf23fa7 + 37b75c3
commit 99d15db
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/frontend/package.json b/src/frontend/package.json
@@ -15,6 +15,7 @@
   "license": "ISC",
   "dependencies": {
     "@blueking/ip-selector": "0.3.0-beta.21",
+    "@blueking/login-modal": "1.0.4",
     "@blueking/notice-component-vue2": "2.0.0-beta.2",
     "@blueking/paas-login": "0.0.11",
     "@blueking/sub-saas": "0.0.0-beta.6",

diff --git a/src/frontend/src/utils/request/middleware/response.js b/src/frontend/src/utils/request/middleware/response.js
@@ -26,9 +26,9 @@
 import AuthResultModel from '@model/auth-result';
 
 import EventBus from '@utils/event-bus';
+import { showLoginModal } from '@blueking/login-modal'
 
 import {
-  loginDialog,
   messageError,
   permissionDialog,
   systemPermission,
@@ -93,7 +93,9 @@ export default (interceptors) => {
       // 未登录
       case 401:
         if (hasLogined) {
-          loginDialog(error.message);
+          showLoginModal({
+            loginUrl: `${error.message}&c_url=${decodeURIComponent(`${window.location.origin}/static/login_success.html`)}`
+          })
         } else {
           window.location.href = `${error.message}&c_url=${decodeURIComponent(window.location.href)}`;
         }

diff --git a/src/frontend/static/login_success.html b/src/frontend/static/login_success.html
@@ -33,7 +33,8 @@
     </head>
     <script>
         window.name = 'job'
-        window.parent.location.reload()
+        window.opener && window.opener.location.reload()
+        window.close()
     </script>
 
     <body style="font-family: Microsoft Yahei;">