shuguang/aigc
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix: fix Avatar display

Browse Source
This commit is contained in:
shuguang 2025-05-08 21:23:59 +08:00
parent 9b0db2cd2f
commit a582592490
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app.tsx
View File

@ -42,7 +42,7 @@ export const layout: RunTimeLayoutConfig = ({ initialState, setInitialState }) =
src: initialState?.currentUser?.userAvatar,
title: <AvatarName />,
render: (_, avatarChildren) => {
return <AvatarDropdown>{avatarChildren}</AvatarDropdown>;
return <AvatarDropdown initState={initialState}>{avatarChildren}</AvatarDropdown>;
},
},
waterMarkProps: {
@ -111,7 +111,7 @@ export const layout: RunTimeLayoutConfig = ({ initialState, setInitialState }) =
* @doc https://umijs.org/docs/max/request#配置
*/
export const request = {
baseURL:"http://localhost:8101",
withCredentials:true,
...errorConfig,

15
src/components/RightContent/AvatarDropdown.tsx
View File

@ -38,7 +38,8 @@ const useStyles = createStyles(({ token }) => {
};
});
export const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu, children }) => {
export const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu,initState, children }) => {
/**
* 退出登录，并且将当前的 url 保存
*/
@ -89,11 +90,13 @@ export const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu, childre
</span>
);
if (!initialState) {
return loading;
}
// if (!initialState) {
// return loading;
// }
const { currentUser } = initialState;
const { currentUser } = initState;
console.log('currentUser:',currentUser,initState)
if (!currentUser || !currentUser.userName) {
return loading;
@ -135,4 +138,4 @@ export const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu, childre
{children}
</HeaderDropdown>
);
};
};