Skip to content

fix: improve permission checks for workspace management and user roles #7552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wxg0103 merged 1 commit into from
Oct 29, 2026
+8 −10
Merged

fix: improve permission checks for workspace management and user roles #7552

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions ui/src/layout/LayoutHeader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,15 @@ function hasRolePrefix(name: string) {
}

// 系统管理员：内置 ADMIN 或自定义 ADMIN 类型（EXTENDS_ADMIN 无 :w: 后缀）
const canManageSystem = computed(() =>
hasPermission([RoleConstants.ADMIN, RoleConstants.EXTENDS_ADMIN], Compare.OR),
)
const canManageSystem = computed(() => hasPermission([RoleConstants.ADMIN, RoleConstants.EXTENDS_ADMIN], Compare.OR))

// 工作空间管理员：内置 WORKSPACE_MANAGE 或自定义 EXTENDS_WORKSPACE_MANAGE
const isWorkspaceManager = computed(() => {
const workspaceId = getWorkspaceId()
return (
hasPermission(
[RoleConstants.WORKSPACE_MANAGE, new Role(RoleConstants.WORKSPACE_MANAGE.name, workspaceId)],
Compare.OR,
) || hasRolePrefix(RoleConstants.EXTENDS_WORKSPACE_MANAGE.name)
hasPermission([RoleConstants.WORKSPACE_MANAGE, new Role(RoleConstants.WORKSPACE_MANAGE.name, workspaceId)], Compare.OR) ||
hasRolePrefix(RoleConstants.EXTENDS_WORKSPACE_MANAGE.name) ||
hasRolePrefix(RoleConstants.WORKSPACE_MANAGE.name)
)
})

Expand All @@ -45,7 +42,8 @@ const isOrdinaryUser = computed(() => {
const workspaceId = getWorkspaceId()
return (
hasPermission([RoleConstants.USER, new Role(RoleConstants.USER.name, workspaceId)], Compare.OR) ||
hasRolePrefix(RoleConstants.EXTENDS_USER.name)
hasRolePrefix(RoleConstants.EXTENDS_USER.name) ||
hasRolePrefix(RoleConstants.USER.name)
)
})

Expand Down Expand Up @@ -80,7 +78,7 @@ function switchMode() {
<span>升级</span>
</el-button>
<el-divider direction="vertical" />
<el-button v-if="isWorkspace(mode) && (isWorkspaceManager || canManageSystem )" class="-mx-1" text @click="switchMode">
<el-button v-if="isWorkspace(mode) && (isWorkspaceManager || canManageSystem)" class="-mx-1" text @click="switchMode">
<MkIcon name="icon_admin_outlined" />
<span>系统管理</span>
</el-button>
Expand All @@ -89,7 +87,7 @@ function switchMode() {
<MkIcon name="icon_left_outlined" />
<span>返回工作空间</span>
</el-button>
<AvatarDropdown> <!-- 头像 --> </AvatarDropdown>
<AvatarDropdown><!-- 头像 --></AvatarDropdown>
</div>
</header>
</template>
Loading