From 5b6843b5c0f6d45d2352537b8b20f5fcee121806 Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Tue, 18 Jan 2022 23:50:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/services/cron.ts   |  5 ++++-
 src/pages/env/modal.tsx | 22 +++++++++++++---------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/back/services/cron.ts b/back/services/cron.ts
index a38875ce..ce4bec20 100644
--- a/back/services/cron.ts
+++ b/back/services/cron.ts
@@ -163,7 +163,10 @@ export default class CronService {
       }
     }
     try {
-      const result = await CrontabModel.findAll({ where: query });
+      const result = await CrontabModel.findAll({
+        where: query,
+        order: [['updatedAt', 'DESC']],
+      });
       return result as any;
     } catch (error) {
       throw error;
diff --git a/src/pages/env/modal.tsx b/src/pages/env/modal.tsx
index 164de6de..f6131bab 100644
--- a/src/pages/env/modal.tsx
+++ b/src/pages/env/modal.tsx
@@ -36,16 +36,20 @@ const EnvModal = ({
     } else {
       payload = { ...values, id: env.id };
     }
-    const { code, data } = await request[method](`${config.apiPrefix}envs`, {
-      data: payload,
-    });
-    if (code === 200) {
-      message.success(env ? '更新变量成功' : '新建变量成功');
-    } else {
-      message.error(data);
+    try {
+      const { code, data } = await request[method](`${config.apiPrefix}envs`, {
+        data: payload,
+      });
+      if (code === 200) {
+        message.success(env ? '更新变量成功' : '新建变量成功');
+      } else {
+        message.error(data);
+      }
+      setLoading(false);
+      handleCancel(data);
+    } catch (error: any) {
+      setLoading(false);
     }
-    setLoading(false);
-    handleCancel(data);
   };
 
   useEffect(() => {