Merge branch '1.2.0-beta2' into preview

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: () => {

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>