From 8d2f866a26b52178617aa915aebf951f5b15ae10 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sat, 18 May 2024 18:12:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=EF=BC=8C=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E7=BC=96=E8=BE=91CRON=E6=B2=A1=E5=B8=A6=E5=87=BA?=
 =?UTF-8?q?=E5=8E=9F=E6=9C=89=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/job-trigger-interval.vue   | 4 ++--
 src/components/common/scene-trigger-interval.vue | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/common/job-trigger-interval.vue b/src/components/common/job-trigger-interval.vue
index ad2d36a..ce71877 100644
--- a/src/components/common/job-trigger-interval.vue
+++ b/src/components/common/job-trigger-interval.vue
@@ -17,10 +17,10 @@ const props = defineProps<Props>();
 const app = useAppStore();
 
 /** 保存 `固定时间` 类型的 时间间隔 */
-const interval = ref<number>(60);
+const interval = ref<number>(props.triggerType === 2 ? Number(model.value) : 60);
 
 /** 保存 `CRON表达式` 类型的 表达式 */
-const cron = ref<string>('* * * * * ?');
+const cron = ref<string>(props.triggerType === 3 ? model.value! : '* * * * * ?');
 
 /** 监视 触发间隔 变化 */
 watch(
diff --git a/src/components/common/scene-trigger-interval.vue b/src/components/common/scene-trigger-interval.vue
index 4e03388..2a8ac0c 100644
--- a/src/components/common/scene-trigger-interval.vue
+++ b/src/components/common/scene-trigger-interval.vue
@@ -17,10 +17,10 @@ const props = defineProps<Props>();
 const app = useAppStore();
 
 /** 保存 `固定时间` 类型的 时间间隔 */
-const interval = ref<number>(60);
+const interval = ref<number>(props.backOff === 2 || props.backOff === 4 ? Number(model.value) : 60);
 
 /** 保存 `CRON表达式` 类型的 表达式 */
-const cron = ref<string>('* * * * * ?');
+const cron = ref<string>(props.backOff === 3 ? model.value! : '* * * * * ?');
 
 const delayLevelDesc = ref('10s,15s,30s,35s,40s,50s,1m,2m,4m,6m,8m,10m,20m,40m,1h,2h,3h,4h,5h,6h,7h,8h,9h,10h,11h,12h');
 
@@ -55,7 +55,7 @@ watch(
     } else if (backOff === 3) {
       model.value = cron.value;
     } else {
-      model.value = '';
+      model.value = '*';
     }
   },
   { immediate: true }