From 70bd9610201d9b78aaa2046c2b6659995a1d32b9 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Sat, 20 Nov 2021 10:31:44 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=94=A8=E6=88=B7=E7=BB=84=E4=B8=8E?=
 =?UTF-8?q?=E6=9D=83=E9=99=90):=20=E4=BF=AE=E5=A4=8D=E5=8F=AA=E6=9C=89?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4=E6=9D=83=E9=99=90=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E8=B7=B3=E8=BD=AC=E5=88=B0=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008003 --user=刘瑞斌 【用户组和权限】-仅有一个工作空间成员和项目管理员权限的用户不应该显示系统数据信息（图2） https://www.tapd.cn/55049933/s/1070878
---
 frontend/src/business/App.vue                 |  6 +--
 .../head/{HeaderOrgWs.vue => HeaderWs.vue}    | 12 ++---
 .../components/common/router/router.js        |  2 +-
 .../components/settings/SettingHome.vue       | 45 +++++++++++++++----
 4 files changed, 47 insertions(+), 18 deletions(-)
 rename frontend/src/business/components/common/head/{HeaderOrgWs.vue => HeaderWs.vue} (94%)

diff --git a/frontend/src/business/App.vue b/frontend/src/business/App.vue
index a1d3dd29b6..d500708e0b 100644
--- a/frontend/src/business/App.vue
+++ b/frontend/src/business/App.vue
@@ -15,7 +15,7 @@
         <!-- float right -->
         <ms-user ref="headerUser"/>
         <ms-language-switch :color="color"/>
-        <ms-header-org-ws :color="color"/>
+        <ms-header-ws :color="color"/>
         <ms-task-center :color="color"/>
         <ms-notification :color="color"/>
       </el-col>
@@ -31,7 +31,7 @@
 import MsTopMenus from "./components/common/head/HeaderTopMenus";
 import MsView from "./components/common/router/View";
 import MsUser from "./components/common/head/HeaderUser";
-import MsHeaderOrgWs from "./components/common/head/HeaderOrgWs";
+import MsHeaderWs from "./components/common/head/HeaderWs";
 import MsLanguageSwitch from "./components/common/head/LanguageSwitch";
 import {hasLicense, saveLocalStorage, setColor, setDefaultTheme} from "@/common/js/utils";
 import {registerRequestHeaders} from "@/common/js/ajax";
@@ -199,7 +199,7 @@ export default {
     MsUser,
     MsView,
     MsTopMenus,
-    MsHeaderOrgWs,
+    MsHeaderWs,
     "LicenseMessage": header.default,
     "Theme": theme.default
   }
diff --git a/frontend/src/business/components/common/head/HeaderOrgWs.vue b/frontend/src/business/components/common/head/HeaderWs.vue
similarity index 94%
rename from frontend/src/business/components/common/head/HeaderOrgWs.vue
rename to frontend/src/business/components/common/head/HeaderWs.vue
index 970b582f6c..9a8f7fbf3c 100644
--- a/frontend/src/business/components/common/head/HeaderOrgWs.vue
+++ b/frontend/src/business/components/common/head/HeaderWs.vue
@@ -31,14 +31,14 @@
 import {
   fullScreenLoading,
   getCurrentUser,
-  getCurrentWorkspaceId,
+  getCurrentWorkspaceId, hasPermissions,
   saveLocalStorage,
   stopFullScreenLoading
 } from "@/common/js/utils";
-import {ORGANIZATION_ID, PROJECT_ID, WORKSPACE_ID} from "@/common/js/constants";
+import {PROJECT_ID, WORKSPACE_ID} from "@/common/js/constants";
 
 export default {
-  name: "MsHeaderOrgWs",
+  name: "MsHeaderWs",
   created() {
     this.initMenuData();
   },
@@ -81,9 +81,9 @@ export default {
     },
     getRedirectUrl(user) {
       if (!user.lastProjectId || !user.lastWorkspaceId) {
-        // 没有项目级的权限直接回到 /
-        // 只是某一个工作空间的用户组也转到 /
-        return "/";
+        // 没有项目级的权限直接回到 /setting/project/:type
+        // 只是某一个工作空间的用户组也转到 /setting/project/:type
+        return "/setting/project/:type";
       }
       let redirectUrl = sessionStorage.getItem('redirectUrl');
       if (redirectUrl.startsWith("/")) {
diff --git a/frontend/src/business/components/common/router/router.js b/frontend/src/business/components/common/router/router.js
index 857f41be43..f890077d97 100644
--- a/frontend/src/business/components/common/router/router.js
+++ b/frontend/src/business/components/common/router/router.js
@@ -65,7 +65,7 @@ function redirectLoginPath(originPath) {
     if (hasPermissions('PROJECT_USER:READ', 'PROJECT_ENVIRONMENT:READ', 'PROJECT_OPERATING_LOG:READ', 'PROJECT_FILE:READ+JAR', 'PROJECT_FILE:READ+FILE', 'PROJECT_CUSTOM_CODE:READ')) {
       redirectUrl = '/project/home';
     } else if (hasPermissions('WORKSPACE_SERVICE:READ', 'WORKSPACE_MESSAGE:READ', 'WORKSPACE_USER:READ', 'WORKSPACE_PROJECT_MANAGER:READ', 'WORKSPACE_PROJECT_ENVIRONMENT:READ', 'WORKSPACE_OPERATING_LOG:READ', 'WORKSPACE_TEMPLATE:READ')) {
-      redirectUrl = '/setting';
+      redirectUrl = '/setting/project/:type';
     } else if (hasPermissions('SYSTEM_USER:READ', 'SYSTEM_WORKSPACE:READ', 'SYSTEM_GROUP:READ', 'SYSTEM_TEST_POOL:READ', 'SYSTEM_SETTING:READ', 'SYSTEM_AUTH:READ', 'SYSTEM_QUOTA:READ', 'SYSTEM_OPERATING_LOG:READ')) {
       redirectUrl = '/setting';
     } else {
diff --git a/frontend/src/business/components/settings/SettingHome.vue b/frontend/src/business/components/settings/SettingHome.vue
index 04a250f8fd..b9588b0071 100644
--- a/frontend/src/business/components/settings/SettingHome.vue
+++ b/frontend/src/business/components/settings/SettingHome.vue
@@ -4,20 +4,23 @@
       <div class="setting-div">
         <el-card style="height: 100%;width: 100%">
           <div slot="header" style="padding: 5px 0">
-            <span style="font-size: 18px;font-weight: bold;">{{ $t('commons.system_data')}}</span>
+            <span style="font-size: 18px;font-weight: bold;">{{ $t('commons.system_data') }}</span>
           </div>
           <div style="position: absolute; top: 50%; left: 50%;transform: translate(-50%, -50%);">
             <div class="div-item">
               <i class="el-icon-user-solid icon-color"></i>
-              {{ $t('commons.system_user')}} <span class="number"> {{statistic.userSize}} </span> {{ $t('commons.user_unit') }}
+              {{ $t('commons.system_user') }} <span class="number"> {{ statistic.userSize }} </span>
+              {{ $t('commons.user_unit') }}
             </div>
             <div class="div-item">
               <i class="el-icon-s-platform icon-color"></i>
-              {{ $t('commons.system_workspace')}} <span class="number"> {{statistic.workspaceSize}} </span> {{ $t('commons.workspace_unit') }}
+              {{ $t('commons.system_workspace') }} <span class="number"> {{ statistic.workspaceSize }} </span>
+              {{ $t('commons.workspace_unit') }}
             </div>
             <div class="div-item">
               <i class="el-icon-s-cooperation icon-color"></i>
-              {{ $t('commons.system_project')}} <span class="number"> {{statistic.projectSize}} </span> {{ $t('commons.workspace_unit') }}
+              {{ $t('commons.system_project') }} <span class="number"> {{ statistic.projectSize }} </span>
+              {{ $t('commons.workspace_unit') }}
             </div>
           </div>
         </el-card>
@@ -28,11 +31,13 @@
 </template>
 
 <script>
+import {hasPermissions} from "@/common/js/utils";
+
 export default {
   name: "SettingHome",
   computed: {
     color: function () {
-      return `var(--primary_color)`
+      return `var(--primary_color)`;
     }
   },
   data() {
@@ -43,14 +48,36 @@ export default {
         projectSize: 0
       },
       result: {}
+    };
+  },
+  activated() {
+    let projectPermissions = hasPermissions('PROJECT_USER:READ', 'PROJECT_ENVIRONMENT:READ', 'PROJECT_OPERATING_LOG:READ',
+      'PROJECT_FILE:READ+JAR', 'PROJECT_FILE:READ+FILE', 'PROJECT_CUSTOM_CODE:READ');
+
+    let wsPermissions = hasPermissions('WORKSPACE_SERVICE:READ', 'WORKSPACE_MESSAGE:READ', 'WORKSPACE_USER:READ',
+      'WORKSPACE_PROJECT_MANAGER:READ', 'WORKSPACE_PROJECT_ENVIRONMENT:READ', 'WORKSPACE_OPERATING_LOG:READ',
+      'WORKSPACE_TEMPLATE:READ');
+
+    let sysPermissions = hasPermissions('SYSTEM_USER:READ', 'SYSTEM_WORKSPACE:READ', 'SYSTEM_GROUP:READ',
+      'SYSTEM_TEST_POOL:READ', 'SYSTEM_SETTING:READ', 'SYSTEM_AUTH:READ',
+      'SYSTEM_QUOTA:READ', 'SYSTEM_OPERATING_LOG:READ');
+
+    // 只有项目权限时跳转到项目列表
+    if (projectPermissions && !wsPermissions && !sysPermissions) {
+      this.$router.push('/project/home');
+      return;
+    }
+    // 只有工作空间权限时跳转到项目列表
+    if (wsPermissions && !sysPermissions) {
+      this.$router.push('/setting/project/:type');
     }
   },
-  created() {
+  mounted() {
     this.result = this.$get("/system/statistics/data", res => {
       this.statistic = res.data;
-    })
+    });
   }
-}
+};
 </script>
 
 <style scoped>
@@ -62,6 +89,7 @@ export default {
   left: 50%;
   transform: translate(-50%, -50%);
 }
+
 .setting-card {
   height: calc(100vh - 55px);
   position: relative;
@@ -77,6 +105,7 @@ export default {
   width: 100%;
   padding: 20px;
 }
+
 .number {
   font-size: 20px;
   color: var(--primary_color);