From c69528cd8151bf8755a96493da943391f9f07296 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 20 May 2021 16:48:28 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86):?=
 =?UTF-8?q?=20=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81track=20header=20menu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/head/ApiHeaderMenus.vue    |  8 +--
 .../components/common/head/CreateTest.vue     |  4 +-
 .../components/common/head/HeaderTopMenus.vue |  9 +--
 .../components/common/head/ProjectSwitch.vue  |  6 +-
 .../head/PerformanceHeaderMenus.vue           |  6 +-
 .../components/settings/SettingMenu.vue       | 21 +++---
 .../settings/workspace/WorkspaceMember.vue    |  2 +-
 frontend/src/business/permission.js           |  4 +-
 frontend/src/common/js/utils.js               | 65 ++++++++++++++++++-
 9 files changed, 95 insertions(+), 30 deletions(-)

diff --git a/frontend/src/business/components/api/head/ApiHeaderMenus.vue b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
index 68275d6e10..45bd639abb 100644
--- a/frontend/src/business/components/api/head/ApiHeaderMenus.vue
+++ b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
@@ -25,18 +25,18 @@
           </el-menu-item>
 
           <el-submenu v-show="isOldVersion"
-                      v-permission="['test_manager','test_user','test_viewer']" index="4">
+                      v-roles="['test_manager','test_user','test_viewer']" index="4">
             <template v-slot:title>{{ $t('commons.test') }}</template>
             <ms-recent-list ref="testRecent" :options="testRecent"/>
             <el-divider class="menu-divider"/>
             <ms-show-all :index="'/api/test/list/all'"/>
             <el-menu-item :index="apiTestProjectPath" class="blank_item"></el-menu-item>
-            <ms-create-button v-permission="['test_manager','test_user']" :index="'/api/test/create'"
+            <ms-create-button v-roles="['test_manager','test_user']" :index="'/api/test/create'"
                               :title="$t('load_test.create')"/>
           </el-submenu>
 
           <el-submenu v-show="isOldVersion"
-                      v-permission="['test_manager','test_user','test_viewer']" index="5">
+                      v-roles="['test_manager','test_user','test_viewer']" index="5">
             <template v-slot:title>{{ $t('commons.report') }}</template>
             <ms-recent-list ref="reportRecent" :options="reportRecent"/>
             <el-divider class="menu-divider"/>
@@ -45,7 +45,7 @@
 
 
           <el-menu-item v-show="isOldVersion"
-                        v-permission="['test_manager','test_user','test_viewer']" :index="'/api/monitor/view'">
+                        v-roles="['test_manager','test_user','test_viewer']" :index="'/api/monitor/view'">
             {{ $t('commons.monitor') }}
           </el-menu-item>
         </el-menu>
diff --git a/frontend/src/business/components/common/head/CreateTest.vue b/frontend/src/business/components/common/head/CreateTest.vue
index c01577b02c..64a7077ddb 100644
--- a/frontend/src/business/components/common/head/CreateTest.vue
+++ b/frontend/src/business/components/common/head/CreateTest.vue
@@ -1,6 +1,6 @@
 <template>
-  <router-link class="create-test" :to="this.to" v-permission="this.permission">
-    <el-button type="primary" size="small">{{this.title}}</el-button>
+  <router-link class="create-test" :to="this.to" v-roles="this.permission">
+    <el-button type="primary" size="small">{{ this.title }}</el-button>
   </router-link>
 </template>
 
diff --git a/frontend/src/business/components/common/head/HeaderTopMenus.vue b/frontend/src/business/components/common/head/HeaderTopMenus.vue
index 02b8e1694e..24e5ad64af 100644
--- a/frontend/src/business/components/common/head/HeaderTopMenus.vue
+++ b/frontend/src/business/components/common/head/HeaderTopMenus.vue
@@ -9,19 +9,20 @@
            :key="menuKey"
            router>
 
-    <el-menu-item index="/track" v-if="check('testTrack')" v-permission="['test_manager','test_user','test_viewer']">
+    <el-menu-item index="/track" v-if="check('testTrack')"
+                  v-permission="['PROJECT_TRACK_CASE:READ','PROJECT_TRACK_PLAN:READ','PROJECT_TRACK_REVIEW:READ']">
       {{ $t('test_track.test_track') }}
     </el-menu-item>
     <el-menu-item index="/api" @click="active()" v-if="check('api')"
-                  v-permission="['test_manager','test_user','test_viewer']">
+                  v-permission="['PROJECT_API_DEFINITION:READ','PROJECT_API_SCENARIO:READ','PROJECT_API_REPORT:READ']">
       {{ $t('commons.api') }}
     </el-menu-item>
     <el-menu-item index="/performance" v-if="check('performance')"
                   onselectstart="return false"
-                  v-permission="['test_manager','test_user','test_viewer']">
+                  v-permission="['PROJECT_PERFORMANCE_TEST:READ','PROJECT_PERFORMANCE_REPORT:READ']">
       {{ $t('commons.performance') }}
     </el-menu-item>
-    <el-menu-item index="/report" v-permission="['test_manager','test_user','test_viewer']"
+    <el-menu-item index="/report"
                   v-if="isReport && check('reportStat')">
       {{ $t('commons.report_statistics.title') }}
     </el-menu-item>
diff --git a/frontend/src/business/components/common/head/ProjectSwitch.vue b/frontend/src/business/components/common/head/ProjectSwitch.vue
index 3c5b9ad97e..554e894657 100644
--- a/frontend/src/business/components/common/head/ProjectSwitch.vue
+++ b/frontend/src/business/components/common/head/ProjectSwitch.vue
@@ -2,15 +2,15 @@
   <el-menu class="header-menu" :unique-opened="true" mode="horizontal" default-active="1" router>
     <!-- 不激活项目路由-->
     <el-menu-item index="1" v-show="false">Placeholder</el-menu-item>
-    <el-submenu v-permission="['test_manager','test_user','test_viewer']" index="2" popper-class="submenu">
+    <el-submenu v-roles="['test_manager','test_user','test_viewer']" index="2" popper-class="submenu">
       <template v-slot:title>
         <span class="project-name" :title="currentProject">
-          {{ $t('commons.project') }}: {{currentProject}}
+          {{ $t('commons.project') }}: {{ currentProject }}
         </span>
       </template>
       <search-list :current-project.sync="currentProject"/>
       <el-divider/>
-      <el-menu-item :index="'/setting/project/create'" v-permission="['test_manager','test_user']">
+      <el-menu-item :index="'/setting/project/create'" v-roles="['test_manager','test_user']">
         <font-awesome-icon :icon="['fa', 'plus']"/>
         <span style="padding-left: 7px;">{{ $t("project.create") }}</span>
       </el-menu-item>
diff --git a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue b/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
index 38af91329b..8c890917ee 100644
--- a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
+++ b/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
@@ -8,17 +8,17 @@
             {{ $t("i18n.home") }}
           </el-menu-item>
 
-          <el-submenu v-permission="['test_manager','test_user','test_viewer']"
+          <el-submenu v-roles="['test_manager','test_user','test_viewer']"
                       index="4" popper-class="submenu">
             <template v-slot:title>{{ $t('commons.test') }}</template>
             <ms-recent-list ref="testRecent" :options="testRecent"/>
             <el-divider/>
             <ms-show-all :index="'/performance/test/all'"/>
-            <ms-create-button v-permission="['test_manager','test_user']" :index="'/performance/test/create'"
+            <ms-create-button v-roles="['test_manager','test_user']" :index="'/performance/test/create'"
                               :title="$t('load_test.create')"/>
           </el-submenu>
 
-          <el-submenu v-permission="['test_manager','test_user','test_viewer']"
+          <el-submenu v-roles="['test_manager','test_user','test_viewer']"
                       index="5" popper-class="submenu">
             <template v-slot:title>{{ $t('commons.report') }}</template>
             <ms-recent-list ref="reportRecent" :options="reportRecent"/>
diff --git a/frontend/src/business/components/settings/SettingMenu.vue b/frontend/src/business/components/settings/SettingMenu.vue
index 97f96668d0..b4b59b9250 100644
--- a/frontend/src/business/components/settings/SettingMenu.vue
+++ b/frontend/src/business/components/settings/SettingMenu.vue
@@ -1,6 +1,6 @@
 <template>
   <el-menu menu-trigger="click" :default-active="$route.path" router class="setting">
-    <el-submenu index="1" v-permission="['admin']">
+    <el-submenu index="1" v-roles="['admin']">
       <template v-slot:title>
         <font-awesome-icon class="icon account" :icon="['far', 'address-card']" size="lg"/>
         <span>{{ $t('commons.system') }}</span>
@@ -10,7 +10,7 @@
       </el-menu-item>
     </el-submenu>
 
-    <el-submenu index="2" v-permission="['org_admin']" v-if="isCurrentOrganizationAdmin">
+    <el-submenu index="2" v-roles="['org_admin']" v-if="isCurrentOrganizationAdmin">
       <template v-slot:title>
         <font-awesome-icon class="icon organization" :icon="['far', 'building']" size="lg"/>
         <span>{{ $t('commons.organization') }}</span>
@@ -20,7 +20,7 @@
       </el-menu-item>
     </el-submenu>
 
-    <el-submenu index="3" v-permission="['test_manager']" v-if="isCurrentWorkspaceUser">
+    <el-submenu index="3" v-roles="['test_manager']" v-if="isCurrentWorkspaceUser">
       <template v-slot:title>
         <font-awesome-icon class="icon workspace" :icon="['far', 'list-alt']" size="lg"/>
         <span>{{ $t('commons.workspace') }}</span>
@@ -30,25 +30,26 @@
       </el-menu-item>
       <el-submenu index="3-1">
         <template slot="title">模板管理</template>
-        <el-menu-item v-for="menu in workspaceTemplate" :key="menu.index" :index="menu.index" class="setting-item" v-permission="menu.roles">
+        <el-menu-item v-for="menu in workspaceTemplate" :key="menu.index" :index="menu.index" class="setting-item"
+                      v-roles="menu.roles">
           {{ $t(menu.title) }}
         </el-menu-item>
       </el-submenu>
     </el-submenu>
 
-    <el-submenu index="4" v-permission="['test_user','test_manager', 'org_admin', 'admin']">
+    <el-submenu index="4" v-roles="['test_user','test_manager', 'org_admin', 'admin']">
       <template v-slot:title>
         <font-awesome-icon class="icon" :icon="['fa', 'bars']" size="lg"/>
-        <span>{{$t('commons.project')}}</span>
+        <span>{{ $t('commons.project') }}</span>
       </template>
       <el-menu-item v-for="menu in project" :key="menu.index" :index="menu.index" class="setting-item">
         {{ $t(menu.title) }}
       </el-menu-item>
     </el-submenu>
 
-<!--    <el-menu-item v-for="menu in project" :key="menu.index" :index="'/setting/project/all'" class="setting-item"-->
-<!--                  v-permission="['test_user','test_manager', 'org_admin', 'admin']">-->
-<!--      <template v-slot:title>-->
+    <!--    <el-menu-item v-for="menu in project" :key="menu.index" :index="'/setting/project/all'" class="setting-item"-->
+    <!--                  v-roles="['test_user','test_manager', 'org_admin', 'admin']">-->
+    <!--      <template v-slot:title>-->
 <!--        <font-awesome-icon class="icon" :icon="['fa', 'bars']" size="lg"/>-->
 <!--        <span>{{ $t(menu.title) }}</span>-->
 <!--      </template>-->
@@ -60,7 +61,7 @@
         <span>{{ $t('commons.personal_info') }}</span>
       </template>
       <el-menu-item v-for="menu in persons" :key="menu.index" :index="menu.index" class="setting-item"
-                    v-permission="menu.roles">
+                    v-roles="menu.roles">
         {{ $t(menu.title) }}
       </el-menu-item>
     </el-submenu>
diff --git a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
index 752629fe21..7005edbe41 100644
--- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
+++ b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
@@ -36,7 +36,7 @@
         <el-table-column :label="$t('commons.operating')">
           <template v-slot:default="scope">
             <ms-table-operator :tip2="$t('commons.remove')" @editClick="edit(scope.row)" @deleteClick="del(scope.row)"
-                               v-permission="['test_manager']"/>
+                               v-roles="['test_manager']"/>
           </template>
         </el-table-column>
       </el-table>
diff --git a/frontend/src/business/permission.js b/frontend/src/business/permission.js
index e80ad5bc93..0367c2be9a 100644
--- a/frontend/src/business/permission.js
+++ b/frontend/src/business/permission.js
@@ -4,7 +4,7 @@ import {
   checkoutTestManagerOrTestUser,
   enableModules,
   hasLicense,
-  hasRolePermissions,
+  hasPermissions,
   hasRoles
 } from "@/common/js/utils";
 import NProgress from 'nprogress'; // progress bar
@@ -37,7 +37,7 @@ function checkRolePermission(el, binding, type) {
     if (type === 'roles') {
       hasPermission = hasRoles(...permissionRoles);
     } else if (type === 'permission') {
-      hasPermission = hasRolePermissions(...permissionRoles);
+      hasPermission = hasPermissions(...permissionRoles);
     }
     if (!hasPermission) {
       el.parentNode && el.parentNode.removeChild(el);
diff --git a/frontend/src/common/js/utils.js b/frontend/src/common/js/utils.js
index 763788ef31..ed76dfb00b 100644
--- a/frontend/src/common/js/utils.js
+++ b/frontend/src/common/js/utils.js
@@ -52,12 +52,66 @@ export function hasRolePermission(role) {
   return false;
 }
 
+export function hasPermission(permission) {
+  let user = getCurrentUser();
+
+  user.groupPermissions.forEach(gp => {
+    for (let userGroup of user.userGroups) {
+      if (gp.group.id === userGroup.id) {
+        gp.sourceId = userGroup.sourceId;
+      }
+    }
+  });
+
+  // todo 权限验证
+  let currentProjectPermissions = user.groupPermissions.filter(gp => gp.group.type === 'PROJECT')
+    .filter(gp => gp.group.scopeId === getCurrentProjectID())[0]?.userGroupPermissions
+    .map(g => g.permissionId) || [];
+
+  for (const p of currentProjectPermissions) {
+    if (p === permission) {
+      return true;
+    }
+  }
+
+  let currentWorkspacePermissions = user.groupPermissions.filter(gp => gp.group.type === 'WORKSPACE')
+    .filter(gp => gp.group.scopeId === getCurrentWorkspaceId())[0]?.userGroupPermissions
+    .map(g => g.permissionId) || [];
+
+  for (const p of currentWorkspacePermissions) {
+    if (p === permission) {
+      return true;
+    }
+  }
+
+  let currentOrganizationPermissions = user.groupPermissions.filter(gp => gp.group.type === 'ORGANIZATION')
+    .filter(gp => gp.group.scopeId === getCurrentOrganizationId())[0]?.userGroupPermissions
+    .map(g => g.permissionId) || [];
+
+  for (const p of currentOrganizationPermissions) {
+    if (p === permission) {
+      return true;
+    }
+  }
+
+  let systemPermissions = user.groupPermissions.filter(gp => gp.group.type === 'SYSTEM')
+    .filter(gp => gp.group.scopeId === 'global')[0]?.userGroupPermissions
+    .map(g => g.permissionId) || [];
+
+  for (const p of systemPermissions) {
+    if (p === permission) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
 export function hasLicense() {
   let v = localStorage.getItem(LicenseKey);
   return v === 'valid';
 }
 
-//是否含有对应组织或工作空间的角色
 export function hasRolePermissions(...roles) {
   for (let role of roles) {
     if (hasRolePermission(role)) {
@@ -67,6 +121,15 @@ export function hasRolePermissions(...roles) {
   return false;
 }
 
+export function hasPermissions(...permissions) {
+  for (let p of permissions) {
+    if (hasPermission(p)) {
+      return true;
+    }
+  }
+  return false;
+}
+
 export function checkoutCurrentOrganization() {
   // 查看当前用户是否是 lastOrganizationId 的组织管理员
   return hasRolePermissions(ROLE_ORG_ADMIN);