Skip to content

Commit 87415e9

Browse files
committed
fix: Avatar permission
1 parent 2c0a8af commit 87415e9

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

ui/src/layout/layout-header/avatar/index.vue

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@
2929
</div>
3030
</div>
3131
<el-dropdown-item class="border-t p-8" @click="openResetPassword"
32-
v-if="hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,PermissionConst.CHANGE_PASSWORD],'OR')"
32+
v-if="hasPermission(new ComplexPermission([RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, RoleConst.USER.getWorkspaceRole],
33+
[PermissionConst.CHANGE_PASSWORD, PermissionConst.CHANGE_PASSWORD.getWorkspacePermissionWorkspaceManageRole,
34+
PermissionConst.CHANGE_PASSWORD.getWorkspacePermission],
35+
[],'OR'),'OR')"
3336
>
3437
{{ $t('views.login.resetPassword') }}
3538
</el-dropdown-item>
@@ -42,7 +45,10 @@
4245
</el-dropdown-item>
4346
</div>
4447
<el-dropdown-item style="padding: 0" @click.stop
45-
v-if="hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,PermissionConst.SWITCH_LANGUAGE],'OR')"
48+
v-if="hasPermission(new ComplexPermission([RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, RoleConst.USER.getWorkspaceRole],
49+
[PermissionConst.SWITCH_LANGUAGE.getWorkspacePermissionWorkspaceManageRole,PermissionConst.SWITCH_LANGUAGE,
50+
PermissionConst.SWITCH_LANGUAGE.getWorkspacePermission
51+
],[],'OR'),'OR')"
4652
>
4753
<el-dropdown class="w-full" trigger="hover" placement="left-start">
4854
<div class="flex-between w-full" style="line-height: 22px; padding: 12px 11px">
@@ -77,12 +83,15 @@
7783
</el-dropdown>
7884
</el-dropdown-item>
7985
<el-dropdown-item @click="openAbout"
80-
v-if="hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,PermissionConst.ABOUT_READ],'OR')"
86+
v-if="hasPermission([RoleConst.ADMIN,PermissionConst.ABOUT_READ],'OR')"
8187
>
8288
{{ $t('layout.about.title') }}
8389
</el-dropdown-item>
8490

85-
<el-dropdown-item @click="router.push({ path: `/system/user` })">
91+
<el-dropdown-item @click="router.push({ path: `/system/user` })"
92+
v-if="hasPermission([RoleConst.EXTENDS_ADMIN, RoleConst.EXTENDS_WORKSPACE_MANAGE.getWorkspaceRole,
93+
RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE.getWorkspaceRole],'OR')"
94+
>
8695
<div class="flex-between w-full">
8796
{{ $t('views.system.title') }}
8897
<AppIcon iconName="app-go"></AppIcon>

ui/src/router/modules/system.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const systemRouter = {
6060
new ComplexPermission(
6161
[RoleConst.WORKSPACE_MANAGE, RoleConst.ADMIN],
6262
[PermissionConst.WORKSPACE_WORKSPACE_READ, PermissionConst.WORKSPACE_READ],
63-
[EditionConst.IS_EE],
63+
[EditionConst.IS_EE, EditionConst.IS_PE],
6464
'OR',
6565
),
6666
],
@@ -176,7 +176,7 @@ const systemRouter = {
176176
PermissionConst.APPLICATION_WORKSPACE_USER_RESOURCE_PERMISSION_READ.getWorkspacePermissionWorkspaceManageRole],[],'OR'),
177177
new ComplexPermission([RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE],
178178
[PermissionConst.KNOWLEDGE_WORKSPACE_USER_RESOURCE_PERMISSION_READ,
179-
PermissionConst.KNOWLEDGE_WORKSPACE_USER_RESOURCE_PERMISSION_READ.getWorkspacePermissionWorkspaceManageRole],[],'OR'),
179+
PermissionConst.KNOWLEDGE_WORKSPACE_USER_RESOURCE_PERMISSION_READ.getWorkspacePermissionWorkspaceManageRole],[],'OR'),
180180
new ComplexPermission([RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE],
181181
[PermissionConst.TOOL_WORKSPACE_USER_RESOURCE_PERMISSION_READ,
182182
PermissionConst.TOOL_WORKSPACE_USER_RESOURCE_PERMISSION_READ.getWorkspacePermissionWorkspaceManageRole],[],'OR'),
@@ -465,7 +465,7 @@ const systemRouter = {
465465
new ComplexPermission(
466466
[RoleConst.ADMIN],
467467
[PermissionConst.EMAIL_SETTING_READ],
468-
[EditionConst.IS_EE, EditionConst.IS_PE],
468+
[],
469469
'OR',
470470
),
471471
],
@@ -524,7 +524,7 @@ const systemRouter = {
524524
new ComplexPermission(
525525
[RoleConst.ADMIN],
526526
[PermissionConst.EMAIL_SETTING_READ],
527-
[EditionConst.IS_EE, EditionConst.IS_PE],
527+
[],
528528
'OR',
529529
),
530530
],

0 commit comments

Comments
 (0)