From 6649aa8cfa147c22d4c40aaaef872726b1164e0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com> Date: Mon, 6 Mar 2023 17:41:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E5=91=98=E6=96=B0=E5=BB=BA=E3=80=81?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/member/create.tsx | 32 +++++++++++++++++++++----------- src/pages/member/update.tsx | 32 +++++++++++++++++++++----------- 2 files changed, 42 insertions(+), 22 deletions(-) diff --git a/src/pages/member/create.tsx b/src/pages/member/create.tsx index f06cbf3..437ffcb 100644 --- a/src/pages/member/create.tsx +++ b/src/pages/member/create.tsx @@ -5,6 +5,12 @@ import { user, department } from "../../api/index"; import { useNavigate } from "react-router-dom"; import { UploadImageButton } from "../../compenents"; +interface Option { + value: string | number; + label: string; + children?: Option[]; +} + export const MemberCreatePage: React.FC = () => { const navigate = useNavigate(); const [form] = Form.useForm(); @@ -19,7 +25,7 @@ export const MemberCreatePage: React.FC = () => { const getParams = () => { department.departmentList().then((res: any) => { const departments = res.data.departments; - const new_arr = checkArr(departments, 0); + const new_arr: Option[] = checkArr(departments, 0); console.log(new_arr); setDepartments(new_arr); }); @@ -34,7 +40,7 @@ export const MemberCreatePage: React.FC = () => { value: departments[id][i].id, }); } else { - const new_arr: any[] = checkArr(departments, departments[id][i].id); + const new_arr: Option[] = checkArr(departments, departments[id][i].id); arr.push({ label: departments[id][i].name, value: departments[id][i].id, @@ -97,15 +103,19 @@ export const MemberCreatePage: React.FC = () => { name="avatar" rules={[{ required: true, message: "请上传学员头像!" }]} > - { - setAvatar(url); - form.setFieldsValue({ avatar: url }); - }} - > - {avatar && ( - - )} +
+
+ { + setAvatar(url); + form.setFieldsValue({ avatar: url }); + }} + > +
+ {avatar && ( + + )} +
{ const params = useParams(); const navigate = useNavigate(); @@ -23,7 +29,7 @@ export const MemberUpdatePage: React.FC = () => { const getParams = () => { department.departmentList().then((res: any) => { const departments = res.data.departments; - const new_arr = checkArr(departments, 0); + const new_arr: Option[] = checkArr(departments, 0); console.log(new_arr); setDepartments(new_arr); }); @@ -53,7 +59,7 @@ export const MemberUpdatePage: React.FC = () => { value: departments[id][i].id, }); } else { - const new_arr: any[] = checkArr(departments, departments[id][i].id); + const new_arr: Option[] = checkArr(departments, departments[id][i].id); arr.push({ label: departments[id][i].name, value: departments[id][i].id, @@ -126,15 +132,19 @@ export const MemberUpdatePage: React.FC = () => { name="avatar" rules={[{ required: true, message: "请上传学员头像!" }]} > - { - setAvatar(url); - form.setFieldsValue({ avatar: url }); - }} - > - {avatar && ( - - )} +
+
+ { + setAvatar(url); + form.setFieldsValue({ avatar: url }); + }} + > +
+ {avatar && ( + + )} +