feat(sj_1.0.0_beta3): 优化定时任务时间单位和重试场景单位

src/components/common/job-trigger-interval.vue

@@ -64,7 +64,7 @@ watch(
   <div>
     <NInputGroup v-if="triggerType === 2">
       <NInputNumber v-model:value="interval" :placeholder="$t('page.jobTask.form.triggerInterval')" />
-      <NInputGroupLabel>秒</NInputGroupLabel>
+      <NInputGroupLabel>{{ $t('common.second') }}</NInputGroupLabel>
     </NInputGroup>
     <CronInput
       v-else-if="triggerType === 3"

src/components/common/scene-trigger-interval.vue

@@ -2,6 +2,7 @@
 import { ref, watch } from 'vue';
 import CronInput from '@sa/cron-input';
 import { useAppStore } from '@/store/modules/app';
+import { $t } from '@/locales';
 
 defineOptions({
   name: 'SceneTriggerInterval'
@@ -62,12 +63,11 @@ watch(
 
 <template>
   <CronInput v-if="backOff === 3" v-model="cron" :lang="app.locale" />
-  <NInputNumber
+
-    v-else-if="backOff === 2 || backOff === 4"
+  <NInputGroup v-else-if="backOff === 2 || backOff === 4">
-    v-model:value="interval"
+    <NInputNumber v-model:value="interval" :placeholder="$t('page.retryScene.form.triggerInterval')" clearable />
-    :placeholder="$t('page.retryScene.form.triggerInterval')"
+    <NInputGroupLabel>{{ $t('common.second') }}</NInputGroupLabel>
-    clearable
+  </NInputGroup>
-  />
 </template>
 
 <style scoped></style>

src/locales/langs/en-us.ts

@@ -25,6 +25,8 @@ const local: App.I18n.Schema = {
     deleteSuccess: 'Delete Success',
     confirmDelete: 'Are you sure you want to delete?',
     checkUploadType: 'Only JSON format files can be uploaded, please re-upload',
+    second: 's',
+    millisecond: 'ms',
     import: 'import',
     export: 'export',
     batchCopy: 'BatchCopy',
@@ -865,9 +867,9 @@ const local: App.I18n.Schema = {
       sceneStatus: 'State',
       backOff: 'Backoff strategy',
       maxRetryCount: 'Maximum number of retries',
-      triggerInterval: 'Intervals(s)',
+      triggerInterval: 'Intervals',
-      deadlineRequest: 'Call chain timeout(ms)',
+      deadlineRequest: 'Call chain timeout',
-      executorTimeout: 'Overtime time(s)',
+      executorTimeout: 'Overtime time',
       createDt: 'Creation time',
       updateDt: 'Update time',
       description: 'Describe',

src/locales/langs/zh-cn.ts

@@ -25,6 +25,8 @@ const local: App.I18n.Schema = {
     deleteSuccess: '删除成功',
     confirmDelete: '确认删除吗？',
     checkUploadType: '只能上传json格式的文件，请重新上传',
+    second: '秒',
+    millisecond: '毫秒',
     import: '导入',
     export: '导出',
     batchCopy: '批量复制',
@@ -872,9 +874,9 @@ const local: App.I18n.Schema = {
       sceneStatus: '状态',
       backOff: '退避策略',
       maxRetryCount: '最大重试次数',
-      triggerInterval: '间隔时间(秒)',
+      triggerInterval: '间隔时间',
-      deadlineRequest: '调用链超时时间(毫秒)',
+      deadlineRequest: '调用链超时时间',
-      executorTimeout: '超时时间(秒)',
+      executorTimeout: '超时时间',
       createDt: '创建时间',
       updateDt: '更新时间',
       description: '描述',

src/typings/app.d.ts

@@ -275,6 +275,8 @@ declare namespace App {
         deleteSuccess: string;
         confirmDelete: string;
         checkUploadType: string;
+        second: string;
+        millisecond: string;
         import: string;
         export: string;
         batchCopy: string;

src/views/job/task/modules/job-task-operate-drawer.vue

@@ -371,6 +371,7 @@ watch(visible, () => {
                 :placeholder="$t('page.jobTask.form.executorTimeout')"
                 clearable
               />
+              <NInputGroupLabel>{{ $t('common.second') }}</NInputGroupLabel>
             </NInputGroup>
           </NFormItem>
         </NGi>
@@ -389,13 +390,16 @@ watch(visible, () => {
       <NGrid cols="2 s:1 m:2" responsive="screen" x-gap="20">
         <NGi>
           <NFormItem :label="$t('page.jobTask.retryInterval')" path="retryInterval">
-            <NInputNumber
+            <NInputGroup>
-              v-model:value="model.retryInterval"
+              <NInputNumber
-              :min="1"
+                v-model:value="model.retryInterval"
-              :max="99999999"
+                :min="1"
-              :placeholder="$t('page.jobTask.form.retryInterval')"
+                :max="99999999"
-              clearable
+                :placeholder="$t('page.jobTask.form.retryInterval')"
-            />
+                clearable
+              />
+              <NInputGroupLabel>{{ $t('common.second') }}</NInputGroupLabel>
+            </NInputGroup>
           </NFormItem>
         </NGi>
         <NGi>

src/views/retry/scene/modules/scene-operate-drawer.vue

@@ -330,24 +330,30 @@ watch(
       <NGrid cols="2 s:1 m:2" responsive="screen" x-gap="20">
         <NGi>
           <NFormItem :label="$t('page.retryScene.executorTimeout')" path="executorTimeout">
-            <NInputNumber
+            <NInputGroup>
-              v-model:value="model.executorTimeout"
+              <NInputNumber
-              :min="1"
+                v-model:value="model.executorTimeout"
-              :max="60"
+                :min="1"
-              :placeholder="$t('page.retryScene.form.executorTimeout')"
+                :max="60"
-              clearable
+                :placeholder="$t('page.retryScene.form.executorTimeout')"
-            />
+                clearable
+              />
+              <NInputGroupLabel>{{ $t('common.second') }}</NInputGroupLabel>
+            </NInputGroup>
           </NFormItem>
         </NGi>
         <NGi>
           <NFormItem :label="$t('page.retryScene.deadlineRequest')" path="deadlineRequest">
-            <NInputNumber
+            <NInputGroup>
-              v-model:value="model.deadlineRequest"
+              <NInputNumber
-              :min="100"
+                v-model:value="model.deadlineRequest"
-              :max="60000"
+                :min="100"
-              :placeholder="$t('page.retryScene.form.deadlineRequest')"
+                :max="60000"
-              clearable
+                :placeholder="$t('page.retryScene.form.deadlineRequest')"
-            />
+                clearable
+              />
+              <NInputGroupLabel>{{ $t('common.millisecond') }}</NInputGroupLabel>
+            </NInputGroup>
           </NFormItem>
         </NGi>
       </NGrid>