fix 修复 用户上传头像后无法编辑问题 头像url改为独立字段避免影响

src/api/system/user/types.ts

@@ -8,7 +8,8 @@ export interface UserInfo {
     userId: string | number;
     userName: string;
     nickName?: string;
-    avatar?: string;
+    avatar?: string | number;
+    avatarUrl?: string;
     deptName?: string;
   };
   roles: string[];
@@ -26,6 +27,7 @@ export interface UserForm {
   gender?: string;
   status?: string;
   remark?: string;
+  avatar?: string | number;
   postIds?: Array<string | number>;
   roleIds?: Array<string | number>;
 }
@@ -68,7 +70,8 @@ export interface UserVO extends BaseEntity {
   email?: string;
   phoneNumber?: string;
   gender?: string;
-  avatar?: string;
+  avatar?: string | number;
+  avatarUrl?: string;
   status?: string;
   deptName?: string;
   roles?: RoleVO[];

src/layouts/BasicLayout.tsx

@@ -454,7 +454,7 @@ export default function BasicLayout() {
         )}
         subMenuItemRender={(item, _dom) => menuNode(item as RuntimeMenuItem)}
         avatarProps={{
-          src: userInfo?.user.avatar || defaultAvatar,
+          src: userInfo?.user.avatarUrl || defaultAvatar,
           title: userInfo?.user.nickName || userInfo?.user.userName,
           render: (_, dom) => (
             <Dropdown menu={{ items: userMenu }} placement="bottomRight" trigger={['click']}>

src/pages/system/user/profile/index.tsx

@@ -329,7 +329,7 @@ export default function Profile() {
           <Card title="个人信息">
             <Space orientation="vertical" size={18} style={{ width: '100%' }}>
               <div style={{ textAlign: 'center' }}>
-                <Avatar size={112} src={user.avatar || defaultAvatar} />
+                <Avatar size={112} src={user.avatarUrl || defaultAvatar} />
                 <div style={{ marginTop: 12 }}>
                   <Upload {...uploadProps}>
                     <Button icon={<UploadOutlined />} loading={avatarUploading}>

src/stores/userStore.ts

@@ -17,7 +17,7 @@ export const useUserStore = create<UserState>(set => ({
             ...userInfo,
             user: {
               ...userInfo.user,
-              avatar: userInfo.user.avatar || defaultAvatar
+              avatarUrl: userInfo.user.avatarUrl || defaultAvatar
             }
           }
         : undefined