From 6e56a55f6f627aaebb9df829189bf7f09e6dc56f Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Fri, 16 Sep 2022 00:28:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=B9=E6=A1=86=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/crontab/modal.tsx           | 34 ++++++++++++++++-----------
 src/pages/crontab/viewCreateModal.tsx |  4 +++-
 src/pages/dependence/modal.tsx        |  4 +++-
 src/pages/env/editNameModal.tsx       | 29 +++++++++++++----------
 src/pages/env/modal.tsx               |  3 ++-
 src/pages/setting/appModal.tsx        | 21 ++++++++++-------
 src/pages/subscription/modal.tsx      |  2 +-
 7 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/src/pages/crontab/modal.tsx b/src/pages/crontab/modal.tsx
index ad449a26..cd5c04e4 100644
--- a/src/pages/crontab/modal.tsx
+++ b/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](
-          `${config.apiPrefix}crons/labels`,
-          {
-            data: payload,
-          },
-        );
-        if (code === 200) {
-          message.success(
-            action === 'post' ? '添加Labels成功' : '删除Labels成功',
+        try {
+          const { code, data } = await request[action](
+            `${config.apiPrefix}crons/labels`,
+            {
+              data: payload,
+            },
           );
-        } 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);
diff --git a/src/pages/crontab/viewCreateModal.tsx b/src/pages/crontab/viewCreateModal.tsx
index 8fea2c65..3a30d225 100644
--- a/src/pages/crontab/viewCreateModal.tsx
+++ b/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);
     }
diff --git a/src/pages/dependence/modal.tsx b/src/pages/dependence/modal.tsx
index d0c66493..f48ce2c4 100644
--- a/src/pages/dependence/modal.tsx
+++ b/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);
     }
diff --git a/src/pages/env/editNameModal.tsx b/src/pages/env/editNameModal.tsx
index 8c88f13d..c835f267 100644
--- a/src/pages/env/editNameModal.tsx
+++ b/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`, {
-      data: {
-        ids,
-        name: values.name,
-      },
-    });
-    if (code === 200) {
-      message.success('更新环境变量名称成功');
-    } else {
-      message.error(data);
+    try {
+      const { code, data } = await request.put(`${config.apiPrefix}envs/name`, {
+        data: {
+          ids,
+          name: values.name,
+        },
+      });
+
+      if (code === 200) {
+        message.success('更新环境变量名称成功');
+        handleCancel();
+      } else {
+        message.error(data);
+      }
+      setLoading(false);
+    } catch (error) {
+      setLoading(false);
     }
-    setLoading(false);
-    handleCancel();
   };
 
   useEffect(() => {
diff --git a/src/pages/env/modal.tsx b/src/pages/env/modal.tsx
index cbe4ebfb..25a0c9c9 100644
--- a/src/pages/env/modal.tsx
+++ b/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);
     }
diff --git a/src/pages/setting/appModal.tsx b/src/pages/setting/appModal.tsx
index b50b5468..b21b6a8d 100644
--- a/src/pages/setting/appModal.tsx
+++ b/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`, {
-      data: payload,
-    }).catch((err) => {
-      setLoading(false);
-      return {};
-    });
+    try {
+      const { code, data } = await request[method](`${config.apiPrefix}apps`, {
+        data: payload,
+      });
 
-    if (code === 200) {
-      message.success(app ? '更新应用成功' : '新建应用成功');
+      if (code === 200) {
+        message.success(app ? '更新应用成功' : '新建应用成功');
+        handleCancel(data);
+      } else {
+        message.error(data);
+      }
+      setLoading(false);
+    } catch (error) {
       setLoading(false);
-      handleCancel(data);
     }
   };
 
diff --git a/src/pages/subscription/modal.tsx b/src/pages/subscription/modal.tsx
index 9af0ee19..e03e7b37 100644
--- a/src/pages/subscription/modal.tsx
+++ b/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);
     }