From d7e05319351660ff7ef97d2429e1ae7c738a005e Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Sat, 23 Sep 2023 11:14:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=B1=95=E7=A4=BA=E7=89=88=E6=9C=AC=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/services/cron.ts          |  2 +-
 src/pages/dependence/index.tsx |  6 +++---
 src/pages/setting/about.tsx    | 13 ++++---------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/back/services/cron.ts b/back/services/cron.ts
index 77abcf43..9eb903ca 100644
--- a/back/services/cron.ts
+++ b/back/services/cron.ts
@@ -449,7 +449,7 @@ export default class CronService {
       .map((doc) => ({
         id: String(doc.id),
         schedule: doc.schedule!,
-        command: doc.command,
+        command: this.makeCommand(doc),
         extraSchedules: doc.extra_schedules || []
       }));
     await cronClient.addCron(sixCron);
diff --git a/src/pages/dependence/index.tsx b/src/pages/dependence/index.tsx
index 126eb696..3c3a2fd6 100644
--- a/src/pages/dependence/index.tsx
+++ b/src/pages/dependence/index.tsx
@@ -100,7 +100,7 @@ const Dependence = () => {
     {
       title: intl.get('名称'),
       dataIndex: 'name',
-      width: 120,
+      width: 180,
       key: 'name',
     },
     {
@@ -126,7 +126,7 @@ const Dependence = () => {
     {
       title: intl.get('备注'),
       dataIndex: 'remark',
-      width: 120,
+      width: 100,
       key: 'remark',
     },
     {
@@ -150,7 +150,7 @@ const Dependence = () => {
     {
       title: intl.get('操作'),
       key: 'action',
-      width: 150,
+      width: 140,
       render: (text: string, record: any, index: number) => {
         const isPc = !isPhone;
         return (
diff --git a/src/pages/setting/about.tsx b/src/pages/setting/about.tsx
index c9584bad..68af4e60 100644
--- a/src/pages/setting/about.tsx
+++ b/src/pages/setting/about.tsx
@@ -7,15 +7,7 @@ import dayjs from 'dayjs';
 
 const { Link } = Typography;
 
-enum TVersion {
-  'develop' = '开发版',
-  'master' = '正式版',
-  'debian' = '正式版',
-}
-
 const About = ({ systemInfo }: { systemInfo: SharedContext['systemInfo'] }) => {
-  const version = TVersion[systemInfo.branch] || '正式版';
-
   return (
     <div className={styles.container}>
       <img
@@ -32,7 +24,10 @@ const About = ({ systemInfo }: { systemInfo: SharedContext['systemInfo'] }) => {
         </span>
         <Descriptions>
           <Descriptions.Item label={intl.get('版本')} span={3}>
-            {intl.get(version)} v{systemInfo.version}
+            {systemInfo?.branch === 'develop'
+              ? intl.get('开发版')
+              : intl.get('正式版')}{' '}
+            v{systemInfo.version}
           </Descriptions.Item>
           <Descriptions.Item label={intl.get('更新时间')} span={3}>
             {dayjs(systemInfo.publishTime * 1000).format('YYYY-MM-DD HH:mm')}