From ea085a38328de93197f7861b917533e7ff10349b Mon Sep 17 00:00:00 2001
From: zhangzhanwei <zhanwei.zhang@fit2cloud.com>
Date: Fri, 4 Jul 2025 13:56:42 +0800
Subject: [PATCH] fix: Extends workspace manager  system permission

---
 ui/src/layout/layout-header/SystemHeader.vue       | 8 +++++++-
 ui/src/utils/permission/data.ts                    | 4 ++--
 ui/src/views/system/workspace/component/Member.vue | 9 ++++-----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ui/src/layout/layout-header/SystemHeader.vue b/ui/src/layout/layout-header/SystemHeader.vue
index eb5affbc7..782b0ae29 100644
--- a/ui/src/layout/layout-header/SystemHeader.vue
+++ b/ui/src/layout/layout-header/SystemHeader.vue
@@ -10,7 +10,11 @@
       <div class="flex align-center mr-8">
         <TopAbout class="mt-4"></TopAbout>
         <el-divider class="ml-8 mr-8" direction="vertical" />
-        <el-button link @click="router.push({ path: '/' })">
+        <el-button link @click="router.push({ path: '/' })"
+          v-if="hasPermission([RoleConst.USER.getWorkspaceRole,RoleConst.EXTENDS_USER.getWorkspaceRole, 
+            RoleConst.EXTENDS_WORKSPACE_MANAGE.getWorkspaceRole, RoleConst.WORKSPACE_MANAGE.getWorkspaceRole
+          ],'OR')"
+        >
           <AppIcon class="mr-8" iconName="app-workspace" style="font-size: 16px"></AppIcon>
           {{ $t('views.workspace.toWorkspace') }}</el-button
         >
@@ -20,9 +24,11 @@
   </div>
 </template>
 <script setup lang="ts">
+import { RoleConst } from '@/utils/permission/data'
 import Avatar from './avatar/index.vue'
 import TopAbout from './top-about/index.vue'
 import { useRouter } from 'vue-router'
+import { hasPermission } from '@/utils/permission'
 
 const router = useRouter()
 </script>
diff --git a/ui/src/utils/permission/data.ts b/ui/src/utils/permission/data.ts
index efd4de234..c022c9ad6 100644
--- a/ui/src/utils/permission/data.ts
+++ b/ui/src/utils/permission/data.ts
@@ -55,8 +55,8 @@ const PermissionConst = {
   WORKSPACE_REMOVE_MEMBER: new Permission('WORKSPACE:READ+REMOVE_MEMBER'),
 
   WORKSPACE_WORKSPACE_READ: new Permission('WORKSPACE_WORKSPACE:READ'),
-  WORKSPACE_WORKSPACE_ADD_MEMBER: new Permission('WORKSPACE:READ+ADD_MEMBER'),
-  WORKSPACE_WORKSPACE_REMOVE_MEMBER: new Permission('WORKSPACE:READ+REMOVE_MEMBER'),
+  WORKSPACE_WORKSPACE_ADD_MEMBER: new Permission('WORKSPACE_WORKSPACE:READ+ADD_MEMBER'),
+  WORKSPACE_WORKSPACE_REMOVE_MEMBER: new Permission('WORKSPACE_WORKSPACE:READ+REMOVE_MEMBER'),
 
   WORKSPACE_CHAT_USER_READ: new Permission('WORKSPACE_CHAT_USER:READ'),
   WORKSPACE_CHAT_USER_CREATE: new Permission('WORKSPACE_CHAT_USER:READ+CREATE'),
diff --git a/ui/src/views/system/workspace/component/Member.vue b/ui/src/views/system/workspace/component/Member.vue
index 2721cb902..54ceef8eb 100644
--- a/ui/src/views/system/workspace/component/Member.vue
+++ b/ui/src/views/system/workspace/component/Member.vue
@@ -5,8 +5,8 @@
       @click="handleAdd"
       v-hasPermission="
         new ComplexPermission(
-          [RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE],
-          [PermissionConst.WORKSPACE_ADD_MEMBER, PermissionConst.WORKSPACE_WORKSPACE_ADD_MEMBER],
+          [RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE.getWorkspaceRole],
+          [PermissionConst.WORKSPACE_ADD_MEMBER, PermissionConst.WORKSPACE_WORKSPACE_ADD_MEMBER.getWorkspacePermissionWorkspaceManageRole],
           [],
             'OR',)"
     >
@@ -51,8 +51,8 @@
             @click.stop="handleDelete(row)"
             v-hasPermission="
               new ComplexPermission(
-              [RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE],
-              [PermissionConst.WORKSPACE_REMOVE_MEMBER, PermissionConst.WORKSPACE_WORKSPACE_REMOVE_MEMBER],
+              [RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE.getWorkspaceRole],
+              [PermissionConst.WORKSPACE_REMOVE_MEMBER, PermissionConst.WORKSPACE_WORKSPACE_REMOVE_MEMBER.getWorkspacePermissionWorkspaceManageRole],
               [],
                 'OR',)"
           >
@@ -74,7 +74,6 @@ import { onMounted, ref, reactive, watch } from 'vue'
 import { MsgSuccess, MsgConfirm } from '@/utils/message'
 import { t } from '@/locales'
 import AddMemberDrawer from './AddMemberDrawer.vue'
-import WorkspaceApi from '@/api/workspace/workspace'
 import type { WorkspaceMemberItem, WorkspaceItem } from '@/api/type/workspace'
 import { PermissionConst, RoleConst } from '@/utils/permission/data'
 import { ComplexPermission } from '@/utils/permission/type'