修改弹框表单逻辑

src/pages/crontab/modal.tsx

@@ -28,13 +28,14 @@ const CronModal = ({
       const { code, data } = await request[method](`${config.apiPrefix}crons`, {
         data: payload,
       });
+
       if (code === 200) {
         message.success(cron ? '更新Cron成功' : '新建Cron成功');
+        handleCancel(data);
       } else {
         message.error(data);
       }
       setLoading(false);
-      handleCancel(data);
     } catch (error: any) {
       setLoading(false);
     }
@@ -128,21 +129,26 @@ const CronLabelModal = ({
       .then(async (values) => {
         setLoading(true);
         const payload = { ids, labels: values.labels };
-        const { code, data } = await request[action](
+        try {
-          `${config.apiPrefix}crons/labels`,
+          const { code, data } = await request[action](
-          {
+            `${config.apiPrefix}crons/labels`,
-            data: payload,
+            {
-          },
+              data: payload,
-        );
+            },
-        if (code === 200) {
-          message.success(
-            action === 'post' ? '添加Labels成功' : '删除Labels成功',
           );
-        } else {
+
-          message.error(data);
+          if (code === 200) {
+            message.success(
+              action === 'post' ? '添加Labels成功' : '删除Labels成功',
+            );
+            handleCancel(true);
+          } else {
+            message.error(data);
+          }
+          setLoading(false);
+        } catch (error) {
+          setLoading(false);
         }
-        setLoading(false);
-        handleCancel(true);
       })
       .catch((info) => {
         console.log('Validate Failed:', info);

src/pages/crontab/viewCreateModal.tsx

@@ -65,11 +65,13 @@ const ViewCreateModal = ({
           data: view ? { ...values, id: view.id } : values,
         },
       );
+
       if (code !== 200) {
         message.error(data);
+      } else {
+        handleCancel(data);
       }
       setLoading(false);
-      handleCancel(data);
     } catch (error: any) {
       setLoading(false);
     }

src/pages/dependence/modal.tsx

@@ -52,11 +52,13 @@ const DependenceModal = ({
           data: payload,
         },
       );
+
       if (code !== 200) {
         message.error(data);
+      } else {
+        handleCancel(data);
       }
       setLoading(false);
-      handleCancel(data);
     } catch (error) {
       setLoading(false);
     }

src/pages/env/editNameModal.tsx

@@ -17,19 +17,24 @@ const EditNameModal = ({
 
   const handleOk = async (values: any) => {
     setLoading(true);
-    const { code, data } = await request.put(`${config.apiPrefix}envs/name`, {
+    try {
-      data: {
+      const { code, data } = await request.put(`${config.apiPrefix}envs/name`, {
-        ids,
+        data: {
-        name: values.name,
+          ids,
-      },
+          name: values.name,
-    });
+        },
-    if (code === 200) {
+      });
-      message.success('更新环境变量名称成功');
+
-    } else {
+      if (code === 200) {
-      message.error(data);
+        message.success('更新环境变量名称成功');
+        handleCancel();
+      } else {
+        message.error(data);
+      }
+      setLoading(false);
+    } catch (error) {
+      setLoading(false);
     }
-    setLoading(false);
-    handleCancel();
   };
 
   useEffect(() => {

src/pages/env/modal.tsx

@@ -40,13 +40,14 @@ const EnvModal = ({
       const { code, data } = await request[method](`${config.apiPrefix}envs`, {
         data: payload,
       });
+
       if (code === 200) {
         message.success(env ? '更新变量成功' : '新建变量成功');
+        handleCancel(data);
       } else {
         message.error(data);
       }
       setLoading(false);
-      handleCancel(data);
     } catch (error: any) {
       setLoading(false);
     }

src/pages/setting/appModal.tsx

@@ -22,17 +22,20 @@ const AppModal = ({
     if (app) {
       payload.id = app.id;
     }
-    const { code, data } = await request[method](`${config.apiPrefix}apps`, {
+    try {
-      data: payload,
+      const { code, data } = await request[method](`${config.apiPrefix}apps`, {
-    }).catch((err) => {
+        data: payload,
-      setLoading(false);
+      });
-      return {};
-    });
 
-    if (code === 200) {
+      if (code === 200) {
-      message.success(app ? '更新应用成功' : '新建应用成功');
+        message.success(app ? '更新应用成功' : '新建应用成功');
+        handleCancel(data);
+      } else {
+        message.error(data);
+      }
+      setLoading(false);
+    } catch (error) {
       setLoading(false);
-      handleCancel(data);
     }
   };
 

src/pages/subscription/modal.tsx

@@ -39,11 +39,11 @@ const SubscriptionModal = ({
       );
       if (code === 200) {
         message.success(subscription ? '更新订阅成功' : '新建订阅成功');
+        handleCancel(data);
       } else {
         message.error(data);
       }
       setLoading(false);
-      handleCancel(data);
     } catch (error: any) {
       setLoading(false);
     }