From e85dcd7b5627342c84d92ac90b7992c786617a9c Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Wed, 15 May 2024 16:58:39 +0800
Subject: [PATCH 01/17] =?UTF-8?q?fix:=20=E9=97=B4=E9=9A=94=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/job-trigger-interval.vue           | 79 +++++++++++++++++++
 .../common/scene-trigger-interval.vue         | 76 ++++++++++++++++++
 src/typings/api.d.ts                          |  2 +-
 .../task/modules/job-task-operate-drawer.vue  | 14 +---
 .../scene/modules/scene-operate-drawer.vue    | 14 +---
 5 files changed, 160 insertions(+), 25 deletions(-)
 create mode 100644 src/components/common/job-trigger-interval.vue
 create mode 100644 src/components/common/scene-trigger-interval.vue

diff --git a/src/components/common/job-trigger-interval.vue b/src/components/common/job-trigger-interval.vue
new file mode 100644
index 0000000..ad2d36a
--- /dev/null
+++ b/src/components/common/job-trigger-interval.vue
@@ -0,0 +1,79 @@
+<script setup lang="ts">
+import { ref, watch } from 'vue';
+import CronInput from '@sa/cron-input';
+import { useAppStore } from '@/store/modules/app';
+
+defineOptions({
+  name: 'JobTriggerInterval'
+});
+
+interface Props {
+  triggerType: number;
+}
+
+const model = defineModel<string>();
+const props = defineProps<Props>();
+
+const app = useAppStore();
+
+/** 保存 `固定时间` 类型的 时间间隔 */
+const interval = ref<number>(60);
+
+/** 保存 `CRON表达式` 类型的 表达式 */
+const cron = ref<string>('* * * * * ?');
+
+/** 监视 触发间隔 变化 */
+watch(
+  interval,
+  val => {
+    if (props.triggerType === 2) {
+      model.value = `${val}`;
+    }
+  },
+  { immediate: true }
+);
+
+/** 监视 cron 表达式变化 */
+watch(
+  cron,
+  val => {
+    if (props.triggerType === 3) {
+      model.value = val;
+    }
+  },
+  { immediate: true }
+);
+
+/** 根据不同 triggerType, 为model赋值 */
+watch(
+  () => props.triggerType,
+  triggerType => {
+    if (triggerType === 2) {
+      model.value = `${interval.value}`;
+    } else if (triggerType === 3) {
+      model.value = cron.value;
+    } else {
+      model.value = '*';
+    }
+  },
+  { immediate: true }
+);
+</script>
+
+<template>
+  <div>
+    <NInputGroup v-if="triggerType === 2">
+      <NInputNumber v-model:value="interval" :placeholder="$t('page.jobTask.form.triggerInterval')" />
+      <NInputGroupLabel>秒</NInputGroupLabel>
+    </NInputGroup>
+    <CronInput
+      v-else-if="triggerType === 3"
+      v-model="cron"
+      :placeholder="$t('page.jobTask.form.triggerInterval_CRON')"
+      :lang="app.locale"
+    />
+    <NInput v-else-if="triggerType === 99" disabled />
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/src/components/common/scene-trigger-interval.vue b/src/components/common/scene-trigger-interval.vue
new file mode 100644
index 0000000..75147b1
--- /dev/null
+++ b/src/components/common/scene-trigger-interval.vue
@@ -0,0 +1,76 @@
+<script setup lang="ts">
+import { ref, watch } from 'vue';
+import CronInput from '@sa/cron-input';
+import { useAppStore } from '@/store/modules/app';
+
+defineOptions({
+  name: 'SceneTriggerInterval'
+});
+
+interface Props {
+  backOff: number;
+}
+
+const model = defineModel<string>();
+const props = defineProps<Props>();
+
+const app = useAppStore();
+
+/** 保存 `固定时间` 类型的 时间间隔 */
+const interval = ref<number>(60);
+
+/** 保存 `CRON表达式` 类型的 表达式 */
+const cron = ref<string>('* * * * * ?');
+
+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,
+  val => {
+    if (props.backOff === 2 || props.backOff === 4) {
+      model.value = `${val}`;
+    }
+  },
+  { immediate: true }
+);
+
+/** 监视 cron表达式 变化 */
+watch(
+  cron,
+  val => {
+    if (props.backOff === 3) {
+      model.value = val;
+    }
+  },
+  { immediate: true }
+);
+
+/** 根据不同 backOff 对model赋值 */
+watch(
+  () => props.backOff,
+  backOff => {
+    if (backOff === 2 || backOff === 4) {
+      model.value = `${interval.value}`;
+    } else if (backOff === 3) {
+      model.value = cron.value;
+    } else {
+      model.value = delayLevelDesc.value;
+    }
+  },
+  { immediate: true }
+);
+</script>
+
+<template>
+  <CronInput v-if="backOff === 3" v-model="cron" :lang="app.locale" />
+  <NInputNumber
+    v-else-if="backOff === 2 || backOff === 4"
+    v-model:value="interval"
+    :placeholder="$t('page.retryScene.form.triggerInterval')"
+    clearable
+  />
+  <NInput v-else v-model:value="delayLevelDesc" type="textarea" :autosize="{ minRows: 1, maxRows: 3 }" readonly />
+</template>
+
+<style scoped></style>
diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index fa8e6e3..3b024e0 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -812,7 +812,7 @@ declare namespace Api {
       /** 最大重试次数 */
       maxRetryCount: number;
       /** 间隔时间 */
-      triggerInterval: number;
+      triggerInterval: string;
       /** 调用链超时时间 */
       deadlineRequest: number;
       /** 超时时间 */
diff --git a/src/views/job/task/modules/job-task-operate-drawer.vue b/src/views/job/task/modules/job-task-operate-drawer.vue
index 709238d..f3821fe 100644
--- a/src/views/job/task/modules/job-task-operate-drawer.vue
+++ b/src/views/job/task/modules/job-task-operate-drawer.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { computed, reactive, watch } from 'vue';
-import CronInput from '@sa/cron-input';
 import { useFormRules, useNaiveForm } from '@/hooks/common/form';
 import OperateDrawer from '@/components/common/operate-drawer.vue';
 import { $t } from '@/locales';
@@ -10,6 +9,7 @@ import RouteKey from '@/components/common/route-key.vue';
 import ExecutorType from '@/components/common/executor-type.vue';
 import TaskType from '@/components/common/task-type.vue';
 import CodeMirror from '@/components/common/code-mirror.vue';
+import JobTriggerInterval from '@/components/common/job-trigger-interval.vue';
 
 defineOptions({
   name: 'JobTaskOperateDrawer'
@@ -350,17 +350,7 @@ watch(visible, () => {
         />
       </NFormItem>
       <NFormItem :label="$t('page.jobTask.triggerInterval')" path="triggerInterval">
-        <NInput
-          v-if="model.triggerType === 2"
-          v-model:value="model.triggerInterval"
-          :placeholder="$t('page.jobTask.form.triggerInterval')"
-        />
-        <CronInput
-          v-else-if="model.triggerType === 3"
-          v-model:value="model.triggerInterval"
-          :placeholder="$t('page.jobTask.form.triggerInterval_CRON')"
-        />
-        <NInput v-else-if="model.triggerType === 99" v-model:value="model.triggerInterval" disabled />
+        <JobTriggerInterval v-model="model.triggerInterval" :trigger-type="model.triggerType" />
       </NFormItem>
       <NFormItem :label="$t('page.jobTask.executorTimeout')" path="executorTimeout">
         <NInputNumber
diff --git a/src/views/retry/scene/modules/scene-operate-drawer.vue b/src/views/retry/scene/modules/scene-operate-drawer.vue
index 8143e0e..ac94cbe 100644
--- a/src/views/retry/scene/modules/scene-operate-drawer.vue
+++ b/src/views/retry/scene/modules/scene-operate-drawer.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { computed, nextTick, onMounted, reactive, ref, watch } from 'vue';
-import CronInput from '@sa/cron-input';
 import { useFormRules, useNaiveForm } from '@/hooks/common/form';
 import OperateDrawer from '@/components/common/operate-drawer.vue';
 import RouteKey from '@/components/common/route-key.vue';
@@ -8,7 +7,6 @@ import { $t } from '@/locales';
 import { fetchAddRetryScene, fetchEditRetryScene, fetchGetAllGroupNameList } from '@/service/api';
 import { DelayLevel, backOffRecordOptions, enableStatusNumberOptions } from '@/constants/business';
 import { translateOptions, translateOptions2 } from '@/utils/common';
-import { useAppStore } from '@/store/modules/app';
 
 defineOptions({
   name: 'SceneOperateDrawer'
@@ -21,7 +19,6 @@ interface Props {
   rowData?: Api.RetryScene.Scene | null;
 }
 
-const app = useAppStore();
 const groupNameList = ref<string[]>([]);
 const delayLevelDesc = ref<string>('10s');
 
@@ -72,7 +69,7 @@ function createDefaultModel(): Model {
     sceneStatus: 1,
     backOff: 2,
     maxRetryCount: 1,
-    triggerInterval: 60,
+    triggerInterval: '60',
     deadlineRequest: 60000,
     executorTimeout: 60,
     description: '',
@@ -288,14 +285,7 @@ watch(
         />
       </NFormItem>
       <NFormItem path="triggerInterval">
-        <CronInput v-if="model.backOff === 3" v-model:value="model.triggerInterval as any" :lang="app.locale" />
-        <NInputNumber
-          v-else-if="model.backOff === 2 || model.backOff === 4"
-          v-model:value="model.triggerInterval as any"
-          :placeholder="$t('page.retryScene.form.triggerInterval')"
-          clearable
-        />
-        <NInput v-else v-model:value="delayLevelDesc" type="textarea" :autosize="{ minRows: 1, maxRows: 3 }" readonly />
+        <SceneTriggerInterval v-model="model.triggerInterval" :back-off="model.backOff" />
         <template #label>
           <div class="flex-center">
             {{ $t('page.retryScene.triggerInterval') }}

From a19c4372c3d1679610a6e9469ae8ea220e3019e4 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Wed, 15 May 2024 17:18:56 +0800
Subject: [PATCH 02/17] =?UTF-8?q?fix:=20=E7=BC=96=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9C=BA=E6=99=AF=E5=8C=BA=E5=88=86=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E4=BF=A1=E6=81=AF?=
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 ac94cbe..6b7fa6a 100644
--- a/src/views/retry/scene/modules/scene-operate-drawer.vue
+++ b/src/views/retry/scene/modules/scene-operate-drawer.vue
@@ -152,7 +152,7 @@ async function handleSubmit() {
       routeKey,
       description
     } = model;
-    fetchAddRetryScene({
+    const { error } = await fetchAddRetryScene({
       groupName,
       sceneName,
       sceneStatus,
@@ -164,6 +164,8 @@ async function handleSubmit() {
       routeKey,
       description
     });
+    if (error) return;
+    window.$message?.success($t('common.addSuccess'));
   }
 
   if (props.operateType === 'edit') {
@@ -180,7 +182,7 @@ async function handleSubmit() {
       routeKey,
       description
     } = model;
-    fetchEditRetryScene({
+    const { error } = await fetchEditRetryScene({
       id,
       groupName,
       sceneName,
@@ -193,8 +195,9 @@ async function handleSubmit() {
       routeKey,
       description
     });
+    if (error) return;
+    window.$message?.success($t('common.updateSuccess'));
   }
-  window.$message?.success($t('common.updateSuccess'));
   closeDrawer();
   emit('submitted');
 }

From 75e9364c2e79bbf59586fa4e120e701cd65ab1fc Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Wed, 15 May 2024 18:36:57 +0800
Subject: [PATCH 03/17] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E7=BB=84=E4=BB=B6=E5=AD=97=E6=AE=B5=E7=BC=BA=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/log-drawer.vue                      | 5 ++---
 src/typings/api.d.ts                                      | 2 ++
 src/views/retry/log/modules/retry-log-detail-drawer.vue   | 3 ++-
 src/views/retry/task/modules/retry-task-detail-drawer.vue | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/common/log-drawer.vue b/src/components/common/log-drawer.vue
index 5686f99..5d6bd38 100644
--- a/src/components/common/log-drawer.vue
+++ b/src/components/common/log-drawer.vue
@@ -95,7 +95,7 @@ function timestampToDate(timestamp: string): string {
             <pre
               v-for="(message, index) in modelValue"
               :key="index"
-            ><NDivider v-if="index !== 0" /><span class="log-hljs-time">{{timestampToDate(message.time_stamp)}}</span><span :class="`log-hljs-level-${message.level}`">{{`\t${message.level}\t`}}</span><span class="log-hljs-thread">{{`[${message.thread}]\t`}}</span><span class="log-hljs-location">{{`${message.location}: \n`}}</span> -<span class="pl-6px">{{`${message.message}\n`}}</span><ThrowableComponent :throwable="message.throwable" /></pre>
+            ><NDivider v-if="index !== 0" /><span class="log-hljs-time">{{timestampToDate(message.time_stamp)}}</span><span :class="`log-hljs-level-${message.level}`">{{`\t${message.level}\t`}}</span><span class="log-hljs-thread">{{ `[${message.host}:${message.port}]\t` }}</span><span class="log-hljs-thread">{{`[${message.thread}]\t`}}</span><span class="log-hljs-location">{{`${message.location}: \n`}}</span> -<span class="pl-6px">{{`${message.message}\n`}}</span><ThrowableComponent :throwable="message.throwable" /></pre>
           </code>
         </div>
       </div>
@@ -107,11 +107,10 @@ function timestampToDate(timestamp: string): string {
         <pre
           v-for="(message, index) in modelValue"
           :key="index"
-        ><NDivider v-if="index !== 0" /><span class="log-hljs-time">{{timestampToDate(message.time_stamp)}}</span><span :class="`log-hljs-level-${message.level}`">{{`\t${message.level}\t`}}</span><span class="log-hljs-thread">{{`[${message.thread}]\t`}}</span><span class="log-hljs-location">{{`${message.location}: \n`}}</span> -<span class="pl-6px">{{`${message.message}\n`}}</span><ThrowableComponent :throwable="message.throwable" /></pre>
+        ><NDivider v-if="index !== 0" /><span class="log-hljs-time">{{timestampToDate(message.time_stamp)}}</span><span :class="`log-hljs-level-${message.level}`">{{`\t${message.level}\t`}}</span><span class="log-hljs-thread">{{ `[${message.host}:${message.port}]\t` }}</span><span class="log-hljs-thread">{{`[${message.thread}]\t`}}</span><span class="log-hljs-location">{{`${message.location}: \n`}}</span> -<span class="pl-6px">{{`${message.message}\n`}}</span><ThrowableComponent :throwable="message.throwable" /></pre>
       </code>
     </div>
   </div>
-  <NEmpty v-else class="h-full" />
 </template>
 
 <style scoped lang="scss">
diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index fa8e6e3..1b95c2f 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -1212,6 +1212,8 @@ declare namespace Api {
 
     type JobMessage = {
       level: JobLevel;
+      host: string;
+      port: string;
       location: string;
       message: string;
       thread: string;
diff --git a/src/views/retry/log/modules/retry-log-detail-drawer.vue b/src/views/retry/log/modules/retry-log-detail-drawer.vue
index a8df105..509d8d0 100644
--- a/src/views/retry/log/modules/retry-log-detail-drawer.vue
+++ b/src/views/retry/log/modules/retry-log-detail-drawer.vue
@@ -102,7 +102,8 @@ onBeforeUnmount(() => {
         </NDescriptions>
       </NTabPane>
       <NTabPane :name="1" :tab="$t('page.log.title')" display-directive="if">
-        <LogDrawer v-model="logList" :drawer="false" />
+        <LogDrawer v-if="logList.length > 0" v-model="logList" :drawer="false" />
+        <NEmpty v-else class="h-full" />
       </NTabPane>
     </NTabs>
   </DetailDrawer>
diff --git a/src/views/retry/task/modules/retry-task-detail-drawer.vue b/src/views/retry/task/modules/retry-task-detail-drawer.vue
index db1d097..a71ba0a 100644
--- a/src/views/retry/task/modules/retry-task-detail-drawer.vue
+++ b/src/views/retry/task/modules/retry-task-detail-drawer.vue
@@ -109,7 +109,8 @@ onBeforeUnmount(() => {
         </NDescriptions>
       </NTabPane>
       <NTabPane :name="1" :tab="$t('page.log.title')" display-directive="if">
-        <LogDrawer v-model="logList" :drawer="false" />
+        <LogDrawer v-if="logList.length > 0" v-model="logList" :drawer="false" />
+        <NEmpty v-else class="h-full" />
       </NTabPane>
     </NTabs>
   </OperateDrawer>

From 0fd728cb5eeb996a0d44810571643ff199caa822 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Wed, 15 May 2024 22:35:38 +0800
Subject: [PATCH 04/17] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/log-drawer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/log-drawer.vue b/src/components/common/log-drawer.vue
index 5d6bd38..211386f 100644
--- a/src/components/common/log-drawer.vue
+++ b/src/components/common/log-drawer.vue
@@ -95,7 +95,7 @@ function timestampToDate(timestamp: string): string {
             <pre
               v-for="(message, index) in modelValue"
               :key="index"
-            ><NDivider v-if="index !== 0" /><span class="log-hljs-time">{{timestampToDate(message.time_stamp)}}</span><span :class="`log-hljs-level-${message.level}`">{{`\t${message.level}\t`}}</span><span class="log-hljs-thread">{{ `[${message.host}:${message.port}]\t` }}</span><span class="log-hljs-thread">{{`[${message.thread}]\t`}}</span><span class="log-hljs-location">{{`${message.location}: \n`}}</span> -<span class="pl-6px">{{`${message.message}\n`}}</span><ThrowableComponent :throwable="message.throwable" /></pre>
+            ><NDivider v-if="index !== 0" /><span class="log-hljs-time inline-block">{{timestampToDate(message.time_stamp)}}</span><span :class="`log-hljs-level-${message.level}`" class="ml-12px mr-12px inline-block">{{`${message.level}`}}</span><span class="log-hljs-thread mr-12px inline-block">{{ `[${message.host}:${message.port}]` }}</span><span class="log-hljs-thread mr-12px inline-block">{{`[${message.thread}]`}}</span><span class="log-hljs-location">{{`${message.location}: \n`}}</span> -<span class="pl-6px">{{`${message.message}`}}</span><ThrowableComponent :throwable="message.throwable" /></pre>
           </code>
         </div>
       </div>

From 5195b5e8e4a4361094a9c8853ef05036430cfcbb Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Wed, 15 May 2024 22:37:41 +0800
Subject: [PATCH 05/17] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E7=94=A8=E6=88=B7=E5=90=8D=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/_builtin/login/modules/pwd-login.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/_builtin/login/modules/pwd-login.vue b/src/views/_builtin/login/modules/pwd-login.vue
index 04acb95..22b77f2 100644
--- a/src/views/_builtin/login/modules/pwd-login.vue
+++ b/src/views/_builtin/login/modules/pwd-login.vue
@@ -20,7 +20,7 @@ interface FormModel {
 
 const model: FormModel = reactive({
   userName: 'admin',
-  password: '654321'
+  password: 'admin'
 });
 
 type RuleKey = Extract<keyof FormModel, 'userName' | 'password'>;

From d3b19cf8c4cb06ba5eaaa92cadc354396bb87e74 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Wed, 15 May 2024 23:08:51 +0800
Subject: [PATCH 06/17] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/modules/global-header/index.vue | 22 +++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/layouts/modules/global-header/index.vue b/src/layouts/modules/global-header/index.vue
index d379a2d..08477c3 100644
--- a/src/layouts/modules/global-header/index.vue
+++ b/src/layouts/modules/global-header/index.vue
@@ -45,6 +45,10 @@ const headerMenus = computed(() => {
 
   return [];
 });
+
+const href = (url: string) => {
+  window.open(url, '_blank');
+};
 </script>
 
 <template>
@@ -58,6 +62,24 @@ const headerMenus = computed(() => {
     <div class="h-full flex-y-center justify-end">
       <NamespaceSelect />
       <GlobalSearch />
+      <ButtonIcon
+        class="color-#c71d23"
+        tooltip-content="Gitee"
+        icon="simple-icons:gitee"
+        @click="href('https://gitee.com/aizuda/snail-job')"
+      />
+      <ButtonIcon
+        tooltip-content="Github"
+        class="color-#010409 dark:color-#e6edf3"
+        icon="simple-icons:github"
+        @click="href('https://github.com/aizuda/snail-job')"
+      />
+      <ButtonIcon
+        tooltip-content="Document"
+        class="color-#272636 dark:color-#f0f2f5"
+        icon="material-symbols:unknown-document-outline"
+        @click="href('https://snailjob.opensnail.com/')"
+      />
       <FullScreen v-if="!appStore.isMobile" :full="isFullscreen" @click="toggle" />
       <LangSwitch :lang="appStore.locale" :lang-options="appStore.localeOptions" @change-lang="appStore.changeLocale" />
       <ThemeSchemaSwitch

From af029fba11320956bde2b56b53a3a3efc818a778 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Wed, 15 May 2024 23:56:51 +0800
Subject: [PATCH 07/17] =?UTF-8?q?feat(sj=5F1.0.0):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=AE=98=E7=BD=91=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json              | 3 ++-
 src/views/about/index.vue | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index aabdc01..2e4c9b7 100644
--- a/package.json
+++ b/package.json
@@ -111,5 +111,6 @@
   "lint-staged": {
     "*": "eslint --fix"
   },
-  "website": "https://www.easyretry.com/pages/78ba75/"
+  "officialWebsite": "https://snailjob.opensnail.com",
+  "website": "https://snailjob.opensnail.com/pages/78ba75/"
 }
diff --git a/src/views/about/index.vue b/src/views/about/index.vue
index c510985..ecbec7f 100644
--- a/src/views/about/index.vue
+++ b/src/views/about/index.vue
@@ -48,7 +48,7 @@ const latestBuildTime = BUILD_TIME;
     <NCard :title="$t('page.about.projectInfo.title')" :bordered="false" size="small" segmented class="card-wrapper">
       <NDescriptions label-placement="left" bordered size="small" :column="column">
         <NDescriptionsItem :label="$t('page.about.projectInfo.officialWebsite')">
-          <a class="text-primary" :href="pkg.website" target="_blank" rel="noopener noreferrer">
+          <a class="text-primary" :href="pkg.officialWebsite" target="_blank" rel="noopener noreferrer">
             {{ $t('page.about.projectInfo.officialWebsite') }}
           </a>
         </NDescriptionsItem>

From 4634d2d91d431f4c3deae8060d2ca9b89f931986 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Thu, 16 May 2024 09:18:42 +0800
Subject: [PATCH 08/17] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/modules/global-header/index.vue | 3 +++
 src/layouts/modules/global-logo/index.vue   | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/layouts/modules/global-header/index.vue b/src/layouts/modules/global-header/index.vue
index 08477c3..01e5385 100644
--- a/src/layouts/modules/global-header/index.vue
+++ b/src/layouts/modules/global-header/index.vue
@@ -63,18 +63,21 @@ const href = (url: string) => {
       <NamespaceSelect />
       <GlobalSearch />
       <ButtonIcon
+        v-if="!appStore.isMobile"
         class="color-#c71d23"
         tooltip-content="Gitee"
         icon="simple-icons:gitee"
         @click="href('https://gitee.com/aizuda/snail-job')"
       />
       <ButtonIcon
+        v-if="!appStore.isMobile"
         tooltip-content="Github"
         class="color-#010409 dark:color-#e6edf3"
         icon="simple-icons:github"
         @click="href('https://github.com/aizuda/snail-job')"
       />
       <ButtonIcon
+        v-if="!appStore.isMobile"
         tooltip-content="Document"
         class="color-#272636 dark:color-#f0f2f5"
         icon="material-symbols:unknown-document-outline"
diff --git a/src/layouts/modules/global-logo/index.vue b/src/layouts/modules/global-logo/index.vue
index 40ec52b..7cda1b2 100644
--- a/src/layouts/modules/global-logo/index.vue
+++ b/src/layouts/modules/global-logo/index.vue
@@ -17,8 +17,8 @@ withDefaults(defineProps<Props>(), {
 
 <template>
   <RouterLink to="/" class="w-full flex-center nowrap-hidden">
-    <SystemLogo class="text-32px text-primary" />
-    <h2 v-show="showTitle" class="pl-8px text-16px text-primary font-bold transition duration-300 ease-in-out">
+    <SystemLogo class="text-36px text-primary" />
+    <h2 v-show="showTitle" class="pl-8px text-27px text-primary font-bold transition duration-300 ease-in-out">
       {{ $t('system.title') }}
     </h2>
   </RouterLink>

From 409114fcd61203a7dbfbd36accf4d524c88c00f8 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Thu, 16 May 2024 13:48:39 +0800
Subject: [PATCH 09/17] =?UTF-8?q?fix:=20=E9=80=89=E6=8B=A9=E5=BB=B6?=
 =?UTF-8?q?=E8=BF=9F=E7=AD=89=E7=BA=A7=E6=97=B6=EF=BC=8C=E9=97=B4=E9=9A=94?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/scene-trigger-interval.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/scene-trigger-interval.vue b/src/components/common/scene-trigger-interval.vue
index 75147b1..4e03388 100644
--- a/src/components/common/scene-trigger-interval.vue
+++ b/src/components/common/scene-trigger-interval.vue
@@ -55,7 +55,7 @@ watch(
     } else if (backOff === 3) {
       model.value = cron.value;
     } else {
-      model.value = delayLevelDesc.value;
+      model.value = '';
     }
   },
   { immediate: true }

From bee2f4a5fc1d2893619867fd61a560143a1d2fd3 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Fri, 17 May 2024 09:26:51 +0800
Subject: [PATCH 10/17] =?UTF-8?q?feat(sj=5F1.0.0):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E9=87=8D=E8=AF=95=E5=9C=BA=E6=99=AF=E7=9A=84=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scene/modules/scene-operate-drawer.vue    | 191 ++++++++++--------
 1 file changed, 108 insertions(+), 83 deletions(-)

diff --git a/src/views/retry/scene/modules/scene-operate-drawer.vue b/src/views/retry/scene/modules/scene-operate-drawer.vue
index 6b7fa6a..727b637 100644
--- a/src/views/retry/scene/modules/scene-operate-drawer.vue
+++ b/src/views/retry/scene/modules/scene-operate-drawer.vue
@@ -240,90 +240,115 @@ watch(
           :placeholder="$t('page.retryScene.form.sceneName')"
         />
       </NFormItem>
-      <NFormItem :label="$t('page.retryScene.groupName')" path="groupName">
-        <NSelect
-          v-model:value="model.groupName"
-          :disabled="props.operateType === 'edit'"
-          :placeholder="$t('page.retryScene.form.groupName')"
-          :options="translateOptions2(groupNameList)"
-          clearable
-        />
-      </NFormItem>
-      <NFormItem :label="$t('common.routeKey.routeLabel')" path="routeKey">
-        <RouteKey v-model:value="model.routeKey" />
-      </NFormItem>
-      <NFormItem :label="$t('page.retryScene.maxRetryCount')" path="maxRetryCount">
-        <NInputNumber
-          v-model:value="model.maxRetryCount"
-          :min="1"
-          :max="model.backOff === 1 ? 26 : 9999999"
-          :placeholder="$t('page.retryScene.form.maxRetryCount')"
-          clearable
-        />
-      </NFormItem>
-      <NFormItem :label="$t('page.retryScene.executorTimeout')" path="executorTimeout">
-        <NInputNumber
-          v-model:value="model.executorTimeout"
-          :min="1"
-          :max="60"
-          :placeholder="$t('page.retryScene.form.executorTimeout')"
-          clearable
-        />
-      </NFormItem>
-      <NFormItem :label="$t('page.retryScene.deadlineRequest')" path="deadlineRequest">
-        <NInputNumber
-          v-model:value="model.deadlineRequest"
-          :min="100"
-          :max="60000"
-          :placeholder="$t('page.retryScene.form.deadlineRequest')"
-          clearable
-        />
-      </NFormItem>
-      <NFormItem :label="$t('page.retryScene.backOff')" path="backOff">
-        <NSelect
-          v-model:value="model.backOff"
-          :placeholder="$t('page.retryScene.form.backOff')"
-          :options="translateOptions(backOffRecordOptions)"
-          clearable
-        />
-      </NFormItem>
-      <NFormItem path="triggerInterval">
-        <SceneTriggerInterval v-model="model.triggerInterval" :back-off="model.backOff" />
-        <template #label>
-          <div class="flex-center">
-            {{ $t('page.retryScene.triggerInterval') }}
-            <NTooltip v-if="model.backOff === 1" trigger="hover">
-              <template #trigger>
-                <NButton text class="ml-6px">
-                  <SvgIcon icon="ant-design:info-circle-outlined" class="mb-1px text-16px" />
-                </NButton>
-              </template>
-              延迟等级是参考RocketMQ的messageDelayLevel设计实现，具体延迟时间如下:
-              【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】
-              <br />
-              <NText strong>执行逻辑:</NText>
-              <NUl align-text>
-                <NLi>第一次执行间隔10s</NLi>
-                <NLi>第二次执行间隔15s</NLi>
-                <NLi>l第二次执行间隔30s</NLi>
-                <NLi>........... 依次类推</NLi>
-              </NUl>
-            </NTooltip>
-          </div>
-        </template>
-      </NFormItem>
-      <NFormItem :label="$t('page.retryScene.sceneStatus')" path="sceneStatus">
-        <NRadioGroup v-model:value="model.sceneStatus" name="sceneStatus">
-          <NSpace>
-            <NRadio
-              v-for="item in enableStatusNumberOptions"
-              :key="item.value"
-              :value="item.value"
-              :label="$t(item.label)"
+      <NGrid cols="24" item-responsive responsive="screen" x-gap="20">
+        <NGi span="0 m:1 l:17">
+          <NFormItem :label="$t('page.retryScene.groupName')" path="groupName">
+            <NSelect
+              v-model:value="model.groupName"
+              :disabled="props.operateType === 'edit'"
+              :placeholder="$t('page.retryScene.form.groupName')"
+              :options="translateOptions2(groupNameList)"
+              clearable
             />
-          </NSpace>
-        </NRadioGroup>
-      </NFormItem>
+          </NFormItem>
+        </NGi>
+        <NGi span="0 m:1 l:7">
+          <NFormItem :label="$t('page.retryScene.sceneStatus')" path="sceneStatus">
+            <NRadioGroup v-model:value="model.sceneStatus" name="sceneStatus">
+              <NSpace>
+                <NRadio
+                  v-for="item in enableStatusNumberOptions"
+                  :key="item.value"
+                  :value="item.value"
+                  :label="$t(item.label)"
+                />
+              </NSpace>
+            </NRadioGroup>
+          </NFormItem>
+        </NGi>
+      </NGrid>
+
+      <NGrid cols="24" item-responsive responsive="screen" x-gap="20">
+        <NGi span="0 m:1 l:12">
+          <NFormItem :label="$t('common.routeKey.routeLabel')" path="routeKey">
+            <RouteKey v-model:value="model.routeKey" />
+          </NFormItem>
+        </NGi>
+        <NGi span="0 m:1 l:12">
+          <NFormItem :label="$t('page.retryScene.maxRetryCount')" path="maxRetryCount">
+            <NInputNumber
+              v-model:value="model.maxRetryCount"
+              :min="1"
+              :max="model.backOff === 1 ? 26 : 9999999"
+              :placeholder="$t('page.retryScene.form.maxRetryCount')"
+              clearable
+            />
+          </NFormItem>
+        </NGi>
+      </NGrid>
+      <NGrid cols="24" item-responsive responsive="screen" x-gap="20">
+        <NGi span="0 m:1 l:12">
+          <NFormItem :label="$t('page.retryScene.backOff')" path="backOff">
+            <NSelect
+              v-model:value="model.backOff"
+              :placeholder="$t('page.retryScene.form.backOff')"
+              :options="translateOptions(backOffRecordOptions)"
+              clearable
+            />
+          </NFormItem>
+        </NGi>
+        <NGi span="0 m:1 l:12">
+          <NFormItem path="triggerInterval">
+            <SceneTriggerInterval v-model="model.triggerInterval" :back-off="model.backOff" />
+            <template #label>
+              <div class="flex-center">
+                {{ $t('page.retryScene.triggerInterval') }}
+                <NTooltip v-if="model.backOff === 1" trigger="hover">
+                  <template #trigger>
+                    <NButton text class="ml-6px">
+                      <SvgIcon icon="ant-design:info-circle-outlined" class="mb-1px text-16px" />
+                    </NButton>
+                  </template>
+                  延迟等级是参考RocketMQ的messageDelayLevel设计实现，具体延迟时间如下:
+                  【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】
+                  <br />
+                  <NText strong>执行逻辑:</NText>
+                  <NUl align-text>
+                    <NLi>第一次执行间隔10s</NLi>
+                    <NLi>第二次执行间隔15s</NLi>
+                    <NLi>l第二次执行间隔30s</NLi>
+                    <NLi>........... 依次类推</NLi>
+                  </NUl>
+                </NTooltip>
+              </div>
+            </template>
+          </NFormItem>
+        </NGi>
+      </NGrid>
+      <NGrid cols="24" item-responsive responsive="screen" x-gap="20">
+        <NGi span="0 m:1 l:12">
+          <NFormItem :label="$t('page.retryScene.executorTimeout')" path="executorTimeout">
+            <NInputNumber
+              v-model:value="model.executorTimeout"
+              :min="1"
+              :max="60"
+              :placeholder="$t('page.retryScene.form.executorTimeout')"
+              clearable
+            />
+          </NFormItem>
+        </NGi>
+        <NGi span="0 m:1 l:12">
+          <NFormItem :label="$t('page.retryScene.deadlineRequest')" path="deadlineRequest">
+            <NInputNumber
+              v-model:value="model.deadlineRequest"
+              :min="100"
+              :max="60000"
+              :placeholder="$t('page.retryScene.form.deadlineRequest')"
+              clearable
+            />
+          </NFormItem>
+        </NGi>
+      </NGrid>
       <NFormItem :label="$t('page.retryScene.description')" path="description">
         <NInput
           v-model:value="model.description"

From 594d0adaf7304ac17a92bae59588a307826cdcbe Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Sat, 18 May 2024 08:58:12 +0800
Subject: [PATCH 11/17] =?UTF-8?q?feat(sj=5F1.0.0=5Fbeta2):=20=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E6=97=B6=E9=97=B4=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/langs/en-us.ts | 2 +-
 src/locales/langs/zh-cn.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index 48e7537..d2f048e 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -946,7 +946,7 @@ const local: App.I18n.Schema = {
       triggerType: 'Trigger type',
       triggerInterval: 'Interval duration',
       blockStrategy: 'Blocking strategy',
-      executorTimeout: 'Overtime time',
+      executorTimeout: 'Overtime time(s)',
       maxRetryTimes: 'Maximum number of retries',
       retryInterval: 'Retry interval',
       taskType: 'Task type',
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index 4a7dabd..9567491 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -953,7 +953,7 @@ const local: App.I18n.Schema = {
       triggerType: '触发类型',
       triggerInterval: '间隔时长',
       blockStrategy: '阻塞策略',
-      executorTimeout: '超时时间',
+      executorTimeout: '超时时间(秒)',
       maxRetryTimes: '最大重试次数',
       retryInterval: '重试间隔',
       taskType: '任务类型',

From ebfc3c9a72e49bcf14a1cf0d19a930dbc0cf48e8 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Sat, 18 May 2024 09:15:28 +0800
Subject: [PATCH 12/17] =?UTF-8?q?feat(sj=5F1.0.0=5Fbeta2):=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E7=9A=84=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E6=9C=80=E5=A4=A7=E6=97=B6=E9=97=B4=E3=80=81=E6=9C=80?=
 =?UTF-8?q?=E5=A4=A7=E8=B6=85=E6=97=B6=E6=AC=A1=E6=95=B0=E3=80=81=E6=9C=80?=
 =?UTF-8?q?=E5=A4=A7=E9=87=8D=E8=AF=95=E9=97=B4=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/job/task/modules/job-task-operate-drawer.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/job/task/modules/job-task-operate-drawer.vue b/src/views/job/task/modules/job-task-operate-drawer.vue
index f3821fe..6d538ab 100644
--- a/src/views/job/task/modules/job-task-operate-drawer.vue
+++ b/src/views/job/task/modules/job-task-operate-drawer.vue
@@ -356,7 +356,7 @@ watch(visible, () => {
         <NInputNumber
           v-model:value="model.executorTimeout"
           :min="1"
-          :max="60"
+          :max="99999999"
           :placeholder="$t('page.jobTask.form.executorTimeout')"
           clearable
         />
@@ -365,7 +365,7 @@ watch(visible, () => {
         <NInputNumber
           v-model:value="model.maxRetryTimes"
           :min="1"
-          :max="60"
+          :max="999"
           :placeholder="$t('page.jobTask.form.maxRetryTimes')"
           clearable
         />
@@ -374,7 +374,7 @@ watch(visible, () => {
         <NInputNumber
           v-model:value="model.retryInterval"
           :min="1"
-          :max="60"
+          :max="99999999"
           :placeholder="$t('page.jobTask.form.retryInterval')"
           clearable
         />
@@ -383,7 +383,7 @@ watch(visible, () => {
         <NInputNumber
           v-model:value="model.parallelNum"
           :min="1"
-          :max="60"
+          :max="999"
           :placeholder="$t('page.jobTask.form.parallelNum')"
           clearable
         />

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 13/17] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E7=BC=96=E8=BE=91CRON=E6=B2=A1=E5=B8=A6?=
 =?UTF-8?q?=E5=87=BA=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 }

From 11373dc904919be0a8e1f9fa6589e46b4a597d13 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sat, 18 May 2024 23:02:41 +0800
Subject: [PATCH 14/17] =?UTF-8?q?fix:=20XxxTriggerInterval=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/common/job-trigger-interval.vue b/src/components/common/job-trigger-interval.vue
index ce71877..06b5e0b 100644
--- a/src/components/common/job-trigger-interval.vue
+++ b/src/components/common/job-trigger-interval.vue
@@ -8,7 +8,7 @@ defineOptions({
 });
 
 interface Props {
-  triggerType: number;
+  triggerType: Api.Common.TriggerType;
 }
 
 const model = defineModel<string>();
diff --git a/src/components/common/scene-trigger-interval.vue b/src/components/common/scene-trigger-interval.vue
index 2a8ac0c..246752b 100644
--- a/src/components/common/scene-trigger-interval.vue
+++ b/src/components/common/scene-trigger-interval.vue
@@ -8,7 +8,7 @@ defineOptions({
 });
 
 interface Props {
-  backOff: number;
+  backOff: Api.RetryScene.BackOff;
 }
 
 const model = defineModel<string>();

From c1f3891eda2d83066faac9f750a40506f29b5e54 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sat, 18 May 2024 23:50:01 +0800
Subject: [PATCH 15/17] =?UTF-8?q?feat:=20<OperateDrawer>=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?:min-size=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/operate-drawer.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/common/operate-drawer.vue b/src/components/common/operate-drawer.vue
index fd8dc82..00ede7a 100644
--- a/src/components/common/operate-drawer.vue
+++ b/src/components/common/operate-drawer.vue
@@ -7,9 +7,10 @@ defineOptions({
 });
 
 interface Props {
-  title?: string;
+  title: string;
+  minSize?: number;
 }
-const props = defineProps<Props>();
+const props = withDefaults(defineProps<Props>(), { minSize: 360 });
 
 interface Emits {
   (e: 'update:modelValue', modelValue: boolean): void;
@@ -25,8 +26,8 @@ const appStore = useAppStore();
 const state = reactive({ width: 0 });
 const isFullscreen = ref(false);
 const drawerWidth = computed(() => {
-  const maxMinWidth = 360;
-  const maxMaxWidth = 600;
+  const maxMinWidth = props.minSize;
+  const maxMaxWidth = Math.max(props.minSize, 600);
   if (appStore.isMobile) {
     return state.width * 0.9 >= maxMinWidth ? `${maxMinWidth}px` : '90%';
   }

From f45aa6fae9aa88af104f560aef5a2e6c9f493693 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sat, 18 May 2024 23:51:42 +0800
Subject: [PATCH 16/17] =?UTF-8?q?feat:=20JobTask,Scene=E8=A1=A8=E5=8D=95NG?=
 =?UTF-8?q?rid=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/modules/job-task-operate-drawer.vue  | 186 +++++++++++-------
 .../scene/modules/scene-operate-drawer.vue    |  26 +--
 2 files changed, 125 insertions(+), 87 deletions(-)

diff --git a/src/views/job/task/modules/job-task-operate-drawer.vue b/src/views/job/task/modules/job-task-operate-drawer.vue
index 6d538ab..8387470 100644
--- a/src/views/job/task/modules/job-task-operate-drawer.vue
+++ b/src/views/job/task/modules/job-task-operate-drawer.vue
@@ -271,7 +271,7 @@ watch(visible, () => {
 </script>
 
 <template>
-  <OperateDrawer v-model="visible" :title="title" @handle-submit="handleSubmit">
+  <OperateDrawer v-model="visible" :title="title" :min-size="480" @handle-submit="handleSubmit">
     <NForm ref="formRef" :model="model" :rules="rules">
       <NFormItem :label="$t('page.jobTask.jobName')" path="jobName">
         <NInput
@@ -281,27 +281,39 @@ watch(visible, () => {
           :placeholder="$t('page.jobTask.form.jobName')"
         />
       </NFormItem>
-      <NFormItem :label="$t('page.jobTask.groupName')" path="groupName">
-        <SelectGroup v-model:value="model.groupName" />
-      </NFormItem>
-      <NFormItem :label="$t('page.jobTask.jobStatus')" path="jobStatus">
-        <NRadioGroup v-model:value="model.jobStatus" name="jobStatus">
-          <NSpace>
-            <NRadio
-              v-for="item in enableStatusNumberOptions"
-              :key="item.value"
-              :value="item.value"
-              :label="$t(item.label)"
-            />
-          </NSpace>
-        </NRadioGroup>
-      </NFormItem>
-      <NFormItem :label="$t('page.jobTask.executorType')" path="executorType">
-        <ExecutorType v-model:value="model.executorType" />
-      </NFormItem>
-      <NFormItem :label="$t('page.jobTask.executorInfo')" path="executorInfo">
-        <NInput v-model:value="model.executorInfo" :placeholder="$t('page.jobTask.form.executorInfo')" />
-      </NFormItem>
+      <NGrid cols="2 s:1 m:2" responsive="screen" x-gap="20">
+        <NGi>
+          <NFormItem :label="$t('page.jobTask.groupName')" path="groupName">
+            <SelectGroup v-model:value="model.groupName" />
+          </NFormItem>
+        </NGi>
+        <NGi>
+          <NFormItem :label="$t('page.jobTask.jobStatus')" path="jobStatus">
+            <NRadioGroup v-model:value="model.jobStatus" name="jobStatus">
+              <NSpace>
+                <NRadio
+                  v-for="item in enableStatusNumberOptions"
+                  :key="item.value"
+                  :value="item.value"
+                  :label="$t(item.label)"
+                />
+              </NSpace>
+            </NRadioGroup>
+          </NFormItem>
+        </NGi>
+      </NGrid>
+      <NGrid cols="2 s:1 m:2" responsive="screen" x-gap="20">
+        <NGi>
+          <NFormItem :label="$t('page.jobTask.executorType')" path="executorType">
+            <ExecutorType v-model:value="model.executorType" />
+          </NFormItem>
+        </NGi>
+        <NGi>
+          <NFormItem :label="$t('page.jobTask.executorInfo')" path="executorInfo">
+            <NInput v-model:value="model.executorInfo" :placeholder="$t('page.jobTask.form.executorInfo')" />
+          </NFormItem>
+        </NGi>
+      </NGrid>
       <NFormItem :label="$t('page.jobTask.taskType')" path="taskType">
         <TaskType v-model:value="model.taskType" :placeholder="$t('page.jobTask.form.taskType')" />
       </NFormItem>
@@ -336,58 +348,84 @@ watch(visible, () => {
         </NCard>
         <CodeMirror v-else v-model="model.argsStr" lang="json" :placeholder="$t('page.jobTask.form.argsStr')" />
       </NFormItem>
-      <NFormItem :label="$t('page.jobTask.routeKey')" path="routeKey">
-        <RouteKey v-model:value="model.routeKey" :task-type="model.taskType" />
-      </NFormItem>
-      <NFormItem :label="$t('page.jobTask.blockStrategy')" path="blockStrategy">
-        <BlockStrategy v-model:value="model.blockStrategy" />
-      </NFormItem>
-      <NFormItem :label="$t('page.jobTask.triggerType')" path="triggerType">
-        <TriggerType
-          v-model:value="model.triggerType"
-          :placeholder="$t('page.jobTask.form.triggerType')"
-          @update:value="model.triggerInterval = ''"
-        />
-      </NFormItem>
-      <NFormItem :label="$t('page.jobTask.triggerInterval')" path="triggerInterval">
-        <JobTriggerInterval v-model="model.triggerInterval" :trigger-type="model.triggerType" />
-      </NFormItem>
-      <NFormItem :label="$t('page.jobTask.executorTimeout')" path="executorTimeout">
-        <NInputNumber
-          v-model:value="model.executorTimeout"
-          :min="1"
-          :max="99999999"
-          :placeholder="$t('page.jobTask.form.executorTimeout')"
-          clearable
-        />
-      </NFormItem>
-      <NFormItem :label="$t('page.jobTask.maxRetryTimes')" path="maxRetryTimes">
-        <NInputNumber
-          v-model:value="model.maxRetryTimes"
-          :min="1"
-          :max="999"
-          :placeholder="$t('page.jobTask.form.maxRetryTimes')"
-          clearable
-        />
-      </NFormItem>
-      <NFormItem :label="$t('page.jobTask.retryInterval')" path="retryInterval">
-        <NInputNumber
-          v-model:value="model.retryInterval"
-          :min="1"
-          :max="99999999"
-          :placeholder="$t('page.jobTask.form.retryInterval')"
-          clearable
-        />
-      </NFormItem>
-      <NFormItem :label="$t('page.jobTask.parallelNum')" path="parallelNum">
-        <NInputNumber
-          v-model:value="model.parallelNum"
-          :min="1"
-          :max="999"
-          :placeholder="$t('page.jobTask.form.parallelNum')"
-          clearable
-        />
-      </NFormItem>
+      <NGrid cols="2 s:1 m:2" responsive="screen" x-gap="20">
+        <NGi>
+          <NFormItem :label="$t('page.jobTask.routeKey')" path="routeKey">
+            <RouteKey v-model:value="model.routeKey" :task-type="model.taskType" />
+          </NFormItem>
+        </NGi>
+        <NGi>
+          <NFormItem :label="$t('page.jobTask.blockStrategy')" path="blockStrategy">
+            <BlockStrategy v-model:value="model.blockStrategy" />
+          </NFormItem>
+        </NGi>
+      </NGrid>
+      <NGrid cols="2 s:1 m:2" responsive="screen" x-gap="20">
+        <NGi>
+          <NFormItem :label="$t('page.jobTask.triggerType')" path="triggerType">
+            <TriggerType
+              v-model:value="model.triggerType"
+              :placeholder="$t('page.jobTask.form.triggerType')"
+              @update:value="model.triggerInterval = ''"
+            />
+          </NFormItem>
+        </NGi>
+        <NGi>
+          <NFormItem :label="$t('page.jobTask.triggerInterval')" path="triggerInterval">
+            <JobTriggerInterval v-model="model.triggerInterval" :trigger-type="model.triggerType" />
+          </NFormItem>
+        </NGi>
+      </NGrid>
+      <NGrid cols="2 s:1 m:2" responsive="screen" x-gap="20">
+        <NGi>
+          <NFormItem :label="$t('page.jobTask.executorTimeout')" path="executorTimeout">
+            <NInputGroup>
+              <NInputNumber
+                v-model:value="model.executorTimeout"
+                :min="1"
+                :max="99999999"
+                :placeholder="$t('page.jobTask.form.executorTimeout')"
+                clearable
+              />
+            </NInputGroup>
+          </NFormItem>
+        </NGi>
+        <NGi>
+          <NFormItem :label="$t('page.jobTask.maxRetryTimes')" path="maxRetryTimes">
+            <NInputNumber
+              v-model:value="model.maxRetryTimes"
+              :min="1"
+              :max="999"
+              :placeholder="$t('page.jobTask.form.maxRetryTimes')"
+              clearable
+            />
+          </NFormItem>
+        </NGi>
+      </NGrid>
+      <NGrid cols="2 s:1 m:2" responsive="screen" x-gap="20">
+        <NGi>
+          <NFormItem :label="$t('page.jobTask.retryInterval')" path="retryInterval">
+            <NInputNumber
+              v-model:value="model.retryInterval"
+              :min="1"
+              :max="99999999"
+              :placeholder="$t('page.jobTask.form.retryInterval')"
+              clearable
+            />
+          </NFormItem>
+        </NGi>
+        <NGi>
+          <NFormItem :label="$t('page.jobTask.parallelNum')" path="parallelNum">
+            <NInputNumber
+              v-model:value="model.parallelNum"
+              :min="1"
+              :max="999"
+              :placeholder="$t('page.jobTask.form.parallelNum')"
+              clearable
+            />
+          </NFormItem>
+        </NGi>
+      </NGrid>
       <NFormItem :label="$t('page.jobTask.description')" path="description">
         <NInput v-model:value="model.description" type="textarea" :placeholder="$t('page.jobTask.form.description')" />
       </NFormItem>
diff --git a/src/views/retry/scene/modules/scene-operate-drawer.vue b/src/views/retry/scene/modules/scene-operate-drawer.vue
index 727b637..d7c6130 100644
--- a/src/views/retry/scene/modules/scene-operate-drawer.vue
+++ b/src/views/retry/scene/modules/scene-operate-drawer.vue
@@ -229,7 +229,7 @@ watch(
 </script>
 
 <template>
-  <OperateDrawer v-model="visible" :title="title" @handle-submit="handleSubmit">
+  <OperateDrawer v-model="visible" :title="title" :min-size="480" @handle-submit="handleSubmit">
     <NForm ref="formRef" :model="model" :rules="rules">
       <NFormItem :label="$t('page.retryScene.sceneName')" path="sceneName">
         <NInput
@@ -240,8 +240,8 @@ watch(
           :placeholder="$t('page.retryScene.form.sceneName')"
         />
       </NFormItem>
-      <NGrid cols="24" item-responsive responsive="screen" x-gap="20">
-        <NGi span="0 m:1 l:17">
+      <NGrid cols="2 s:1 m:2" responsive="screen" x-gap="20">
+        <NGi>
           <NFormItem :label="$t('page.retryScene.groupName')" path="groupName">
             <NSelect
               v-model:value="model.groupName"
@@ -252,7 +252,7 @@ watch(
             />
           </NFormItem>
         </NGi>
-        <NGi span="0 m:1 l:7">
+        <NGi>
           <NFormItem :label="$t('page.retryScene.sceneStatus')" path="sceneStatus">
             <NRadioGroup v-model:value="model.sceneStatus" name="sceneStatus">
               <NSpace>
@@ -268,13 +268,13 @@ watch(
         </NGi>
       </NGrid>
 
-      <NGrid cols="24" item-responsive responsive="screen" x-gap="20">
-        <NGi span="0 m:1 l:12">
+      <NGrid cols="2 s:1 m:2" responsive="screen" x-gap="20">
+        <NGi>
           <NFormItem :label="$t('common.routeKey.routeLabel')" path="routeKey">
             <RouteKey v-model:value="model.routeKey" />
           </NFormItem>
         </NGi>
-        <NGi span="0 m:1 l:12">
+        <NGi>
           <NFormItem :label="$t('page.retryScene.maxRetryCount')" path="maxRetryCount">
             <NInputNumber
               v-model:value="model.maxRetryCount"
@@ -286,8 +286,8 @@ watch(
           </NFormItem>
         </NGi>
       </NGrid>
-      <NGrid cols="24" item-responsive responsive="screen" x-gap="20">
-        <NGi span="0 m:1 l:12">
+      <NGrid cols="2 s:1 m:2" responsive="screen" x-gap="20">
+        <NGi>
           <NFormItem :label="$t('page.retryScene.backOff')" path="backOff">
             <NSelect
               v-model:value="model.backOff"
@@ -297,7 +297,7 @@ watch(
             />
           </NFormItem>
         </NGi>
-        <NGi span="0 m:1 l:12">
+        <NGi>
           <NFormItem path="triggerInterval">
             <SceneTriggerInterval v-model="model.triggerInterval" :back-off="model.backOff" />
             <template #label>
@@ -325,8 +325,8 @@ watch(
           </NFormItem>
         </NGi>
       </NGrid>
-      <NGrid cols="24" item-responsive responsive="screen" x-gap="20">
-        <NGi span="0 m:1 l:12">
+      <NGrid cols="2 s:1 m:2" responsive="screen" x-gap="20">
+        <NGi>
           <NFormItem :label="$t('page.retryScene.executorTimeout')" path="executorTimeout">
             <NInputNumber
               v-model:value="model.executorTimeout"
@@ -337,7 +337,7 @@ watch(
             />
           </NFormItem>
         </NGi>
-        <NGi span="0 m:1 l:12">
+        <NGi>
           <NFormItem :label="$t('page.retryScene.deadlineRequest')" path="deadlineRequest">
             <NInputNumber
               v-model:value="model.deadlineRequest"

From 24d6b3ca030991056efd478b7e04a9d4f5298fcb Mon Sep 17 00:00:00 2001
From: wodeyangzipingpingwuqi <zhengweilins@foxmail.com>
Date: Mon, 20 May 2024 14:36:37 +0800
Subject: [PATCH 17/17] =?UTF-8?q?feat(dev=5F1.0.0=5Fbeta2):=20=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=95=B0=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=EF=BC=88I9QM5C=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/modules/retry-tab.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/home/modules/retry-tab.vue b/src/views/home/modules/retry-tab.vue
index 0df4fed..6d24160 100644
--- a/src/views/home/modules/retry-tab.vue
+++ b/src/views/home/modules/retry-tab.vue
@@ -139,7 +139,7 @@ const createColumns = (): DataTableColumns<Api.Dashboard.Task> => [
     title: $t('page.home.retryTab.task.total'),
     key: 'total',
     align: 'center',
-    render: row => <span class="retry-table-number">{row.run}</span>
+    render: row => <span class="retry-table-number">{row.total}</span>
   }
 ];