From 70702c14a091df8ee5c950623e6c2bd9bb80bd64 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 21 Jul 2021 14:23:19 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E7=BB=84=E7=BB=87=E5=92=8C=E5=B7=A5=E4=BD=9C=E7=A9=BA?=
 =?UTF-8?q?=E9=97=B4=E4=B9=8B=E5=90=8E=E7=9A=84=E8=B7=B3=E8=BD=AC=20--bug?=
 =?UTF-8?q?=3D1003175=20--user=3D=E5=88=98=E7=91=9E=E6=96=8C=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=88=87=E6=8D=A2=E7=BB=84=E7=BB=87/=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=A9=BA=E9=97=B4...=20https://www.tapd.cn/55049933/s?=
 =?UTF-8?q?/1026983?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/business/components/api/router.js     |  1 +
 .../components/common/head/HeaderOrgWs.vue    | 20 ++++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/api/router.js b/frontend/src/business/components/api/router.js
index 4256c60088..6abb580c13 100644
--- a/frontend/src/business/components/api/router.js
+++ b/frontend/src/business/components/api/router.js
@@ -3,6 +3,7 @@ import MsProject from "@/business/components/settings/workspace/MsProject";
 export default {
   path: "/api",
   name: "api",
+  redirect: "/api/home",
   components: {
     content: () => import('@/business/components/api/ApiTest')
   },
diff --git a/frontend/src/business/components/common/head/HeaderOrgWs.vue b/frontend/src/business/components/common/head/HeaderOrgWs.vue
index 4c5fc9f0df..8fae069d76 100644
--- a/frontend/src/business/components/common/head/HeaderOrgWs.vue
+++ b/frontend/src/business/components/common/head/HeaderOrgWs.vue
@@ -1,6 +1,5 @@
 <template>
   <el-menu :unique-opened="true" mode="horizontal"
-           router
            class="header-user-menu align-right"
            :background-color="color"
            active-text-color="#fff"
@@ -148,6 +147,20 @@ export default {
         }
       });*/
     },
+    getRedirectUrl(user) {
+      // console.log(user);
+      if (!user.lastProjectId || !user.lastWorkspaceId) {
+        // 没有项目级的权限直接回到 /
+        // 只是某一个工作空间的用户组也转到 /
+        return "/";
+      }
+      let redirectUrl = sessionStorage.getItem('redirectUrl');
+      if (redirectUrl.startsWith("/")) {
+        redirectUrl = redirectUrl.substring(1);
+      }
+      redirectUrl = redirectUrl.split("/")[0];
+      return '/' + redirectUrl + '/';
+    },
     changeOrg(data) {
       let orgId = data.id;
       if (!orgId) {
@@ -160,13 +173,14 @@ export default {
         sessionStorage.setItem(WORKSPACE_ID, response.data.lastWorkspaceId);
         sessionStorage.setItem(PROJECT_ID, response.data.lastProjectId);
 
-        this.$router.push('/').then(() => {
+        this.$router.push(this.getRedirectUrl(response.data)).then(() => {
           this.reloadTopMenus();
         }).catch(err => err);
       });
     },
     changeWs(data) {
       let workspaceId = data.id;
+
       if (!workspaceId) {
         return false;
       }
@@ -177,7 +191,7 @@ export default {
         sessionStorage.setItem(WORKSPACE_ID, workspaceId);
         sessionStorage.setItem(PROJECT_ID, response.data.lastProjectId);
 
-        this.$router.push('/').then(() => {
+        this.$router.push(this.getRedirectUrl(response.data)).then(() => {
           this.reloadTopMenus();
         }).catch(err => err);
       });