From 2cf63974124b7d8b1530f1975a3c2b64d31b7ac0 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Sat, 21 Sep 2024 19:46:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(sj=5F1.2.0=5Fbeta2):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=87=8D=E8=AF=95=E5=9C=BA=E6=99=AF=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/retry/scene/modules/scene-operate-drawer.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/retry/scene/modules/scene-operate-drawer.vue b/src/views/retry/scene/modules/scene-operate-drawer.vue
index e560856..fca83a5 100644
--- a/src/views/retry/scene/modules/scene-operate-drawer.vue
+++ b/src/views/retry/scene/modules/scene-operate-drawer.vue
@@ -6,7 +6,7 @@ import RouteKey from '@/components/common/route-key.vue';
 import { $t } from '@/locales';
 import { fetchAddRetryScene, fetchEditRetryScene } from '@/service/api';
 import { DelayLevel, backOffRecordOptions, enableStatusNumberOptions } from '@/constants/business';
-import { translateOptions } from '@/utils/common';
+import { isNotNull, translateOptions } from '@/utils/common';
 
 defineOptions({
   name: 'SceneOperateDrawer'
@@ -103,7 +103,9 @@ const rules = {
   sceneStatus: [defaultRequiredRule],
   backOff: [defaultRequiredRule],
   maxRetryCount: [defaultRequiredRule],
-  triggerInterval: [defaultRequiredRule],
+  triggerInterval: [
+    { ...defaultRequiredRule, validator: () => isNotNull(model.triggerInterval) || model.backOff === 1 }
+  ],
   deadlineRequest: [defaultRequiredRule],
   executorTimeout: [defaultRequiredRule],
   routeKey: [defaultRequiredRule]
@@ -210,7 +212,8 @@ watch(
   () => model.maxRetryCount,
   () => {
     delayLevelDesc.value = Object.values(DelayLevel).slice(0, model.maxRetryCount).join(',');
-  }
+  },
+  { immediate: true }
 );
 </script>
 

From bcef3b50cdb2ba10ba76cdf136ead6ec95948b13 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Mon, 23 Sep 2024 14:04:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(sj=5F1.2.0-beta2):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/status-switch.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/common/status-switch.vue b/src/components/common/status-switch.vue
index ff28724..efb4efb 100644
--- a/src/components/common/status-switch.vue
+++ b/src/components/common/status-switch.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { useBoolean } from '@sa/hooks';
 import { enableStatusNumberRecord } from '@/constants/business';
+import { $t } from '@/locales';
 
 defineOptions({
   name: 'StatusSwitch'
@@ -31,7 +32,7 @@ const handleUpdateValue = (val: Api.Common.EnableStatusNumber) => {
   value.value = val === 0 ? 1 : 0;
   window.$dialog?.warning({
     title: '系统提示',
-    content: `确定要${enableStatusNumberRecord[val]}${props.info}吗？`,
+    content: `确定要${$t(enableStatusNumberRecord[val])}${props.info}吗？`,
     positiveText: '确定',
     negativeText: '取消',
     onPositiveClick: () => {