diff --git a/src/components/common/scene-trigger-interval.vue b/src/components/common/scene-trigger-interval.vue index 246752b..7efabfc 100644 --- a/src/components/common/scene-trigger-interval.vue +++ b/src/components/common/scene-trigger-interval.vue @@ -22,8 +22,6 @@ const interval = ref(props.backOff === 2 || props.backOff === 4 ? Number /** 保存 `CRON表达式` 类型的 表达式 */ const cron = ref(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'); - /** 监视 触发间隔 变化 */ watch( interval, @@ -70,7 +68,6 @@ watch( :placeholder="$t('page.retryScene.form.triggerInterval')" clearable /> - diff --git a/src/views/retry/scene/modules/scene-operate-drawer.vue b/src/views/retry/scene/modules/scene-operate-drawer.vue index d7c6130..5a9e51b 100644 --- a/src/views/retry/scene/modules/scene-operate-drawer.vue +++ b/src/views/retry/scene/modules/scene-operate-drawer.vue @@ -202,17 +202,6 @@ async function handleSubmit() { emit('submitted'); } -function maxRetryCountUpdate(maxRetryCount: number) { - if (model.backOff !== 1) { - return; - } - let desc = ''; - for (let i = 1; i <= maxRetryCount; i += 1) { - desc += `,${DelayLevel[i as keyof typeof DelayLevel]}`; - } - delayLevelDesc.value = desc.substring(1, desc.length); -} - watch(visible, () => { if (visible.value) { handleUpdateModelWhenEdit(); @@ -220,10 +209,19 @@ watch(visible, () => { } }); +watch( + () => model.backOff, + backOff => { + if (backOff === 1 && model.maxRetryCount > 26) { + model.maxRetryCount = 1; + } + } +); + watch( () => model.maxRetryCount, () => { - maxRetryCountUpdate(model.maxRetryCount); + delayLevelDesc.value = Object.values(DelayLevel).slice(0, model.maxRetryCount).join(','); } ); @@ -299,7 +297,18 @@ watch( - + +