Skip to content

Commit 561a5e0

Browse files
committed
fix: Switch language and repassword permission of common user
1 parent d114b00 commit 561a5e0

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@
2626
</div>
2727
</div>
2828
<el-dropdown-item class="border-t p-8" @click="openResetPassword"
29-
v-if="hasPermission(new ComplexPermission([RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, RoleConst.USER.getWorkspaceRole],
30-
[PermissionConst.CHANGE_PASSWORD, PermissionConst.CHANGE_PASSWORD.getWorkspacePermissionWorkspaceManageRole,
31-
PermissionConst.CHANGE_PASSWORD.getWorkspacePermission],
29+
v-if="hasPermission(new ComplexPermission([RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE, RoleConst.USER],
30+
[PermissionConst.CHANGE_PASSWORD],
3231
[],'OR'),'OR')"
3332
>
3433
{{ $t('views.login.resetPassword') }}
@@ -42,10 +41,8 @@
4241
</el-dropdown-item>
4342
</div>
4443
<el-dropdown-item style="padding: 0" @click.stop
45-
v-if="hasPermission(new ComplexPermission([RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, RoleConst.USER.getWorkspaceRole],
46-
[PermissionConst.SWITCH_LANGUAGE.getWorkspacePermissionWorkspaceManageRole,PermissionConst.SWITCH_LANGUAGE,
47-
PermissionConst.SWITCH_LANGUAGE.getWorkspacePermission
48-
],[],'OR'),'OR')"
44+
v-if="hasPermission(new ComplexPermission([RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE, RoleConst.USER],
45+
[PermissionConst.SWITCH_LANGUAGE],[],'OR'),'OR')"
4946
>
5047
<el-dropdown class="w-full" trigger="hover" placement="left-start">
5148
<div class="flex-between w-full" style="line-height: 22px; padding: 12px 11px">
@@ -86,8 +83,8 @@
8683
</el-dropdown-item>
8784

8885
<el-dropdown-item @click="router.push({ path: `/system/user` })"
89-
v-if="hasPermission([RoleConst.EXTENDS_ADMIN, RoleConst.EXTENDS_WORKSPACE_MANAGE.getWorkspaceRole,
90-
RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE.getWorkspaceRole],'OR')"
86+
v-if="hasPermission([RoleConst.EXTENDS_ADMIN, RoleConst.EXTENDS_WORKSPACE_MANAGE,
87+
RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE],'OR')"
9188
>
9289
<div class="flex-between w-full">
9390
{{ $t('views.system.title') }}

0 commit comments

Comments
 (0)