diff --git a/src/pages/department/compenents/create.tsx b/src/pages/department/compenents/create.tsx index e21e533..9e0bce9 100644 --- a/src/pages/department/compenents/create.tsx +++ b/src/pages/department/compenents/create.tsx @@ -123,6 +123,7 @@ export const DepartmentCreate: React.FC = ({ onOk={() => form.submit()} onCancel={() => onCancel()} maskClosable={false} + okButtonProps={{ loading: loading }} >
= ({ onOk={() => form.submit()} onCancel={() => onCancel()} maskClosable={false} + okButtonProps={{ loading: loading }} > {init && (
diff --git a/src/pages/member/compenents/create.tsx b/src/pages/member/compenents/create.tsx index e64d3bb..e5c588f 100644 --- a/src/pages/member/compenents/create.tsx +++ b/src/pages/member/compenents/create.tsx @@ -24,7 +24,7 @@ export const MemberCreate: React.FC = ({ onCancel, }) => { const [form] = Form.useForm(); - const [loading, setLoading] = useState(true); + const [loading, setLoading] = useState(false); const [departments, setDepartments] = useState([]); const memberDefaultAvatar = useSelector( (state: any) => state.systemConfig.value.memberDefaultAvatar @@ -80,10 +80,14 @@ export const MemberCreate: React.FC = ({ }; const onFinish = (values: any) => { + if (loading) { + return; + } if (values.idCard !== "" && !ValidataCredentials(values.idCard)) { message.error("请输入正确的身份证号!"); return; } + setLoading(true); user .storeUser( values.email, @@ -94,8 +98,12 @@ export const MemberCreate: React.FC = ({ values.dep_ids ) .then((res: any) => { + setLoading(false); message.success("保存成功!"); onCancel(); + }) + .catch((e) => { + setLoading(false); }); }; @@ -115,6 +123,7 @@ export const MemberCreate: React.FC = ({ onOk={() => form.submit()} onCancel={() => onCancel()} maskClosable={false} + okButtonProps={{ loading: loading }} >
= ({ }) => { const [form] = Form.useForm(); const [init, setInit] = useState(true); - const [loading, setLoading] = useState(true); + const [loading, setLoading] = useState(false); const [departments, setDepartments] = useState([]); const memberDefaultAvatar = useSelector( (state: any) => state.systemConfig.value.memberDefaultAvatar @@ -105,11 +105,14 @@ export const MemberUpdate: React.FC = ({ }; const onFinish = (values: any) => { + if (loading) { + return; + } if (values.idCard !== "" && !ValidataCredentials(values.idCard)) { message.error("请输入正确的身份证号!"); return; } - + setLoading(true); user .updateUser( id, @@ -121,8 +124,12 @@ export const MemberUpdate: React.FC = ({ values.dep_ids ) .then((res: any) => { + setLoading(false); message.success("保存成功!"); onCancel(); + }) + .catch((e) => { + setLoading(false); }); }; @@ -144,6 +151,7 @@ export const MemberUpdate: React.FC = ({ onOk={() => form.submit()} onCancel={() => onCancel()} maskClosable={false} + okButtonProps={{ loading: loading }} > {init && (
diff --git a/src/pages/resource/resource-category/compenents/create.tsx b/src/pages/resource/resource-category/compenents/create.tsx index 13cba4a..e6563db 100644 --- a/src/pages/resource/resource-category/compenents/create.tsx +++ b/src/pages/resource/resource-category/compenents/create.tsx @@ -123,6 +123,7 @@ export const ResourceCategoryCreate: React.FC = ({ width={416} onOk={() => form.submit()} onCancel={() => onCancel()} + okButtonProps={{ loading: loading }} >
= ({ onOk={() => form.submit()} onCancel={() => onCancel()} maskClosable={false} + okButtonProps={{ loading: loading }} > {init && (
diff --git a/src/pages/system/administrator/compenents/create.tsx b/src/pages/system/administrator/compenents/create.tsx index 49d4a07..ffae3ed 100644 --- a/src/pages/system/administrator/compenents/create.tsx +++ b/src/pages/system/administrator/compenents/create.tsx @@ -22,7 +22,7 @@ export const SystemAdministratorCreate: React.FC = ({ onCancel, }) => { const [form] = Form.useForm(); - const [loading, setLoading] = useState(true); + const [loading, setLoading] = useState(false); const [roles, setRoles] = useState([]); useEffect(() => { @@ -60,6 +60,10 @@ export const SystemAdministratorCreate: React.FC = ({ }; const onFinish = (values: any) => { + if (loading) { + return; + } + setLoading(true); adminUser .storeAdminUser( values.name, @@ -69,8 +73,12 @@ export const SystemAdministratorCreate: React.FC = ({ values.roleIds ) .then((res: any) => { + setLoading(false); message.success("保存成功!"); onCancel(); + }) + .catch((e) => { + setLoading(false); }); }; @@ -100,6 +108,7 @@ export const SystemAdministratorCreate: React.FC = ({ onOk={() => form.submit()} onCancel={() => onCancel()} maskClosable={false} + okButtonProps={{ loading: loading }} >
= ({ }) => { const [form] = Form.useForm(); const [init, setInit] = useState(true); - const [loading, setLoading] = useState(true); + const [loading, setLoading] = useState(false); const [roles, setRoles] = useState([]); useEffect(() => { @@ -70,6 +70,10 @@ export const SystemAdministratorUpdate: React.FC = ({ }; const onFinish = (values: any) => { + if (loading) { + return; + } + setLoading(true); adminUser .updateAdminUser( id, @@ -80,8 +84,12 @@ export const SystemAdministratorUpdate: React.FC = ({ values.roleIds ) .then((res: any) => { + setLoading(false); message.success("保存成功!"); onCancel(); + }) + .catch((e) => { + setLoading(false); }); }; @@ -111,6 +119,7 @@ export const SystemAdministratorUpdate: React.FC = ({ onOk={() => form.submit()} onCancel={() => onCancel()} maskClosable={false} + okButtonProps={{ loading: loading }} > {init && (
diff --git a/src/pages/system/adminroles/compenents/create.tsx b/src/pages/system/adminroles/compenents/create.tsx index ede5536..1193a50 100644 --- a/src/pages/system/adminroles/compenents/create.tsx +++ b/src/pages/system/adminroles/compenents/create.tsx @@ -19,7 +19,7 @@ export const SystemAdminrolesCreate: React.FC = ({ onCancel, }) => { const [form] = Form.useForm(); - const [loading, setLoading] = useState(true); + const [loading, setLoading] = useState(false); const [permissions, setPermissions] = useState([]); const [actions, setActions] = useState([]); @@ -126,6 +126,9 @@ export const SystemAdminrolesCreate: React.FC = ({ }; const onFinish = (values: any) => { + if (loading) { + return; + } let pids = []; let aids = []; if (values.permission_ids.length === 0 && values.action_ids.length === 0) { @@ -138,11 +141,18 @@ export const SystemAdminrolesCreate: React.FC = ({ if (values.action_ids) { aids = values.action_ids; } + setLoading(true); const params = aids.concat(pids); - adminRole.storeAdminRole(values.name, params).then((res: any) => { - message.success("保存成功!"); - onCancel(); - }); + adminRole + .storeAdminRole(values.name, params) + .then((res: any) => { + setLoading(false); + message.success("保存成功!"); + onCancel(); + }) + .catch((e) => { + setLoading(false); + }); }; const onFinishFailed = (errorInfo: any) => { @@ -160,7 +170,11 @@ export const SystemAdminrolesCreate: React.FC = ({ footer={ - diff --git a/src/pages/system/adminroles/compenents/update.tsx b/src/pages/system/adminroles/compenents/update.tsx index 68d1e57..a2c4327 100644 --- a/src/pages/system/adminroles/compenents/update.tsx +++ b/src/pages/system/adminroles/compenents/update.tsx @@ -31,7 +31,7 @@ export const SystemAdminrolesUpdate: React.FC = ({ }) => { const [form] = Form.useForm(); const [init, setInit] = useState(true); - const [loading, setLoading] = useState(true); + const [loading, setLoading] = useState(false); const [permissions, setPermissions] = useState([]); const [actions, setActions] = useState([]); @@ -152,6 +152,9 @@ export const SystemAdminrolesUpdate: React.FC = ({ }; const onFinish = (values: any) => { + if (loading) { + return; + } let pids = []; let aids = []; if (values.permission_ids.length === 0 && values.action_ids.length === 0) { @@ -164,11 +167,18 @@ export const SystemAdminrolesUpdate: React.FC = ({ if (values.action_ids) { aids = values.action_ids; } + setLoading(true); const params = aids.concat(pids); - adminRole.updateAdminRole(id, values.name, params).then((res: any) => { - message.success("保存成功!"); - onCancel(); - }); + adminRole + .updateAdminRole(id, values.name, params) + .then((res: any) => { + setLoading(false); + message.success("保存成功!"); + onCancel(); + }) + .catch((e) => { + setLoading(false); + }); }; const onFinishFailed = (errorInfo: any) => { @@ -186,7 +196,11 @@ export const SystemAdminrolesUpdate: React.FC = ({ footer={ -