diff --git a/src/configs/menuConfig.tsx b/src/configs/menuConfig.tsx
index f996306..3410488 100644
--- a/src/configs/menuConfig.tsx
+++ b/src/configs/menuConfig.tsx
@@ -31,7 +31,7 @@ const authMenu: MenuDataItem = {
icon: ,
children: [
{ name: '管理员信息', path: '/staff/list', auth: 'SF_ADMIN_ADMIN_VIEW' },
- { name: '组织架构', path: '/staff/dep', auth: 'SF_ADMIN_DEPART_VIEW' },
+ { name: '组织架构', path: '/staff/dept', auth: 'SF_ADMIN_DEPART_VIEW' },
{ name: '岗位角色', path: '/staff/group', auth: 'SF_ADMIN_GROUP_VIEW' },
{ name: '我的权限', path: '/staff/auth', auth: 'SF_ADMIN_AUTH_VIEW' },
{ name: '登录日志', path: '/staff/login', auth: 'SF_LOGIN_LOG_VIEW' },
diff --git a/src/configs/routes.ts b/src/configs/routes.ts
index a04c4b3..4e870e8 100644
--- a/src/configs/routes.ts
+++ b/src/configs/routes.ts
@@ -7,7 +7,7 @@ import Index from '@/pages/Index';
import Login from '@/pages/Record/Login';
import Sys from '@/pages/Record/Sys';
import Auth from '@/pages/Staff/Auth';
-import Dep from '@/pages/Staff/Dep';
+import Dept from '@/pages/Staff/Dept';
import Grp from '@/pages/Staff/Grp';
import StaffList from '@/pages/Staff/List';
import UserList from '@/pages/User/List';
@@ -44,7 +44,7 @@ export const routes: IRouteItem[] = [
Layout: AppLayout,
children: [
{ path: '/list', Component: StaffList },
- { path: '/dep', Component: Dep },
+ { path: '/dept', Component: Dept },
{ path: '/group', Component: Grp },
{ path: '/auth', Component: Auth },
{ path: '/login', Component: Login },
diff --git a/src/pages/Profile/components/ProfileEditForm.tsx b/src/pages/Profile/components/ProfileEditForm.tsx
index 5a4fbc6..c5ae1c6 100644
--- a/src/pages/Profile/components/ProfileEditForm.tsx
+++ b/src/pages/Profile/components/ProfileEditForm.tsx
@@ -1,7 +1,6 @@
-import { Button, Form, Input, notification } from 'antd';
-import { stringify } from 'qs';
+import { Button, Form, Input, notification, Upload } from 'antd';
import type React from 'react';
-import { useEffect } from 'react';
+import { useEffect, useRef, useState } from 'react';
import { AdminServices } from '@/services/AdminServices';
import { useUserStore } from '@/store/UserStore';
import type { IRef } from '@/utils/type';
@@ -18,8 +17,10 @@ export type IProfileEditFormType = {
export const ProfileEditForm: React.FC = (props) => {
const [form] = Form.useForm();
const userInfo = useUserStore().user;
+ const [previewUrl, setPreviewUrl] = useState();
+ const avatarFileRef = useRef(null);
- // 请求成功回调
+ // 保存回调
const success = (res: any) => {
if (res.err_code === 0) {
notification.success({ message: '保存成功' });
@@ -27,28 +28,96 @@ export const ProfileEditForm: React.FC = (props) => {
}
};
- const { loading: editLoading, request: editRequest } = useRequest(AdminServices.profile, { onSuccess: success });
+ const { loading: editLoading, request: editRequest } = useRequest(AdminServices.profile, {
+ onSuccess: success,
+ });
+ // 保存方法
const save = async () => {
try {
- const values = await form.validateFields();
- editRequest(stringify(values));
+ const values = await form.getFieldsValue();
+ console.log('values', values);
+ // 使用 FormData
+ const formData = new FormData();
+
+ // 避免空密码提交
+ if (values.password) {
+ formData.append('password', values.password);
+ }
+
+ // 普通字段
+ formData.append('nickname', values.nickname);
+ formData.append('mobile', values.mobile);
+ formData.append('email', values.email || '');
+
+ // 上传头像文件
+ if (avatarFileRef.current) {
+ formData.append('avatar', avatarFileRef.current);
+ }
+
+ //console.log('formData entries:');
+ // formData.forEach((value, key) => {
+ // console.log(key, value);
+ // });
+ //console.log('formData', formData);
+ // 调用 useRequest
+ editRequest(formData);
} catch (error) {
console.log('表单验证未通过', error);
}
};
useEffect(() => {
+ const uri = `${userInfo.avatar}?v=${encodeURIComponent(userInfo.update_date)}`;
+ console.log('uri', uri);
form.setFieldsValue({
username: userInfo.username,
mobile: userInfo.mobile,
email: userInfo.email,
nickname: userInfo.nickname,
+ avatar: uri, // 默认头像
});
+ setPreviewUrl(userInfo.avatar);
}, [userInfo]);
return (