fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-05 13:39:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: optimize the order and style of role switching

Browse Source
This commit is contained in:
aaaaaajie 2025-03-26 02:13:36 +08:00
parent 2a03343d5d
commit bbdec2881b
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/plugins/@nocobase/plugin-acl/src/client/SwitchRole.tsx
View File

@ -16,6 +16,7 @@ import {
SelectWithTitle,
useCurrentRoleMode,
} from '@nocobase/client';
import { Divider } from 'antd';
export const SwitchRole = () => {
const { t } = useTranslation();
@ -36,7 +37,22 @@ export const SwitchRole = () => {
label: 'title',
value: 'name',
}}
options={roles}
options={roles.reduce((acc, role) => {
acc.push(role);
if (role.name === '__union__') {
acc.push({
name: 'divider',
title: <Divider style={{ margin: '2px 1px' }} />,
disabled: true,
style: {
minHeight: 0,
height: 'auto',
padding: 0,
},
});
}
return acc;
}, [])}
defaultValue={currentRole || roles[0].name}
onChange={async (roleName) => {
api.auth.setRole(roleName);

3
packages/plugins/@nocobase/plugin-acl/src/server/middlewares/setCurrentRole.ts
View File

@ -58,10 +58,11 @@ export async function setCurrentRole(ctx: Context, next) {
ctx.state.currentRoles = userRoles.map((role) => role.name);
return next();
} else if (roleMode === SystemRoleMode.allowUseUnion) {
ctx.state.currentUser.roles = userRoles.concat({
userRoles.unshift({
name: UNION_ROLE_KEY,
title: ctx.t('Full permissions', { ns: 'acl' }),
});
ctx.state.currentUser.roles = userRoles;
}
if (currentRole === UNION_ROLE_KEY) {