ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: root role is not displayed

Browse Source
This commit is contained in:
chenos 2022-04-10 21:02:05 +08:00
parent c4afb7586c
commit b586d370f0
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/acl/ACLProvider.tsx
View File

@ -26,7 +26,7 @@ export const ACLRolesCheckProvider = (props) => {
}, },
{ {
onSuccess(data) { onSuccess(data) {
if (!data?.data?.allowConfigure) { if (!data?.data?.allowConfigure && !data?.data?.allowAll) {
setDesignable(false); setDesignable(false);
} }
}, },

7
packages/client/src/user/SwitchRole.tsx
View File

@ -8,7 +8,12 @@ import { useCurrentUserContext } from './CurrentUserProvider';
const useCurrentRoles = () => { const useCurrentRoles = () => {
const { data } = useCurrentUserContext(); const { data } = useCurrentUserContext();
return [ return [
...(data?.data?.roles || []), ...(data?.data?.roles || []).map(item => {
return {
title: item.title,
name: item.name,
}
}),
{ {
title: 'Anonymous', title: 'Anonymous',
name: 'anonymous', name: 'anonymous',