Skip to content

fix: UI permissions #7082

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
shaohuzhang1 merged 1 commit into from
Sep 17, 2026
+61 −49
Merged

fix: UI permissions #7082

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions apps/common/auth/constants/permission_constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,12 @@ class PermissionConstants(Enum):

SYSTEM_HOMEPAGE_READ = (
Permission(group=Group.HOMEPAGE, sub_group=Group.HOMEPAGE, operate=Operate.READ, bit_index=0),
PermissionMeta(role_list=[RoleConstants.ADMIN], category=Category.IAM),
PermissionMeta(role_list=[RoleConstants.ADMIN], category=Category.IAM, scope=[PermissionScopeConstants.SYSTEM]),
)

SYSTEM_HOMEPAGE_EXPORT = (
Permission(group=Group.HOMEPAGE, sub_group=Group.HOMEPAGE, operate=Operate.EXPORT, bit_index=1),
PermissionMeta(role_list=[RoleConstants.ADMIN], category=Category.IAM),
PermissionMeta(role_list=[RoleConstants.ADMIN], category=Category.IAM, scope=[PermissionScopeConstants.SYSTEM]),
)

# ==================== 资源主分组（无子分组） ====================
Expand Down
95 changes: 53 additions & 42 deletions ui/src/layout/sidebar/SystemSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,40 +18,36 @@ const getSystemMenuIcon = (systemMenuItem: LayoutMenuItem) => (isSystemMenuActiv
<template>
<div class="mk-system-sidebar flex h-full flex-col">
<el-scrollbar class="min-h-0 flex-1">
<el-menu
class="mt-2!"
:class="props.collapsed ? 'px-3.5!' : 'px-4!'"
:collapse="props.collapsed"
:collapse-transition="false"
:default-active="route.path"
router
:persistent="false"
>
<template v-for="item in systemMenuItems" :key="item.name" >
<template v-if="item.permission? item.permission():true">
<!-- 有子菜单 -->
<el-sub-menu v-if="item.children?.length && item.route" :index="router.resolve(item.route).path" popper-class="mk-system-sidebar-menu-popper">
<template #title>
<el-menu class="mt-2!" :class="props.collapsed ? 'px-3.5!' : 'px-4!'" :collapse="props.collapsed"
:collapse-transition="false" :default-active="route.path" router :persistent="false">
<template v-for="item in systemMenuItems" :key="item.name">
<template v-if="item.permission ? item.permission() : true">
<!-- 有子菜单 -->
<el-sub-menu v-if="item.children?.length && item.route" :index="router.resolve(item.route).path"
popper-class="mk-system-sidebar-menu-popper">
<template #title>
<MkIcon v-if="item.icon" :name="getSystemMenuIcon(item)" :size="18" />
<span>{{ item.label }}</span>
</template>
<el-menu-item-group>
<template #title v-if="props.collapsed"><span>{{ item.label }}</span></template>
<template v-for="child in item.children" :key="child.name">
<template v-if="child.permission ? child.permission() : true">
<el-menu-item :index="child.route ? router.resolve(child.route).path : child.name">
{{ child.label }}
</el-menu-item>
</template>
</template>
</el-menu-item-group>
</el-sub-menu>
<!-- 无子菜单 -->
<el-menu-item v-else :index="item.route ? router.resolve(item.route).path : item.name">
<MkIcon v-if="item.icon" :name="getSystemMenuIcon(item)" :size="18" />
<span>{{ item.label }}</span>
</template>
<el-menu-item-group>
<template #title v-if="props.collapsed"
><span>{{ item.label }}</span></template
>
<el-menu-item v-for="child in item.children" :key="child.name" :index="child.route ? router.resolve(child.route).path : child.name">
{{ child.label }}
</el-menu-item>
</el-menu-item-group>
</el-sub-menu>
<!-- 无子菜单 -->
<el-menu-item v-else :index="item.route ? router.resolve(item.route).path : item.name">
<MkIcon v-if="item.icon" :name="getSystemMenuIcon(item)" :size="18" />
<template #title>{{ item.label }}</template>
</el-menu-item>
<template #title>{{ item.label }}</template>
</el-menu-item>

</template>

</template>
</el-menu>
</el-scrollbar>
Expand All @@ -61,21 +57,20 @@ const getSystemMenuIcon = (systemMenuItem: LayoutMenuItem) => (isSystemMenuActiv
</div>
<!-- 收起导航按钮 -->
<div :class="props.collapsed ? 'px-3.5' : 'px-4'" class="py-2">
<button
type="button"
:class="props.collapsed ? 'p-2.75' : 'px-2 p-2.75'"
<button type="button" :class="props.collapsed ? 'p-2.75' : 'px-2 p-2.75'"
class="mk-system-sidebar-toggle flex w-full cursor-pointer items-center gap-2 rounded-md"
@click="emit('toggle')"
>
@click="emit('toggle')">
<MkIcon name="icon_side-fold_outlined" :size="18" :class="props.collapsed && 'rotate-180'" />
<span class="whitespace-nowrap transition-opacity duration-100" :class="props.collapsed ? 'opacity-0' : 'delay-200 opacity-100'"> 收起导航 </span>
<span class="whitespace-nowrap transition-opacity duration-100"
:class="props.collapsed ? 'opacity-0' : 'delay-200 opacity-100'"> 收起导航 </span>
</button>
</div>
</div>
</template>
<style lang="scss">
.mk-system-sidebar,
.mk-system-sidebar-menu-popper {

/* menu */
.el-menu {
background: none !important;
Expand All @@ -87,24 +82,29 @@ const getSystemMenuIcon = (systemMenuItem: LayoutMenuItem) => (isSystemMenuActiv
gap: calc(var(--spacing) * 1);
}
}

.el-menu-item {
border-radius: var(--el-border-radius-base);
color: var(--el-text-color-primary);
height: auto;
line-height: 18px;
padding: 11px calc(var(--spacing) * 2) !important;

[class^='el-icon'] {
margin-right: calc(var(--spacing) * 2);
}

&:hover {
background-color: var(--mk-N900-transparent-10);
}

&.is-active {
background-color: white;
color: var(--mk-primary);
font-weight: 500;
}
}

// 子菜单
.el-sub-menu {
display: flex;
Expand All @@ -117,53 +117,62 @@ const getSystemMenuIcon = (systemMenuItem: LayoutMenuItem) => (isSystemMenuActiv
height: auto;
line-height: 18px;
padding: 11px calc(var(--spacing) * 2) !important;

&:hover {
background-color: var(--mk-N900-transparent-10);
}
}

.el-icon {
margin-right: calc(var(--spacing) * 2);
width: auto;
}

.el-menu-item {
height: auto;
line-height: 18px;
padding: 11px calc(var(--spacing) * 2) !important;
padding-left: 34px !important;
}

.el-sub-menu__icon-arrow {
font-size: 16px;
margin-top: calc(var(--spacing) * -2);
right: 0;
}
}

.el-menu-item-group {
> ul {
>ul {
display: flex;
flex-direction: column;
gap: calc(var(--spacing) * 1);
}

&__title {
padding: 9px calc(var(--spacing) * 4) !important;
font-size: var(--mk-font-size-base);
color: var(--el-text-color-regular);
}
}

// 菜单收起
.el-menu--collapse {
> .el-menu-item {
>.el-menu-item {
min-height: calc(var(--spacing) * 10);

.el-menu-tooltip__trigger {
padding: 11px !important;
}
}

> .el-sub-menu {
> .el-sub-menu__title {
>.el-sub-menu {
>.el-sub-menu__title {
min-height: calc(var(--spacing) * 10);
padding: 11px !important;
}
&.is-active > .el-sub-menu__title {

&.is-active>.el-sub-menu__title {
background-color: white;
}
}
Expand All @@ -180,10 +189,12 @@ const getSystemMenuIcon = (systemMenuItem: LayoutMenuItem) => (isSystemMenuActiv
background-color: var(--mk-N200);
background-image: rgb(var(--mk-primary-rgb) / 5%);
border-radius: var(--el-border-radius-base);

.el-menu {
padding: calc(var(--spacing) * 2);
border-radius: var(--el-border-radius-base);
}

.el-menu-item {
padding: 9px calc(var(--spacing) * 4) !important;
}
Expand Down
11 changes: 6 additions & 5 deletions ui/src/permission/core/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,11 @@ export class Permission {

/** 非资源权限 key，对应后端 `Permission.__str__`。 */
toString(): string {
const sub = this.subGroup !== this.group ? `_${this.subGroup}` : ''
const flag = this.flag ? `_${this.flag}` : ''
return `${this.group}${sub}_${this.operate}${flag}`
}
const sub = this.subGroup !== this.group ? `_${this.subGroup}` : ''
const flag = this.flag ? `_${this.flag}` : ''
const operate = this.operate ? `:${this.operate}` : ''
return `${this.group}${sub}${operate}${flag}`
}

/** 资源级权限 key，对应后端 `Permission.get_resource_permission_key`。 */
getResourcePermissionKey(): string {
Expand All @@ -250,7 +251,7 @@ export class Permission {

/** 判定时使用的最终 key，对应后端 `AggregatePermission._match_permission`。 */
toPermissionKey(): string {
return this.resourceId ? this.getResourcePermissionKey() : this.toString()
return this.resourceId ? this.getResourcePermissionKey() : this.group
}

/** 基于上下文派生出带 workspace / resource 的权限副本。 */
Expand Down
Loading