From ff258af4e59f0b867be0e4a99617a3f8797057c6 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Tue, 11 Jun 2024 09:48:01 +0800
Subject: [PATCH 01/39] =?UTF-8?q?fix(sj=5F1.0.0=5Fbeta1):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20cron=20=E8=A1=A8=E8=BE=BE=E5=BC=8F=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cron-input/src/components/internal/cron-base.vue     | 9 ++++++---
 .../cron-input/src/components/internal/cron-model.vue    | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/cron-input/src/components/internal/cron-base.vue b/packages/cron-input/src/components/internal/cron-base.vue
index 7b2901b..9081ec3 100644
--- a/packages/cron-input/src/components/internal/cron-base.vue
+++ b/packages/cron-input/src/components/internal/cron-base.vue
@@ -15,7 +15,7 @@ interface Props {
     min: number;
     max: number;
   };
-  locale: I18n.LocaleType;
+  locale?: I18n.LocaleType;
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -106,7 +106,9 @@ const value = computed(() => {
       return props.field.value === DATE ? type.value : `${lastDayOfWeek.value}${type.value}`;
     case TYPE.SPECIFY: {
       const specifyValue = specify.value;
-      return specifyValue.length ? specifyValue.sort((a, b) => a - b).join(type.value) : `${specifyValue[0] || 0}`;
+      return specifyValue.length
+        ? specifyValue.sort((a, b) => a - b).join(type.value)
+        : `${specifyValue[0] || specifies.value[0].value}`;
     }
     default:
       return '';
@@ -144,7 +146,8 @@ watch(
       specify.value =
         data !== 'undefined' && data !== 'NaN' ? data.split(TYPE.SPECIFY).map(i => Number.parseInt(i, 10)) : [];
     }
-  }
+  },
+  { immediate: true }
 );
 
 watch(
diff --git a/packages/cron-input/src/components/internal/cron-model.vue b/packages/cron-input/src/components/internal/cron-model.vue
index 00231ec..9cbc1bf 100644
--- a/packages/cron-input/src/components/internal/cron-model.vue
+++ b/packages/cron-input/src/components/internal/cron-model.vue
@@ -81,7 +81,7 @@ const previews = computed(() => {
   try {
     previewList = parserCron(expression.value);
   } catch (error) {
-    previewList = ['此表达式暂时无法解析！'];
+    previewList = [Locales[props.lang].previewError];
   }
 
   return previewList;

From 94a1d6dc204b406613df44c84d0aebbacf4a379d Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Tue, 11 Jun 2024 10:14:20 +0800
Subject: [PATCH 02/39] =?UTF-8?q?perf(sj=5F1.0.0=5Fbeta1):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=90=BA=E5=B8=A6=E5=8F=82=E6=95=B0=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/hooks/src/use-table.ts    |  5 ++++
 src/hooks/common/table.ts          |  1 +
 src/typings/naive-ui.d.ts          |  2 +-
 src/views/job/batch/index.vue      | 48 +++++-------------------------
 src/views/job/task/index.vue       |  3 +-
 src/views/retry/log/index.vue      | 14 +++------
 src/views/workflow/batch/index.vue | 25 +++++-----------
 src/views/workflow/task/index.vue  |  2 +-
 8 files changed, 30 insertions(+), 70 deletions(-)

diff --git a/packages/hooks/src/use-table.ts b/packages/hooks/src/use-table.ts
index 6c2ae07..da17be5 100644
--- a/packages/hooks/src/use-table.ts
+++ b/packages/hooks/src/use-table.ts
@@ -29,6 +29,8 @@ export type TableConfig<A extends ApiFn, T, C> = {
   apiFn: A;
   /** api params */
   apiParams?: Parameters<A>[0];
+  /** search params */
+  searchParams?: Parameters<A>[0];
   /** transform api response to table data */
   transformer: Transformer<T, Awaited<ReturnType<A>>>;
   /** columns factory */
@@ -133,6 +135,9 @@ export default function useHookTable<A extends ApiFn, T, C>(config: TableConfig<
   }
 
   if (immediate) {
+    if (config.searchParams) {
+      updateSearchParams(config.searchParams);
+    }
     getData();
   }
 
diff --git a/src/hooks/common/table.ts b/src/hooks/common/table.ts
index 962deaf..5d3c728 100644
--- a/src/hooks/common/table.ts
+++ b/src/hooks/common/table.ts
@@ -36,6 +36,7 @@ export function useTable<A extends NaiveUI.TableApiFn>(config: NaiveUI.NaiveTabl
   } = useHookTable<A, GetTableData<A>, TableColumn<NaiveUI.TableDataWithIndex<GetTableData<A>>>>({
     apiFn,
     apiParams,
+    searchParams: config.searchParams,
     columns: config.columns,
     transformer: res => {
       const { data: records = [], page: current = 1, size = 10, total = 0 } = res.data || {};
diff --git a/src/typings/naive-ui.d.ts b/src/typings/naive-ui.d.ts
index c8e6f25..7074643 100644
--- a/src/typings/naive-ui.d.ts
+++ b/src/typings/naive-ui.d.ts
@@ -42,7 +42,7 @@ declare namespace NaiveUI {
 
   type NaiveTableConfig<A extends TableApiFn> = Pick<
     import('@sa/hooks').TableConfig<A, GetTableData<A>, TableColumn<TableDataWithIndex<GetTableData<A>>>>,
-    'apiFn' | 'apiParams' | 'columns' | 'immediate'
+    'apiFn' | 'apiParams' | 'columns' | 'immediate' | 'searchParams'
   > & {
     /**
      * whether to display the total items count
diff --git a/src/views/job/batch/index.vue b/src/views/job/batch/index.vue
index 8026c45..075c640 100644
--- a/src/views/job/batch/index.vue
+++ b/src/views/job/batch/index.vue
@@ -1,9 +1,8 @@
 <script setup lang="tsx">
 import { NButton, NPopconfirm, NTag } from 'naive-ui';
 import { useBoolean } from '@sa/hooks';
-import { ref, watch } from 'vue';
-import { useRoute } from 'vue-router';
-import { fetchGetJobBatchList, fetchGetJobNameList, fetchJobBatchRetry, fetchJobBatchStop } from '@/service/api';
+import { ref } from 'vue';
+import { fetchGetJobBatchList, fetchJobBatchRetry, fetchJobBatchStop } from '@/service/api';
 import { $t } from '@/locales';
 import { useAppStore } from '@/store/modules/app';
 import { useTable } from '@/hooks/common/table';
@@ -13,12 +12,12 @@ import JobBatchSearch from './modules/job-batch-search.vue';
 import JobBatchDetailDrawer from './modules/job-batch-detail-drawer.vue';
 
 const appStore = useAppStore();
-const route = useRoute();
-
 /** 详情页属性数据 */
 const detailData = ref<Api.JobBatch.JobBatch | null>();
 /** 详情页可见状态 */
 const { bool: detailVisible, setTrue: openDetail } = useBoolean(false);
+const jobName = history.state.jobName;
+const taskBatchStatus = history.state.taskBatchStatus;
 
 const { columnChecks, columns, data, getData, loading, mobilePagination, searchParams, resetSearchParams } = useTable({
   apiFn: fetchGetJobBatchList,
@@ -29,6 +28,10 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
     jobName: null,
     taskBatchStatus: null
   },
+  searchParams: {
+    jobName,
+    taskBatchStatus
+  },
   columns: () => [
     {
       key: 'id',
@@ -163,41 +166,6 @@ async function handleStopJob(id: string) {
     getData();
   }
 }
-
-/** 处理路由 query 参数变化 */
-async function handleQueryChanged(jobId: number) {
-  if (!jobId) {
-    searchParams.jobName = null;
-  } else {
-    const { data: jobList, error } = await fetchGetJobNameList({ jobId });
-    if (!error && jobList.length > 0) {
-      const jobName = jobList[0].jobName;
-      searchParams.jobName = jobName;
-    }
-  }
-  getData();
-}
-
-watch(
-  () => route.query,
-  () => {
-    if (route.name === 'job_batch' && route.query.jobId) {
-      const jobId = Number(route.query.jobId);
-      handleQueryChanged(jobId);
-    }
-  },
-  { immediate: true }
-);
-
-function initParams() {
-  const taskBatchStatus = history.state.taskBatchStatus;
-  if (taskBatchStatus) {
-    searchParams.taskBatchStatus = taskBatchStatus;
-    getData();
-  }
-}
-
-initParams();
 </script>
 
 <template>
diff --git a/src/views/job/task/index.vue b/src/views/job/task/index.vue
index 9463821..1ee93d3 100644
--- a/src/views/job/task/index.vue
+++ b/src/views/job/task/index.vue
@@ -250,7 +250,8 @@ async function handleTriggerJob(id: string) {
 }
 
 function goToBatch(jobId: string) {
-  routerPushByKey('job_batch', { query: { jobId } });
+  const findItem = data.value.find(item => item.id === jobId)!;
+  routerPushByKey('job_batch', { state: { jobName: findItem.jobName } });
 }
 
 function body(): Api.Job.ExportJob {
diff --git a/src/views/retry/log/index.vue b/src/views/retry/log/index.vue
index bc07353..82b2dc2 100644
--- a/src/views/retry/log/index.vue
+++ b/src/views/retry/log/index.vue
@@ -17,6 +17,7 @@ const appStore = useAppStore();
 const detailData = ref<Api.RetryLog.RetryLog | null>();
 /** 详情页可见状态 */
 const { bool: detailVisible, setTrue: openDetail } = useBoolean(false);
+const retryStatus = history.state.retryStatus;
 
 const { columns, columnChecks, data, getData, loading, mobilePagination, searchParams, resetSearchParams } = useTable({
   apiFn: fetchRetryLogPageList,
@@ -32,6 +33,9 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     bizNo: null,
     retryStatus: null
   },
+  searchParams: {
+    retryStatus
+  },
   columns: () => [
     {
       type: 'selection',
@@ -168,16 +172,6 @@ async function loadRetryInfo(row: Api.RetryLog.RetryLog) {
   const res = await fetchRetryLogById(row.id!);
   detailData.value = (res.data as Api.RetryLog.RetryLog) || null;
 }
-
-function initParams() {
-  const retryStatus = history.state.retryStatus;
-  if (retryStatus) {
-    searchParams.retryStatus = retryStatus;
-    getData();
-  }
-}
-
-initParams();
 </script>
 
 <template>
diff --git a/src/views/workflow/batch/index.vue b/src/views/workflow/batch/index.vue
index 1451507..8a4bbfc 100644
--- a/src/views/workflow/batch/index.vue
+++ b/src/views/workflow/batch/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="tsx">
 import { NButton, NPopconfirm, NTag } from 'naive-ui';
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { fetchGetWorkflowBatchList, fetchStopWorkflowBatch } from '@/service/api';
 import { $t } from '@/locales';
 import { useAppStore } from '@/store/modules/app';
@@ -8,13 +8,10 @@ import { useTable, useTableOperate } from '@/hooks/common/table';
 import { operationReasonRecord, taskBatchStatusRecord } from '@/constants/business';
 import WorkflowBatchSearch from './modules/workflow-batch-search.vue';
 const router = useRouter();
-const route = useRoute();
-
-// 此处可能有问题
-const workflowId =
-  route.query?.workflowId === undefined ? null : Number.parseInt(route.query?.workflowId as string, 10);
 
 const appStore = useAppStore();
+const workflowId = history.state.workflowId;
+const taskBatchStatus = history.state.taskBatchStatus;
 
 const { columns, columnChecks, data, getData, loading, mobilePagination, searchParams, resetSearchParams } = useTable({
   apiFn: fetchGetWorkflowBatchList,
@@ -23,10 +20,14 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     size: 10,
     // if you want to use the searchParams in Form, you need to define the following properties, and the value is null
     // the value can not be undefined, otherwise the property in Form will not be reactive
-    workflowId,
+    workflowId: null,
     groupName: null,
     taskBatchStatus: null
   },
+  searchParams: {
+    workflowId,
+    taskBatchStatus
+  },
   columns: () => [
     {
       key: 'id',
@@ -155,16 +156,6 @@ async function handleStop(id: string) {
 function detail(id: string) {
   router.push({ path: '/workflow/form/batch', query: { id } });
 }
-
-function initParams() {
-  const taskBatchStatus = history.state.taskBatchStatus;
-  if (taskBatchStatus) {
-    searchParams.taskBatchStatus = taskBatchStatus;
-    getData();
-  }
-}
-
-initParams();
 </script>
 
 <template>
diff --git a/src/views/workflow/task/index.vue b/src/views/workflow/task/index.vue
index f2a3308..8a75ecf 100644
--- a/src/views/workflow/task/index.vue
+++ b/src/views/workflow/task/index.vue
@@ -238,7 +238,7 @@ function copy(id: string) {
 }
 
 function batch(id: string) {
-  router.push({ path: '/workflow/batch', query: { workflowId: id } });
+  router.push({ path: '/workflow/batch', state: { workflowId: id } });
 }
 
 async function execute(id: string) {

From 6f705d9bb6fb1d832a055952db36aef43f03dbf1 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Tue, 11 Jun 2024 14:20:38 +0800
Subject: [PATCH 03/39] =?UTF-8?q?fix(sj=5F1.0.0):=20=E6=97=A7=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E6=97=A0=E9=9C=80=E4=BD=BF=E7=94=A8=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E6=A0=A1=E9=AA=8C,=E9=9D=9E=E7=A9=BA?=
 =?UTF-8?q?=E5=8D=B3=E5=8F=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/global-header/components/change-password.vue      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layouts/modules/global-header/components/change-password.vue b/src/layouts/modules/global-header/components/change-password.vue
index a1e9013..a173538 100644
--- a/src/layouts/modules/global-header/components/change-password.vue
+++ b/src/layouts/modules/global-header/components/change-password.vue
@@ -34,10 +34,10 @@ const { formRef, validate } = useNaiveForm();
 type RuleRecord = Partial<Record<keyof Model, App.Global.FormRule[]>>;
 
 const rules = computed<RuleRecord>(() => {
-  const { formRules, createConfirmPwdRule } = useFormRules();
+  const { formRules, createConfirmPwdRule, defaultRequiredRule } = useFormRules();
 
   return {
-    oldPassword: formRules.pwd,
+    oldPassword: [defaultRequiredRule],
     newPassword: formRules.pwd,
     checkPassword: createConfirmPwdRule(model.newPassword!)
   };

From 3e1e1479793f46e2293263ac8f4e69098951f192 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Tue, 11 Jun 2024 16:00:07 +0800
Subject: [PATCH 04/39] =?UTF-8?q?feat(sj=5F1.1.0):=20NamespaceSelect=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20tooltip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/namespace-select/index.vue        | 24 +++++++++++++------
 src/locales/langs/zh-cn.ts                    |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/layouts/modules/namespace-select/index.vue b/src/layouts/modules/namespace-select/index.vue
index fc60cfc..2c8b2aa 100644
--- a/src/layouts/modules/namespace-select/index.vue
+++ b/src/layouts/modules/namespace-select/index.vue
@@ -6,6 +6,10 @@ import { localStg } from '@/utils/storage';
 import { useAppStore } from '@/store/modules/app';
 import { useAuthStore } from '@/store/modules/auth';
 
+defineOptions({
+  name: 'NamespaceSelect'
+});
+
 const router = useRouter();
 const appStore = useAppStore();
 const authStore = useAuthStore();
@@ -37,13 +41,19 @@ const onChange = (value: string) => {
       </ButtonIcon>
     </div>
   </NDropdown>
-  <NSelect
-    v-else
-    v-model:value="namespaceId"
-    class="namespace-select"
-    :options="selectOptions"
-    @update:value="onChange"
-  />
+  <template v-else>
+    <NTooltip trigger="hover">
+      <template #trigger>
+        <NSelect
+          v-model:value="namespaceId"
+          class="namespace-select"
+          :options="selectOptions"
+          @update:value="onChange"
+        />
+      </template>
+      {{ $t('icon.namespace') }}
+    </NTooltip>
+  </template>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index a73aaac..1537028 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -911,7 +911,7 @@ const local: App.I18n.Schema = {
     expand: '展开菜单',
     pin: '固定',
     unpin: '取消固定',
-    namespace: '切换空间'
+    namespace: '切换命名空间'
   },
   datatable: {
     itemCount: '共 {total} 条'

From da6edc271b088d02cb0d42557d982da68ca4d14c Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Tue, 11 Jun 2024 16:18:19 +0800
Subject: [PATCH 05/39] =?UTF-8?q?=20fix(sj=5F1.1.0):=20=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=B7=20index=20=3D>=20id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/group/index.vue             | 2 +-
 src/views/job/task/index.vue          | 2 +-
 src/views/namespace/index.vue         | 2 +-
 src/views/notify/recipient/index.vue  | 2 +-
 src/views/notify/scene/index.vue      | 2 +-
 src/views/retry/dead-letter/index.vue | 2 +-
 src/views/retry/log/index.vue         | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/group/index.vue b/src/views/group/index.vue
index ccc0d42..48437cb 100644
--- a/src/views/group/index.vue
+++ b/src/views/group/index.vue
@@ -37,7 +37,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       width: 48
     },
     {
-      key: 'index',
+      key: 'id',
       title: $t('common.index'),
       align: 'center',
       width: 64
diff --git a/src/views/job/task/index.vue b/src/views/job/task/index.vue
index 1ee93d3..f75ce89 100644
--- a/src/views/job/task/index.vue
+++ b/src/views/job/task/index.vue
@@ -41,7 +41,7 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
       width: 48
     },
     {
-      key: 'index',
+      key: 'id',
       title: $t('common.index'),
       align: 'center',
       width: 48
diff --git a/src/views/namespace/index.vue b/src/views/namespace/index.vue
index f11a0be..c2df3f7 100644
--- a/src/views/namespace/index.vue
+++ b/src/views/namespace/index.vue
@@ -18,7 +18,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
   },
   columns: () => [
     // {
-    //   key: 'index',
+    //   key: 'id',
     //   title: $t('common.index'),
     //   align: 'center',
     //   width: 64
diff --git a/src/views/notify/recipient/index.vue b/src/views/notify/recipient/index.vue
index 06e71aa..61ec11e 100644
--- a/src/views/notify/recipient/index.vue
+++ b/src/views/notify/recipient/index.vue
@@ -39,7 +39,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       width: 48
     },
     {
-      key: 'index',
+      key: 'id',
       title: $t('common.index'),
       align: 'center',
       width: 64
diff --git a/src/views/notify/scene/index.vue b/src/views/notify/scene/index.vue
index 24bba11..e1102b5 100644
--- a/src/views/notify/scene/index.vue
+++ b/src/views/notify/scene/index.vue
@@ -40,7 +40,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       width: 48
     },
     {
-      key: 'index',
+      key: 'id',
       title: $t('common.index'),
       align: 'center',
       width: 64
diff --git a/src/views/retry/dead-letter/index.vue b/src/views/retry/dead-letter/index.vue
index b2f4a38..83ed710 100644
--- a/src/views/retry/dead-letter/index.vue
+++ b/src/views/retry/dead-letter/index.vue
@@ -41,7 +41,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       width: 48
     },
     {
-      key: 'index',
+      key: 'id',
       title: $t('common.index'),
       align: 'center',
       width: 64
diff --git a/src/views/retry/log/index.vue b/src/views/retry/log/index.vue
index 82b2dc2..9aca5d9 100644
--- a/src/views/retry/log/index.vue
+++ b/src/views/retry/log/index.vue
@@ -44,7 +44,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       disabled: row => row.retryStatus !== 1
     },
     {
-      key: 'index',
+      key: 'id',
       title: $t('common.index'),
       align: 'center',
       width: 64

From 2269456d013da2f5cbb7473915f296fcf2c4b8d0 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Tue, 11 Jun 2024 17:29:06 +0800
Subject: [PATCH 06/39] =?UTF-8?q?style(sj=5F1.1.0=5Fbeta1):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=A9=BA=E9=97=B4=E5=88=87=E6=8D=A2=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/iconify/material-symbols.json          |  4 +
 .../modules/namespace-select/index.vue        | 76 +++++++++++++------
 2 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/public/iconify/material-symbols.json b/public/iconify/material-symbols.json
index 199f934..ee6075d 100644
--- a/public/iconify/material-symbols.json
+++ b/public/iconify/material-symbols.json
@@ -8,6 +8,10 @@
     "dashboard-outline-rounded": {
       "body": "<path fill=\"currentColor\" d=\"M13 8V4q0-.425.288-.712T14 3h6q.425 0 .713.288T21 4v4q0 .425-.288.713T20 9h-6q-.425 0-.712-.288T13 8M3 12V4q0-.425.288-.712T4 3h6q.425 0 .713.288T11 4v8q0 .425-.288.713T10 13H4q-.425 0-.712-.288T3 12m10 8v-8q0-.425.288-.712T14 11h6q.425 0 .713.288T21 12v8q0 .425-.288.713T20 21h-6q-.425 0-.712-.288T13 20M3 20v-4q0-.425.288-.712T4 15h6q.425 0 .713.288T11 16v4q0 .425-.288.713T10 21H4q-.425 0-.712-.288T3 20m2-9h4V5H5zm10 8h4v-6h-4zm0-12h4V5h-4zM5 19h4v-2H5zm4-2\"/>"
     },
+    "expand-more-rounded": {
+      "body": "<path fill=\"currentColor\" d=\"M12 14.95q-.2 0-.375-.062t-.325-.213l-4.6-4.6q-.275-.275-.275-.7t.275-.7t.7-.275t.7.275l3.9 3.9l3.9-3.9q.275-.275.7-.275t.7.275t.275.7t-.275.7l-4.6 4.6q-.15.15-.325.213T12 14.95\"/>",
+      "hidden": true
+    },
     "group-work-outline": {
       "body": "<path fill=\"currentColor\" d=\"M8 16q.825 0 1.413-.587T10 14t-.587-1.412T8 12t-1.412.588T6 14t.588 1.413T8 16m8 0q.825 0 1.413-.587T18 14t-.587-1.412T16 12t-1.412.588T14 14t.588 1.413T16 16m-4-6q.825 0 1.413-.587T14 8t-.587-1.412T12 6t-1.412.588T10 8t.588 1.413T12 10m0 12q-2.075 0-3.9-.788t-3.175-2.137T2.788 15.9T2 12t.788-3.9t2.137-3.175T8.1 2.788T12 2t3.9.788t3.175 2.137T21.213 8.1T22 12t-.788 3.9t-2.137 3.175t-3.175 2.138T12 22m0-2q3.35 0 5.675-2.325T20 12t-2.325-5.675T12 4T6.325 6.325T4 12t2.325 5.675T12 20m0-8\"/>"
     },
diff --git a/src/layouts/modules/namespace-select/index.vue b/src/layouts/modules/namespace-select/index.vue
index 2c8b2aa..ebb481d 100644
--- a/src/layouts/modules/namespace-select/index.vue
+++ b/src/layouts/modules/namespace-select/index.vue
@@ -1,10 +1,12 @@
-<script lang="ts" setup>
+<script lang="tsx" setup>
 import { computed, ref } from 'vue';
 import { useRouter } from 'vue-router';
 import { $t } from '@/locales';
 import { localStg } from '@/utils/storage';
 import { useAppStore } from '@/store/modules/app';
 import { useAuthStore } from '@/store/modules/auth';
+import ButtonIcon from '@/components/custom/button-icon.vue';
+import SvgIcon from '@/components/custom/svg-icon.vue';
 
 defineOptions({
   name: 'NamespaceSelect'
@@ -15,14 +17,13 @@ const appStore = useAppStore();
 const authStore = useAuthStore();
 const namespaceId = ref<string>(localStg.get('namespaceId')!);
 const userInfo = localStg.get('userInfo');
-const selectOptions = computed(() =>
-  userInfo?.namespaceIds.map(item => {
-    return { label: item.name, value: item.uniqueId };
-  })
-);
+
 const dropOptions = computed(() =>
   userInfo?.namespaceIds.map(item => {
-    return { label: item.name, key: item.uniqueId };
+    return {
+      label: () => <span class="block w-120px">{item.name}</span>,
+      key: item.uniqueId
+    };
   })
 );
 
@@ -31,37 +32,66 @@ const onChange = (value: string) => {
   authStore.setNamespaceId(value);
   router.go(0);
 };
+
+const namespaceName = computed(() => {
+  return userInfo?.namespaceIds.filter(item => (item.id = namespaceId.value))[0].name || 'Default';
+});
 </script>
 
 <template>
   <NDropdown v-if="appStore.isMobile" :value="namespaceId" :options="dropOptions" trigger="hover" @select="onChange">
     <div>
       <ButtonIcon :tooltip-content="$t('icon.namespace')" tooltip-placement="left">
-        <SvgIcon icon="oui:app-spaces" />
+        <SvgIcon icon="eos-icons:namespace" />
+      </ButtonIcon>
+    </div>
+  </NDropdown>
+
+  <NDropdown v-else :value="namespaceId" :options="dropOptions" trigger="click" @select="onChange">
+    <div class="namespace-select">
+      <ButtonIcon class="w-full" :tooltip-content="$t('icon.namespace')" tooltip-placement="left">
+        <SvgIcon icon="eos-icons:namespace" />
+        <NEllipsis class="text-14px">{{ namespaceName }}</NEllipsis>
+        <SvgIcon icon="material-symbols:expand-more-rounded" />
       </ButtonIcon>
     </div>
   </NDropdown>
-  <template v-else>
-    <NTooltip trigger="hover">
-      <template #trigger>
-        <NSelect
-          v-model:value="namespaceId"
-          class="namespace-select"
-          :options="selectOptions"
-          @update:value="onChange"
-        />
-      </template>
-      {{ $t('icon.namespace') }}
-    </NTooltip>
-  </template>
 </template>
 
 <style lang="scss" scoped>
 .namespace-select {
   width: 150px;
+  border: 1px solid rgb(224, 224, 230);
+  border-radius: 6px;
 
-  :deep(.n-base-selection) {
-    border-radius: 32px !important;
+  :deep(.n-button):hover {
+    background-color: var(--n-color);
+  }
+
+  :deep(.n-ellipsis) {
+    max-width: 96px;
+  }
+
+  :deep(.n-button) {
+    width: 100% !important;
+    padding: 0 5px 0 10px !important;
+  }
+
+  :deep(.n-button__content) {
+    width: 100% !important;
+  }
+
+  :deep(.gap-8px) {
+    gap: 0 !important;
+  }
+
+  :deep(.flex-center) {
+    width: 100% !important;
+    justify-content: space-between !important;
   }
 }
+
+.namespace-select:hover {
+  border-color: rgb(var(--nprogress-color));
+}
 </style>

From 3d6dc83fba9bf57c680137d4151bdebe5253ec7e Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Tue, 11 Jun 2024 21:53:16 +0800
Subject: [PATCH 07/39] =?UTF-8?q?feat(sj=5F1.0.0):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=B7=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/retry/scene/index.vue | 6 ++++++
 src/views/retry/task/index.vue  | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/src/views/retry/scene/index.vue b/src/views/retry/scene/index.vue
index fa0ffd2..a20a3ff 100644
--- a/src/views/retry/scene/index.vue
+++ b/src/views/retry/scene/index.vue
@@ -39,6 +39,12 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       align: 'center',
       width: 48
     },
+    {
+      key: 'id',
+      title: $t('common.index'),
+      align: 'center',
+      width: 64
+    },
     {
       key: 'sceneName',
       title: $t('page.retryScene.sceneName'),
diff --git a/src/views/retry/task/index.vue b/src/views/retry/task/index.vue
index b18653b..afe2a58 100644
--- a/src/views/retry/task/index.vue
+++ b/src/views/retry/task/index.vue
@@ -45,6 +45,12 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       align: 'center',
       width: 48
     },
+    {
+      key: 'id',
+      title: $t('common.index'),
+      align: 'center',
+      width: 64
+    },
     {
       key: 'uniqueId',
       title: $t('page.retryTask.uniqueId'),

From f170dac781c24df5113095dec7d966eedcb89baf Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Wed, 12 Jun 2024 00:30:50 +0800
Subject: [PATCH 08/39] =?UTF-8?q?feat(sj=5F1.1.0):=20=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=E7=A9=BA=E9=97=B4=E5=88=97=E8=A1=A8=E9=A1=B5=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2,=20=E6=96=B0=E5=A2=9E=E7=A9=BA=E9=97=B4?=
 =?UTF-8?q?=E7=94=9F=E6=88=90uid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/iconify/material-symbols.json          |  3 ++
 src/locales/langs/en-us.ts                    |  2 +
 src/locales/langs/zh-cn.ts                    |  2 +
 src/typings/app.d.ts                          |  2 +
 src/views/namespace/index.vue                 | 41 +++++++++++++++++++
 .../modules/namespace-operate-drawer.vue      | 25 ++++++++---
 6 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/public/iconify/material-symbols.json b/public/iconify/material-symbols.json
index ee6075d..d80490c 100644
--- a/public/iconify/material-symbols.json
+++ b/public/iconify/material-symbols.json
@@ -35,6 +35,9 @@
     },
     "sunny": {
       "body": "<path fill=\"currentColor\" d=\"M11 5V1h2v4zm6.65 2.75l-1.375-1.375l2.8-2.875l1.4 1.425zM19 13v-2h4v2zm-8 10v-4h2v4zM6.35 7.7L3.5 4.925l1.425-1.4L7.75 6.35zm12.7 12.8l-2.775-2.875l1.35-1.35l2.85 2.75zM1 13v-2h4v2zm3.925 7.5l-1.4-1.425l2.8-2.8l.725.675l.725.7zM12 18q-2.5 0-4.25-1.75T6 12t1.75-4.25T12 6t4.25 1.75T18 12t-1.75 4.25T12 18\"/>"
+    },
+    "check-circle": {
+      "body": "<path fill=\"currentColor\" d=\"m10.6 16.6l7.05-7.05l-1.4-1.4l-5.65 5.65l-2.85-2.85l-1.4 1.4zM12 22q-2.075 0-3.9-.788t-3.175-2.137T2.788 15.9T2 12t.788-3.9t2.137-3.175T8.1 2.788T12 2t3.9.788t3.175 2.137T21.213 8.1T22 12t-.788 3.9t-2.137 3.175t-3.175 2.138T12 22\"/>"
     }
   }
 }
diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index 67d45be..8530c8b 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -80,6 +80,8 @@ const local: App.I18n.Schema = {
     confirmPause: 'Are you sure you want to pause?',
     confirmFinish: 'Are you sure you want to finishe?',
     confirmRetry: 'Are you sure you want to retry?',
+    generateRandomly: 'Generate randomly',
+    active: 'Active',
     yesOrNo: {
       yes: 'Yes',
       no: 'No'
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index 1537028..58e9b78 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -80,6 +80,8 @@ const local: App.I18n.Schema = {
     confirmPause: '确认暂停吗？',
     confirmFinish: '确认完成吗？',
     confirmRetry: '确认重试吗？',
+    generateRandomly: '随机生成',
+    active: '活跃',
     yesOrNo: {
       yes: '是',
       no: '否'
diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts
index 6d61178..045cd82 100644
--- a/src/typings/app.d.ts
+++ b/src/typings/app.d.ts
@@ -330,6 +330,8 @@ declare namespace App {
         confirmPause: string;
         confirmFinish: string;
         confirmRetry: string;
+        generateRandomly: string;
+        active: string;
         yesOrNo: {
           yes: string;
           no: string;
diff --git a/src/views/namespace/index.vue b/src/views/namespace/index.vue
index c2df3f7..ea19020 100644
--- a/src/views/namespace/index.vue
+++ b/src/views/namespace/index.vue
@@ -1,13 +1,27 @@
 <script setup lang="tsx">
 import { NButton } from 'naive-ui';
+import { ref } from 'vue';
+import { useRouter } from 'vue-router';
 import { fetchGetNamespaceList } from '@/service/api';
 import { $t } from '@/locales';
 import { useAppStore } from '@/store/modules/app';
 import { useTable, useTableOperate } from '@/hooks/common/table';
+import { localStg } from '@/utils/storage';
+import { useAuthStore } from '@/store/modules/auth';
+import SvgIcon from '@/components/custom/svg-icon.vue';
 import NamespaceOperateDrawer from './modules/namespace-operate-drawer.vue';
 import NamespaceSearch from './modules/namespace-search.vue';
 
+const router = useRouter();
 const appStore = useAppStore();
+const authStore = useAuthStore();
+const namespaceId = ref<string>(localStg.get('namespaceId')!);
+
+const handleChange = (uniqueId: string) => {
+  namespaceId.value = uniqueId;
+  authStore.setNamespaceId(uniqueId);
+  router.go(0);
+};
 
 const { columns, columnChecks, data, getData, loading, mobilePagination, searchParams, resetSearchParams } = useTable({
   apiFn: fetchGetNamespaceList,
@@ -29,6 +43,23 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       align: 'left',
       width: 120
     },
+    {
+      key: 'status',
+      title: $t('common.active'),
+      align: 'center',
+      width: 40,
+      render: row => (
+        <>
+          {namespaceId.value === row.uniqueId! ? (
+            <div class="flex justify-center">
+              <SvgIcon icon="material-symbols:check-circle" class="text-20px color-success" />
+            </div>
+          ) : (
+            ''
+          )}
+        </>
+      )
+    },
     {
       key: 'uniqueId',
       title: $t('page.namespace.uniqueId'),
@@ -57,6 +88,16 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
           <NButton type="primary" text ghost size="small" onClick={() => edit(row.id!)}>
             {$t('common.edit')}
           </NButton>
+          {namespaceId.value !== row.uniqueId! ? (
+            <>
+              <n-divider vertical />
+              <NButton type="warning" text ghost size="small" onClick={() => handleChange(row.uniqueId!)}>
+                {$t('common.switch')}
+              </NButton>
+            </>
+          ) : (
+            ''
+          )}
         </div>
       )
     }
diff --git a/src/views/namespace/modules/namespace-operate-drawer.vue b/src/views/namespace/modules/namespace-operate-drawer.vue
index ff233c7..07e7ae5 100644
--- a/src/views/namespace/modules/namespace-operate-drawer.vue
+++ b/src/views/namespace/modules/namespace-operate-drawer.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { computed, reactive, watch } from 'vue';
+import { nanoid } from '@sa/utils';
 import { useFormRules, useNaiveForm } from '@/hooks/common/form';
 import OperateDrawer from '@/components/common/operate-drawer.vue';
 import { $t } from '@/locales';
@@ -61,6 +62,10 @@ const rules: Record<RuleKey, App.Global.FormRule> = {
   }
 };
 
+function setUniqueId() {
+  model.uniqueId = nanoid(32);
+}
+
 function handleUpdateModelWhenEdit() {
   if (props.operateType === 'add') {
     Object.assign(model, createDefaultModel());
@@ -109,11 +114,21 @@ watch(visible, () => {
   <OperateDrawer v-model="visible" :title="title" @submitted="handleSubmit">
     <NForm ref="formRef" :model="model" :rules="rules">
       <NFormItem :label="$t('page.namespace.uniqueId')" path="uniqueId">
-        <NInput
-          v-model:value="model.uniqueId"
-          :disabled="props.operateType === 'edit'"
-          :placeholder="$t('page.namespace.form.uniqueId')"
-        />
+        <NInputGroup>
+          <NInput
+            v-model:value="model.uniqueId"
+            :disabled="props.operateType === 'edit'"
+            :placeholder="$t('page.namespace.form.uniqueId')"
+          />
+          <NTooltip trigger="hover">
+            <template #trigger>
+              <NButton type="default" ghost :disabled="props.operateType === 'edit'" @click="setUniqueId">
+                <icon-ic-round-refresh class="text-icon" />
+              </NButton>
+            </template>
+            {{ $t('common.generateRandomly') }}
+          </NTooltip>
+        </NInputGroup>
       </NFormItem>
       <NFormItem :label="$t('page.namespace.name')" path="name">
         <NInput v-model:value="model.name" :placeholder="$t('page.namespace.form.name')" />

From 99d11116da7cac752cbe36f63a4bd5a80e67df5c Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Wed, 12 Jun 2024 10:24:59 +0800
Subject: [PATCH 09/39] =?UTF-8?q?style(sj=5F1.1.0=5Fbeta1):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=A9=BA=E9=97=B4=E5=88=87=E6=8D=A2=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/namespace-select/index.vue        | 35 +++++++++++++++----
 src/store/modules/auth/index.ts               |  4 +++
 src/views/namespace/index.vue                 |  3 --
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/layouts/modules/namespace-select/index.vue b/src/layouts/modules/namespace-select/index.vue
index ebb481d..298c961 100644
--- a/src/layouts/modules/namespace-select/index.vue
+++ b/src/layouts/modules/namespace-select/index.vue
@@ -1,5 +1,5 @@
 <script lang="tsx" setup>
-import { computed, ref } from 'vue';
+import { computed, ref, watch } from 'vue';
 import { useRouter } from 'vue-router';
 import { $t } from '@/locales';
 import { localStg } from '@/utils/storage';
@@ -18,10 +18,28 @@ const authStore = useAuthStore();
 const namespaceId = ref<string>(localStg.get('namespaceId')!);
 const userInfo = localStg.get('userInfo');
 
+watch(
+  () => authStore.namespaceUniqueId,
+  val => {
+    namespaceId.value = val;
+    authStore.setNamespaceId(val);
+  }
+);
+
 const dropOptions = computed(() =>
   userInfo?.namespaceIds.map(item => {
     return {
-      label: () => <span class="block w-120px">{item.name}</span>,
+      label: () => {
+        if (item.uniqueId === namespaceId.value) {
+          return (
+            <div class="flex-center">
+              <span class="block w-113px">{item.name}</span>
+              <SvgIcon icon="ant-design:check-outlined" />
+            </div>
+          );
+        }
+        return <span class="block w-120px">{item.name}</span>;
+      },
       key: item.uniqueId
     };
   })
@@ -34,7 +52,7 @@ const onChange = (value: string) => {
 };
 
 const namespaceName = computed(() => {
-  return userInfo?.namespaceIds.filter(item => (item.id = namespaceId.value))[0].name || 'Default';
+  return userInfo?.namespaceIds.filter(item => item.uniqueId === namespaceId.value)[0].name || 'Default';
 });
 </script>
 
@@ -60,16 +78,19 @@ const namespaceName = computed(() => {
 
 <style lang="scss" scoped>
 .namespace-select {
-  width: 150px;
+  width: 158px;
   border: 1px solid rgb(224, 224, 230);
-  border-radius: 6px;
+  border-radius: 35px;
 
-  :deep(.n-button):hover {
+  :deep(.n-button):hover,
+  :deep(.n-button):focus {
     background-color: var(--n-color);
   }
 
   :deep(.n-ellipsis) {
-    max-width: 96px;
+    width: 100%;
+    text-align: left;
+    max-width: 88px;
   }
 
   :deep(.n-button) {
diff --git a/src/store/modules/auth/index.ts b/src/store/modules/auth/index.ts
index f7469fc..97569e6 100644
--- a/src/store/modules/auth/index.ts
+++ b/src/store/modules/auth/index.ts
@@ -19,6 +19,8 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
 
   const token = ref(getToken());
 
+  const namespaceUniqueId = ref('');
+
   const userInfo: Api.Auth.UserInfo = reactive({
     id: '',
     userId: '',
@@ -160,6 +162,7 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
   }
 
   function setNamespaceId(namespaceId: string) {
+    namespaceUniqueId.value = namespaceId;
     const userNamespace = localStg.get('userNamespace') || {};
     userNamespace[userInfo.userId] = namespaceId;
     localStg.set('userNamespace', userNamespace);
@@ -169,6 +172,7 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
   return {
     token,
     userInfo,
+    namespaceUniqueId,
     isStaticSuper,
     isLogin,
     loginLoading,
diff --git a/src/views/namespace/index.vue b/src/views/namespace/index.vue
index ea19020..46e3455 100644
--- a/src/views/namespace/index.vue
+++ b/src/views/namespace/index.vue
@@ -1,7 +1,6 @@
 <script setup lang="tsx">
 import { NButton } from 'naive-ui';
 import { ref } from 'vue';
-import { useRouter } from 'vue-router';
 import { fetchGetNamespaceList } from '@/service/api';
 import { $t } from '@/locales';
 import { useAppStore } from '@/store/modules/app';
@@ -12,7 +11,6 @@ import SvgIcon from '@/components/custom/svg-icon.vue';
 import NamespaceOperateDrawer from './modules/namespace-operate-drawer.vue';
 import NamespaceSearch from './modules/namespace-search.vue';
 
-const router = useRouter();
 const appStore = useAppStore();
 const authStore = useAuthStore();
 const namespaceId = ref<string>(localStg.get('namespaceId')!);
@@ -20,7 +18,6 @@ const namespaceId = ref<string>(localStg.get('namespaceId')!);
 const handleChange = (uniqueId: string) => {
   namespaceId.value = uniqueId;
   authStore.setNamespaceId(uniqueId);
-  router.go(0);
 };
 
 const { columns, columnChecks, data, getData, loading, mobilePagination, searchParams, resetSearchParams } = useTable({

From 541a321558ae7fdda1e5689f431b3c4512c1d4b0 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Wed, 12 Jun 2024 11:23:00 +0800
Subject: [PATCH 10/39] =?UTF-8?q?fix(sj=5F1.1.0=5Fbeta1):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=96=B0=E5=A2=9E=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=9C=AA=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/iconify/ant-design.json                |  3 ++
 .../modules/namespace-select/index.vue        | 38 +++++++++++++++----
 src/store/modules/auth/index.ts               |  1 +
 .../modules/namespace-operate-drawer.vue      |  3 ++
 4 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/public/iconify/ant-design.json b/public/iconify/ant-design.json
index 416225f..a7b3460 100644
--- a/public/iconify/ant-design.json
+++ b/public/iconify/ant-design.json
@@ -29,6 +29,9 @@
     "warning-outlined": {
       "body": "<path fill=\"currentColor\" d=\"M464 720a48 48 0 1 0 96 0a48 48 0 1 0-96 0m16-304v184c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V416c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8m475.7 440l-416-720c-6.2-10.7-16.9-16-27.7-16s-21.6 5.3-27.7 16l-416 720C56 877.4 71.4 904 96 904h832c24.6 0 40-26.6 27.7-48m-783.5-27.9L512 239.9l339.8 588.2z\"/>"
     },
+    "check-outlined": {
+      "body": "<path fill=\"currentColor\" d=\"M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5L207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8\"/>"
+    },
     "clock-circle-outlined": {
       "body": "<path fill=\"currentColor\" d=\"M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448s448-200.6 448-448S759.4 64 512 64m0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372s372 166.6 372 372s-166.6 372-372 372\"/><path fill=\"currentColor\" d=\"M686.7 638.6L544.1 535.5V288c0-4.4-3.6-8-8-8H488c-4.4 0-8 3.6-8 8v275.4c0 2.6 1.2 5 3.3 6.5l165.4 120.6c3.6 2.6 8.6 1.8 11.2-1.7l28.6-39c2.6-3.7 1.8-8.7-1.8-11.2\"/>"
     },
diff --git a/src/layouts/modules/namespace-select/index.vue b/src/layouts/modules/namespace-select/index.vue
index 298c961..6acd90f 100644
--- a/src/layouts/modules/namespace-select/index.vue
+++ b/src/layouts/modules/namespace-select/index.vue
@@ -1,6 +1,7 @@
 <script lang="tsx" setup>
 import { computed, ref, watch } from 'vue';
 import { useRouter } from 'vue-router';
+import { NEllipsis } from 'naive-ui';
 import { $t } from '@/locales';
 import { localStg } from '@/utils/storage';
 import { useAppStore } from '@/store/modules/app';
@@ -16,7 +17,7 @@ const router = useRouter();
 const appStore = useAppStore();
 const authStore = useAuthStore();
 const namespaceId = ref<string>(localStg.get('namespaceId')!);
-const userInfo = localStg.get('userInfo');
+const namespaceIds = ref(localStg.get('userInfo')?.namespaceIds || []);
 
 watch(
   () => authStore.namespaceUniqueId,
@@ -26,19 +27,31 @@ watch(
   }
 );
 
+watch(
+  () => authStore.userInfo.namespaceIds,
+  val => {
+    namespaceIds.value = val;
+  },
+  { deep: true }
+);
+
 const dropOptions = computed(() =>
-  userInfo?.namespaceIds.map(item => {
+  namespaceIds.value.map(item => {
     return {
       label: () => {
         if (item.uniqueId === namespaceId.value) {
           return (
-            <div class="flex-center">
-              <span class="block w-113px">{item.name}</span>
-              <SvgIcon icon="ant-design:check-outlined" />
+            <div class="max-w-130px flex items-center justify-between">
+              <NEllipsis>{item.name}</NEllipsis>
+              <SvgIcon class="ml-6px" icon="ant-design:check-outlined" />
             </div>
           );
         }
-        return <span class="block w-120px">{item.name}</span>;
+        return (
+          <div class="max-w-130px flex items-center justify-between">
+            <NEllipsis>{item.name}</NEllipsis>
+          </div>
+        );
       },
       key: item.uniqueId
     };
@@ -52,7 +65,7 @@ const onChange = (value: string) => {
 };
 
 const namespaceName = computed(() => {
-  return userInfo?.namespaceIds.filter(item => item.uniqueId === namespaceId.value)[0].name || 'Default';
+  return namespaceIds.value.filter(item => item.uniqueId === namespaceId.value)[0].name || 'Default';
 });
 </script>
 
@@ -115,4 +128,15 @@ const namespaceName = computed(() => {
 .namespace-select:hover {
   border-color: rgb(var(--nprogress-color));
 }
+
+.namespace-select-option {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  :deep(.n-ellipsis) {
+    width: 100%;
+    max-width: 113px;
+  }
+}
 </style>
diff --git a/src/store/modules/auth/index.ts b/src/store/modules/auth/index.ts
index 97569e6..3c35c0a 100644
--- a/src/store/modules/auth/index.ts
+++ b/src/store/modules/auth/index.ts
@@ -178,6 +178,7 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
     loginLoading,
     resetStore,
     login,
+    getUserInfo,
     initUserInfo,
     initAppVersion,
     setNamespaceId
diff --git a/src/views/namespace/modules/namespace-operate-drawer.vue b/src/views/namespace/modules/namespace-operate-drawer.vue
index 07e7ae5..0535dcb 100644
--- a/src/views/namespace/modules/namespace-operate-drawer.vue
+++ b/src/views/namespace/modules/namespace-operate-drawer.vue
@@ -5,6 +5,7 @@ import { useFormRules, useNaiveForm } from '@/hooks/common/form';
 import OperateDrawer from '@/components/common/operate-drawer.vue';
 import { $t } from '@/locales';
 import { fetchAddNamespace, fetchEditNamespace } from '@/service/api';
+import { useAuthStore } from '@/store/modules/auth';
 
 defineOptions({
   name: 'NamespaceOperateDrawer'
@@ -25,6 +26,7 @@ interface Emits {
 
 const emit = defineEmits<Emits>();
 
+const authStore = useAuthStore();
 const visible = defineModel<boolean>('visible', {
   default: false
 });
@@ -98,6 +100,7 @@ async function handleSubmit() {
     window.$message?.success($t('common.updateSuccess'));
   }
 
+  await authStore.getUserInfo();
   closeDrawer();
   emit('submitted');
 }

From dec30ba6ed6e4e03b591400a07a702f066137587 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Wed, 12 Jun 2024 11:37:10 +0800
Subject: [PATCH 11/39] =?UTF-8?q?style(sj=5F1.1.0=5Fbeta1):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=A9=BA=E9=97=B4=E5=88=87=E6=8D=A2=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E7=BC=A9=E7=95=A5=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/modules/namespace-select/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layouts/modules/namespace-select/index.vue b/src/layouts/modules/namespace-select/index.vue
index 6acd90f..ae1ec56 100644
--- a/src/layouts/modules/namespace-select/index.vue
+++ b/src/layouts/modules/namespace-select/index.vue
@@ -42,14 +42,14 @@ const dropOptions = computed(() =>
         if (item.uniqueId === namespaceId.value) {
           return (
             <div class="max-w-130px flex items-center justify-between">
-              <NEllipsis>{item.name}</NEllipsis>
+              <NEllipsis tooltip={{ placement: 'left' }}>{item.name}</NEllipsis>
               <SvgIcon class="ml-6px" icon="ant-design:check-outlined" />
             </div>
           );
         }
         return (
           <div class="max-w-130px flex items-center justify-between">
-            <NEllipsis>{item.name}</NEllipsis>
+            <NEllipsis tooltip={{ placement: 'left' }}>{item.name}</NEllipsis>
           </div>
         );
       },

From 4510c251cf784b12c1f279f9c80db913363f8edd Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Wed, 12 Jun 2024 13:05:38 +0800
Subject: [PATCH 12/39] =?UTF-8?q?feat(sj=5F1.1.0):=20=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=E7=A9=BA=E9=97=B4=E9=9D=9E=E6=B4=BB=E8=B7=83=E6=9D=A1=E7=9B=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/iconify/material-symbols.json |  3 +++
 src/views/namespace/index.vue        | 10 ++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/public/iconify/material-symbols.json b/public/iconify/material-symbols.json
index d80490c..6e3e431 100644
--- a/public/iconify/material-symbols.json
+++ b/public/iconify/material-symbols.json
@@ -38,6 +38,9 @@
     },
     "check-circle": {
       "body": "<path fill=\"currentColor\" d=\"m10.6 16.6l7.05-7.05l-1.4-1.4l-5.65 5.65l-2.85-2.85l-1.4 1.4zM12 22q-2.075 0-3.9-.788t-3.175-2.137T2.788 15.9T2 12t.788-3.9t2.137-3.175T8.1 2.788T12 2t3.9.788t3.175 2.137T21.213 8.1T22 12t-.788 3.9t-2.137 3.175t-3.175 2.138T12 22\"/>"
+    },
+    "cancel": {
+      "body": "<path fill=\"currentColor\" d=\"m8.4 17l3.6-3.6l3.6 3.6l1.4-1.4l-3.6-3.6L17 8.4L15.6 7L12 10.6L8.4 7L7 8.4l3.6 3.6L7 15.6zm3.6 5q-2.075 0-3.9-.788t-3.175-2.137T2.788 15.9T2 12t.788-3.9t2.137-3.175T8.1 2.788T12 2t3.9.788t3.175 2.137T21.213 8.1T22 12t-.788 3.9t-2.137 3.175t-3.175 2.138T12 22\"/>"
     }
   }
 }
diff --git a/src/views/namespace/index.vue b/src/views/namespace/index.vue
index 46e3455..5f5faab 100644
--- a/src/views/namespace/index.vue
+++ b/src/views/namespace/index.vue
@@ -46,15 +46,13 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       align: 'center',
       width: 40,
       render: row => (
-        <>
+        <div class="flex justify-center">
           {namespaceId.value === row.uniqueId! ? (
-            <div class="flex justify-center">
-              <SvgIcon icon="material-symbols:check-circle" class="text-20px color-success" />
-            </div>
+            <SvgIcon icon="material-symbols:check-circle" class="text-20px color-success" />
           ) : (
-            ''
+            <SvgIcon icon="material-symbols:cancel" class="text-20px color-gray400" />
           )}
-        </>
+        </div>
       )
     },
     {

From a07016214f58f95a18a2da0dbb8bf8849857a454 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Thu, 13 Jun 2024 09:58:56 +0800
Subject: [PATCH 13/39] =?UTF-8?q?feat(sj=5F1.1.0=5Fbeta1):=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/datetime-range.vue      | 60 +++++++++++++++++++
 src/components/common/search-form.vue         |  5 +-
 src/typings/api.d.ts                          |  3 +-
 src/views/job/batch/index.vue                 |  4 +-
 .../job/batch/modules/job-batch-search.vue    |  5 +-
 5 files changed, 72 insertions(+), 5 deletions(-)
 create mode 100644 src/components/common/datetime-range.vue

diff --git a/src/components/common/datetime-range.vue b/src/components/common/datetime-range.vue
new file mode 100644
index 0000000..0da5818
--- /dev/null
+++ b/src/components/common/datetime-range.vue
@@ -0,0 +1,60 @@
+<script setup lang="ts">
+import { ref, watch } from 'vue';
+
+defineOptions({
+  name: 'DatetimeRange'
+});
+
+interface Props {
+  beginDate?: number | null;
+  endDate?: number | null;
+}
+
+const props = defineProps<Props>();
+
+interface Emits {
+  (e: 'update:beginDate', beginDate: number): void;
+  (e: 'update:endDate', endDate: number): void;
+}
+const emit = defineEmits<Emits>();
+
+const dateRange = ref<[number, number]>(getDefaultDate());
+
+watch(
+  () => props.beginDate,
+  beginDate => {
+    if (typeof beginDate === 'number' && beginDate) {
+      dateRange.value[0] = beginDate;
+    }
+  },
+  { immediate: true }
+);
+
+watch(
+  () => props.endDate,
+  endDate => {
+    if (typeof endDate === 'number' && endDate) {
+      dateRange.value[1] = endDate;
+    }
+  },
+  { immediate: true }
+);
+
+function getDefaultDate(): [number, number] {
+  const currentDate = new Date();
+  const currentTime = currentDate.getTime();
+  currentDate.setMonth(currentDate.getMonth() - 1);
+  return [currentDate.getTime(), currentTime];
+}
+
+function onChange(value: [number, number]) {
+  emit('update:beginDate', value[0]);
+  emit('update:endDate', value[1]);
+}
+</script>
+
+<template>
+  <NDatePicker v-model:value="dateRange" class="w-full" type="datetimerange" clearable @update:value="onChange" />
+</template>
+
+<style scoped lang="scss"></style>
diff --git a/src/components/common/search-form.vue b/src/components/common/search-form.vue
index 991299e..d4ba9b4 100644
--- a/src/components/common/search-form.vue
+++ b/src/components/common/search-form.vue
@@ -10,6 +10,7 @@ defineOptions({
 
 interface Props {
   model: Record<string, any>;
+  btnSpan?: string;
 }
 
 const props = defineProps<Props>();
@@ -41,14 +42,14 @@ async function search() {
 
 const btnSpan = computed(() => {
   const keyNum = Object.keys(props.model).length - 2;
-  return `24 m:12 m:${(4 - (keyNum % 4)) * 6}`;
+  return props.btnSpan || `24 m:12 m:${(4 - (keyNum % 4)) * 6}`;
 });
 </script>
 
 <template>
   <NCard :title="title" :bordered="false" size="small" class="card-wrapper">
     <NForm ref="formRef" :model="model" label-placement="left" :label-width="80" :show-feedback="appStore.isMobile">
-      <NGrid responsive="screen" item-responsive :y-gap="5">
+      <NGrid responsive="screen" item-responsive :y-gap="8">
         <slot></slot>
         <NFormItemGi :y-gap="8" :span="btnSpan" class="pr-24px lg:p-t-0 md:p-t-16px">
           <NSpace class="min-w-172px w-full" justify="end">
diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index 0a8350e..9cc03cf 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -1079,7 +1079,8 @@ declare namespace Api {
 
     /** JobBatch search params */
     type JobBatchSearchParams = CommonType.RecordNullable<
-      Pick<Api.JobBatch.JobBatch, 'groupName' | 'jobName' | 'taskBatchStatus'> & CommonSearchParams
+      Pick<Api.JobBatch.JobBatch, 'groupName' | 'jobName' | 'taskBatchStatus'> &
+        CommonSearchParams & { beginDate: number; endDate: number }
     >;
 
     /** JobBatch list */
diff --git a/src/views/job/batch/index.vue b/src/views/job/batch/index.vue
index 075c640..d618a1d 100644
--- a/src/views/job/batch/index.vue
+++ b/src/views/job/batch/index.vue
@@ -26,7 +26,9 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
     size: 10,
     groupName: null,
     jobName: null,
-    taskBatchStatus: null
+    taskBatchStatus: null,
+    beginDate: null,
+    endDate: null
   },
   searchParams: {
     jobName,
diff --git a/src/views/job/batch/modules/job-batch-search.vue b/src/views/job/batch/modules/job-batch-search.vue
index 2df1836..d9e8fd7 100644
--- a/src/views/job/batch/modules/job-batch-search.vue
+++ b/src/views/job/batch/modules/job-batch-search.vue
@@ -26,7 +26,7 @@ function search() {
 </script>
 
 <template>
-  <SearchForm :model="model" @search="search" @reset="reset">
+  <SearchForm btn-span="24 s:24 m:9 l:12 xl:15" :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobBatch.groupName')" path="groupName" class="pr-24px">
       <SelectGroup v-model:value="model.groupName" />
     </NFormItemGi>
@@ -36,6 +36,9 @@ function search() {
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobBatch.taskBatchStatus')" path="taskBatchStatus" class="pr-24px">
       <TaskBatchStatus v-model:value="model.taskBatchStatus" />
     </NFormItemGi>
+    <NFormItemGi span="24 s:24 m:15 l:12 xl:9" :label="$t('page.common.createTime')" path="createTime" class="pr-24px">
+      <DatetimeRange v-model:begin-date="model.beginDate" v-model:end-date="model.endDate" />
+    </NFormItemGi>
   </SearchForm>
 </template>
 

From 9e1bc3c9f519a502f597b3f58c7d33ab14a2bf91 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Thu, 13 Jun 2024 10:41:36 +0800
Subject: [PATCH 14/39] =?UTF-8?q?fix(sj=5F1.1.0=5Fbeta1):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=BB=98=E8=AE=A4=E5=80=BC=E8=B5=8B=E5=80=BC?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/datetime-range.vue | 59 +++++++++++++++---------
 1 file changed, 37 insertions(+), 22 deletions(-)

diff --git a/src/components/common/datetime-range.vue b/src/components/common/datetime-range.vue
index 0da5818..cdc111a 100644
--- a/src/components/common/datetime-range.vue
+++ b/src/components/common/datetime-range.vue
@@ -13,48 +13,63 @@ interface Props {
 const props = defineProps<Props>();
 
 interface Emits {
-  (e: 'update:beginDate', beginDate: number): void;
-  (e: 'update:endDate', endDate: number): void;
+  (e: 'update:beginDate', beginDate: number | null): void;
+  (e: 'update:endDate', endDate: number | null): void;
 }
 const emit = defineEmits<Emits>();
 
-const dateRange = ref<[number, number]>(getDefaultDate());
+const dateRange = ref<[number, number] | undefined>(getDefaultDate());
 
 watch(
-  () => props.beginDate,
-  beginDate => {
-    if (typeof beginDate === 'number' && beginDate) {
-      dateRange.value[0] = beginDate;
+  () => [props.beginDate, props.endDate],
+  val => {
+    if (!val[0] && !val[1]) {
+      dateRange.value = undefined;
     }
-  },
-  { immediate: true }
+  }
 );
 
 watch(
-  () => props.endDate,
-  endDate => {
-    if (typeof endDate === 'number' && endDate) {
-      dateRange.value[1] = endDate;
-    }
+  () => dateRange.value,
+  val => {
+    emit('update:beginDate', val ? val[0] : null);
+    emit('update:endDate', val ? val[1] : null);
   },
   { immediate: true }
 );
 
 function getDefaultDate(): [number, number] {
-  const currentDate = new Date();
-  const currentTime = currentDate.getTime();
-  currentDate.setMonth(currentDate.getMonth() - 1);
-  return [currentDate.getTime(), currentTime];
+  const today = new Date();
+  const endOfDay = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 23, 59, 59);
+  const oneMonthAgo = new Date(today.getFullYear(), today.getMonth() - 1, today.getDate());
+  const startOfDayOneMonthAgo = new Date(
+    oneMonthAgo.getFullYear(),
+    oneMonthAgo.getMonth(),
+    oneMonthAgo.getDate(),
+    0,
+    0,
+    0
+  );
+  return [startOfDayOneMonthAgo.getTime(), endOfDay.getTime()];
 }
 
-function onChange(value: [number, number]) {
-  emit('update:beginDate', value[0]);
-  emit('update:endDate', value[1]);
+function initDefaultDate() {
+  const beginDate = props.beginDate;
+  if (typeof beginDate === 'number' && beginDate) {
+    dateRange.value![0] = beginDate;
+  }
+
+  const endDate = props.endDate;
+  if (typeof endDate === 'number' && endDate) {
+    dateRange.value![1] = endDate;
+  }
 }
+
+initDefaultDate();
 </script>
 
 <template>
-  <NDatePicker v-model:value="dateRange" class="w-full" type="datetimerange" clearable @update:value="onChange" />
+  <NDatePicker v-model:value="dateRange" class="w-full" type="datetimerange" clearable />
 </template>
 
 <style scoped lang="scss"></style>

From 9fa5bf4bed2b96012c0113be7b4cf14500cf8370 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Thu, 13 Jun 2024 10:45:20 +0800
Subject: [PATCH 15/39] =?UTF-8?q?refactor(sj=5F1.1.0=5Fbeta1):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=BB=98=E8=AE=A4=E6=97=B6=E9=97=B4=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/datetime-range.vue | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/components/common/datetime-range.vue b/src/components/common/datetime-range.vue
index cdc111a..f246530 100644
--- a/src/components/common/datetime-range.vue
+++ b/src/components/common/datetime-range.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import dayjs from 'dayjs';
 import { ref, watch } from 'vue';
 
 defineOptions({
@@ -39,18 +40,9 @@ watch(
 );
 
 function getDefaultDate(): [number, number] {
-  const today = new Date();
-  const endOfDay = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 23, 59, 59);
-  const oneMonthAgo = new Date(today.getFullYear(), today.getMonth() - 1, today.getDate());
-  const startOfDayOneMonthAgo = new Date(
-    oneMonthAgo.getFullYear(),
-    oneMonthAgo.getMonth(),
-    oneMonthAgo.getDate(),
-    0,
-    0,
-    0
-  );
-  return [startOfDayOneMonthAgo.getTime(), endOfDay.getTime()];
+  const endOfDayTimestamp = dayjs().endOf('day').valueOf();
+  const startOfDayOneMonthAgoTimestamp = dayjs().subtract(1, 'month').startOf('day').valueOf();
+  return [endOfDayTimestamp, startOfDayOneMonthAgoTimestamp];
 }
 
 function initDefaultDate() {

From 3795b552ac718a948fd1249ee9242c07c026570f Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Fri, 14 Jun 2024 11:51:11 +0800
Subject: [PATCH 16/39] =?UTF-8?q?fix(sj=5F1.1.0):=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=B8=BA=E5=88=87=E7=89=87=EF=BC=8C=E6=8F=90=E4=BA=A4=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/modules/job-task-operate-drawer.vue  | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 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 3bdb9b0..0def5c6 100644
--- a/src/views/job/task/modules/job-task-operate-drawer.vue
+++ b/src/views/job/task/modules/job-task-operate-drawer.vue
@@ -162,6 +162,7 @@ async function handleSubmit() {
       groupName,
       jobName,
       argsType,
+      argsStr,
       jobStatus,
       routeKey,
       executorType,
@@ -179,7 +180,7 @@ async function handleSubmit() {
     const { error } = await fetchAddJob({
       groupName,
       jobName,
-      argsStr: parseArgsStr(),
+      argsStr,
       argsType,
       jobStatus,
       routeKey,
@@ -204,6 +205,7 @@ async function handleSubmit() {
       id,
       groupName,
       jobName,
+      argsStr,
       argsType,
       jobStatus,
       routeKey,
@@ -223,7 +225,7 @@ async function handleSubmit() {
       id,
       groupName,
       jobName,
-      argsStr: parseArgsStr(),
+      argsStr,
       argsType,
       jobStatus,
       routeKey,
@@ -249,7 +251,8 @@ async function handleSubmit() {
 
 function parseArgsStr() {
   if (model.taskType === 3 && dynamicForm.args) {
-    return JSON.stringify(dynamicForm.args.map(item => item.arg));
+    const slices = dynamicForm.args.map(item => item.arg.trim()).filter(item => Boolean(item));
+    model.argsStr = slices.length > 0 ? JSON.stringify(slices) : '';
   }
   return model.argsStr;
 }
@@ -268,6 +271,26 @@ watch(visible, () => {
     restoreValidation();
   }
 });
+
+/** 分片参数变化, 解析并序列化到model.argsStr */
+watch(dynamicForm, () => {
+  if (visible.value && model.taskType === 3) {
+    parseArgsStr();
+  }
+});
+
+/** 任务类型变化, 清理分片参数/方法参数 */
+watch(
+  () => model.taskType,
+  taskType => {
+    if (visible.value) {
+      if (taskType !== 3) {
+        dynamicForm.args = [];
+      }
+      model.argsStr = '';
+    }
+  }
+);
 </script>
 
 <template>

From c1f9be990bf00d700689b420b1ec21fed22c16f5 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Sat, 15 Jun 2024 10:39:12 +0800
Subject: [PATCH 17/39] =?UTF-8?q?fix(sj=5F1.1.0=5Fbeta1):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8DtoString()=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/internal/cron-model.vue           |  2 +-
 .../src/components/internal/input-number.vue         |  2 +-
 packages/cron-input/src/shared/utils.ts              |  2 +-
 packages/utils/src/crypto.ts                         |  2 +-
 packages/work-flow/src/components/log-drawer.vue     | 12 ++++++------
 packages/work-flow/src/node/branch-node.vue          |  2 +-
 packages/work-flow/src/node/callback-node.vue        |  2 +-
 packages/work-flow/src/node/task-node.vue            |  4 ++--
 packages/work-flow/src/utils/request.ts              |  4 ++--
 src/components/common/log-drawer.vue                 | 12 ++++++------
 src/service/request/index.ts                         |  6 +++---
 src/store/modules/auth/index.ts                      |  2 +-
 12 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/packages/cron-input/src/components/internal/cron-model.vue b/packages/cron-input/src/components/internal/cron-model.vue
index 9cbc1bf..0e1dbcc 100644
--- a/packages/cron-input/src/components/internal/cron-model.vue
+++ b/packages/cron-input/src/components/internal/cron-model.vue
@@ -49,7 +49,7 @@ const fields = computed(() => {
 // });
 
 const previewLabel = computed(() => {
-  return Locales[props.lang].preview.join(previewTime.value.toString());
+  return Locales[props.lang].preview.join(previewTime.value?.toString());
 });
 
 const expression = computed(() => {
diff --git a/packages/cron-input/src/components/internal/input-number.vue b/packages/cron-input/src/components/internal/input-number.vue
index a0e3de8..2d9d5f9 100644
--- a/packages/cron-input/src/components/internal/input-number.vue
+++ b/packages/cron-input/src/components/internal/input-number.vue
@@ -31,7 +31,7 @@ const value = computed({
 });
 
 const formatter = (val: number) => {
-  return props.fieldValue === WEEK ? formatterWeek(val.toString(), props.locale!) : null;
+  return props.fieldValue === WEEK ? formatterWeek(val?.toString(), props.locale!) : null;
 };
 
 const parser = (val: string) => {
diff --git a/packages/cron-input/src/shared/utils.ts b/packages/cron-input/src/shared/utils.ts
index 9a5a64b..120bca5 100644
--- a/packages/cron-input/src/shared/utils.ts
+++ b/packages/cron-input/src/shared/utils.ts
@@ -19,7 +19,7 @@ export function generateSpecifies(
   let index = 0;
 
   for (let specify = min; specify <= max; specify += 1) {
-    specifies.push({ value: specify, label: labels ? labels[index] : specify.toString() });
+    specifies.push({ value: specify, label: labels ? labels[index] : specify?.toString() });
     index += 1;
   }
 
diff --git a/packages/utils/src/crypto.ts b/packages/utils/src/crypto.ts
index dc173c8..be6d9be 100644
--- a/packages/utils/src/crypto.ts
+++ b/packages/utils/src/crypto.ts
@@ -11,7 +11,7 @@ export class Crypto<T extends object> {
   encrypt(data: T): string {
     const dataString = JSON.stringify(data);
     const encrypted = CryptoJS.AES.encrypt(dataString, this.secret);
-    return encrypted.toString();
+    return encrypted?.toString();
   }
 
   decrypt(encrypted: string) {
diff --git a/packages/work-flow/src/components/log-drawer.vue b/packages/work-flow/src/components/log-drawer.vue
index 56b8ed4..386526a 100644
--- a/packages/work-flow/src/components/log-drawer.vue
+++ b/packages/work-flow/src/components/log-drawer.vue
@@ -113,14 +113,14 @@ onBeforeUnmount(() => {
 });
 
 function timestampToDate(timestamp: string): string {
-  const date = new Date(Number.parseInt(timestamp.toString(), 10));
+  const date = new Date(Number.parseInt(timestamp?.toString(), 10));
   const year = date.getFullYear();
   const month =
-    (date.getMonth() + 1).toString().length === 1 ? `0${date.getMonth() + 1}` : (date.getMonth() + 1).toString();
-  const day = date.getDate().toString().length === 1 ? `0${date.getDate()}` : date.getDate().toString();
-  const hours = date.getHours().toString().length === 1 ? `0${date.getHours()}` : date.getHours().toString();
-  const minutes = date.getMinutes().toString().length === 1 ? `0${date.getMinutes()}` : date.getMinutes().toString();
-  const seconds = date.getSeconds().toString().length === 1 ? `0${date.getSeconds()}` : date.getSeconds().toString();
+    (date.getMonth() + 1)?.toString().length === 1 ? `0${date.getMonth() + 1}` : (date.getMonth() + 1)?.toString();
+  const day = date.getDate()?.toString().length === 1 ? `0${date.getDate()}` : date.getDate()?.toString();
+  const hours = date.getHours()?.toString().length === 1 ? `0${date.getHours()}` : date.getHours()?.toString();
+  const minutes = date.getMinutes()?.toString().length === 1 ? `0${date.getMinutes()}` : date.getMinutes()?.toString();
+  const seconds = date.getSeconds()?.toString().length === 1 ? `0${date.getSeconds()}` : date.getSeconds()?.toString();
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}.${date.getMilliseconds()}`;
 }
 </script>
diff --git a/packages/work-flow/src/node/branch-node.vue b/packages/work-flow/src/node/branch-node.vue
index d809951..49a895e 100644
--- a/packages/work-flow/src/node/branch-node.vue
+++ b/packages/work-flow/src/node/branch-node.vue
@@ -148,7 +148,7 @@ const showDetail = (item: Flow.ConditionNodeType, index: number) => {
         if (job.id) {
           detailIds.value?.push(job.id);
         } else if (job.jobId) {
-          detailId.value = job.jobId.toString();
+          detailId.value = job.jobId?.toString();
         }
       });
       if (detailIds.value.length === 0) {
diff --git a/packages/work-flow/src/node/callback-node.vue b/packages/work-flow/src/node/callback-node.vue
index 88b5533..77550ea 100644
--- a/packages/work-flow/src/node/callback-node.vue
+++ b/packages/work-flow/src/node/callback-node.vue
@@ -92,7 +92,7 @@ const showDetail = (item: Flow.ConditionNodeType, index: number) => {
       if (job.id) {
         detailIds.value?.push(job.id);
       } else if (job.jobId) {
-        detailId.value = job.jobId.toString();
+        detailId.value = job.jobId?.toString();
       }
     });
     if (detailIds.value.length === 0) {
diff --git a/packages/work-flow/src/node/task-node.vue b/packages/work-flow/src/node/task-node.vue
index e94199b..c9d909a 100644
--- a/packages/work-flow/src/node/task-node.vue
+++ b/packages/work-flow/src/node/task-node.vue
@@ -141,11 +141,11 @@ const showDetail = (node: Flow.ConditionNodeType, detailIndex: number) => {
         if (item.id) {
           detailIds.value?.push(item.id);
         } else if (item.jobId) {
-          detailId.value = item.jobId.toString();
+          detailId.value = item.jobId?.toString();
         }
       });
     if (node.jobTask?.jobId) {
-      detailId.value = node.jobTask?.jobId.toString();
+      detailId.value = node.jobTask?.jobId?.toString();
     }
     cardDrawer.value = true;
   } else if (store.type === 1) {
diff --git a/packages/work-flow/src/utils/request.ts b/packages/work-flow/src/utils/request.ts
index e8e191f..43f1452 100644
--- a/packages/work-flow/src/utils/request.ts
+++ b/packages/work-flow/src/utils/request.ts
@@ -27,7 +27,7 @@ export const request = createFlatRequest<Service.Response>(
     isBackendSuccess(response) {
       // when the backend response code is "0000"(default), it means the request is success
       // to change this logic by yourself, you can modify the `VITE_SERVICE_SUCCESS_CODE` in `.env` file
-      return response.data.status.toString() === import.meta.env.VITE_SERVICE_SUCCESS_CODE;
+      return response.data.status?.toString() === import.meta.env.VITE_SERVICE_SUCCESS_CODE;
     },
     transformBackendResponse(response) {
       return response.data.total ? response.data : response.data.data;
@@ -41,7 +41,7 @@ export const request = createFlatRequest<Service.Response>(
       // get backend error message and code
       if (error.code === BACKEND_ERROR_CODE) {
         msg = error.response?.data?.message || msg;
-        backendErrorCode = error.response?.data?.status.toString() || '';
+        backendErrorCode = error.response?.data?.status?.toString() || '';
       }
 
       // the error message is displayed in the modal
diff --git a/src/components/common/log-drawer.vue b/src/components/common/log-drawer.vue
index 211386f..f8a350b 100644
--- a/src/components/common/log-drawer.vue
+++ b/src/components/common/log-drawer.vue
@@ -68,14 +68,14 @@ const onUpdateShow = (value: boolean) => {
 };
 
 function timestampToDate(timestamp: string): string {
-  const date = new Date(Number.parseInt(timestamp.toString(), 10));
+  const date = new Date(Number.parseInt(timestamp?.toString(), 10));
   const year = date.getFullYear();
   const month =
-    (date.getMonth() + 1).toString().length === 1 ? `0${date.getMonth() + 1}` : (date.getMonth() + 1).toString();
-  const day = date.getDate().toString().length === 1 ? `0${date.getDate()}` : date.getDate().toString();
-  const hours = date.getHours().toString().length === 1 ? `0${date.getHours()}` : date.getHours().toString();
-  const minutes = date.getMinutes().toString().length === 1 ? `0${date.getMinutes()}` : date.getMinutes().toString();
-  const seconds = date.getSeconds().toString().length === 1 ? `0${date.getSeconds()}` : date.getSeconds().toString();
+    (date.getMonth() + 1)?.toString().length === 1 ? `0${date.getMonth() + 1}` : (date.getMonth() + 1)?.toString();
+  const day = date.getDate()?.toString().length === 1 ? `0${date.getDate()}` : date.getDate()?.toString();
+  const hours = date.getHours()?.toString().length === 1 ? `0${date.getHours()}` : date.getHours()?.toString();
+  const minutes = date.getMinutes()?.toString().length === 1 ? `0${date.getMinutes()}` : date.getMinutes()?.toString();
+  const seconds = date.getSeconds()?.toString().length === 1 ? `0${date.getSeconds()}` : date.getSeconds()?.toString();
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}.${date.getMilliseconds()}`;
 }
 </script>
diff --git a/src/service/request/index.ts b/src/service/request/index.ts
index 35a45dd..fa2b51c 100644
--- a/src/service/request/index.ts
+++ b/src/service/request/index.ts
@@ -52,14 +52,14 @@ export const request = createFlatRequest<App.Service.Response, RequestInstanceSt
 
       // when the backend response code is in `logoutCodes`, it means the user will be logged out and redirected to login page
       const logoutCodes = import.meta.env.VITE_SERVICE_LOGOUT_CODES?.split(',') || [];
-      if (logoutCodes.includes(response.data.status.toString())) {
+      if (logoutCodes.includes(response.data.status?.toString())) {
         handleLogout();
         return null;
       }
 
       // when the backend response code is in `modalLogoutCodes`, it means the user will be logged out by displaying a modal
       const modalLogoutCodes = import.meta.env.VITE_SERVICE_MODAL_LOGOUT_CODES?.split(',') || [];
-      if (modalLogoutCodes.includes(response.data.status.toString())) {
+      if (modalLogoutCodes.includes(response.data.status?.toString())) {
         request.state.errMsgStack = [...(request.state.errMsgStack || []), response.data.message];
 
         // prevent the user from refreshing the page
@@ -116,7 +116,7 @@ export const request = createFlatRequest<App.Service.Response, RequestInstanceSt
 
       // get backend error message and code
       message = error.response?.data?.message || message;
-      backendErrorCode = error.response?.data?.status.toString() || '';
+      backendErrorCode = error.response?.data?.status?.toString() || '';
 
       // the error message is displayed in the modal
       const modalLogoutCodes = import.meta.env.VITE_SERVICE_MODAL_LOGOUT_CODES?.split(',') || [];
diff --git a/src/store/modules/auth/index.ts b/src/store/modules/auth/index.ts
index 3c35c0a..7863c8c 100644
--- a/src/store/modules/auth/index.ts
+++ b/src/store/modules/auth/index.ts
@@ -37,7 +37,7 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
   const isStaticSuper = computed(() => {
     const { VITE_AUTH_ROUTE_MODE, VITE_STATIC_SUPER_ROLE } = import.meta.env;
     return (
-      VITE_AUTH_ROUTE_MODE === 'static' && userInfo.roles.map(role => role.toString()).includes(VITE_STATIC_SUPER_ROLE)
+      VITE_AUTH_ROUTE_MODE === 'static' && userInfo.roles.map(role => role?.toString()).includes(VITE_STATIC_SUPER_ROLE)
     );
   });
 

From 6ea459ef3b2625b707e88e616425638cff34080e Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Sat, 15 Jun 2024 14:14:33 +0800
Subject: [PATCH 18/39] =?UTF-8?q?refactor(sj=5F1.1.0=5Fbeta1):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=AF=B7=E6=B1=82=E5=BC=82=E5=B8=B8=E9=87=8D=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/service/request/index.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/service/request/index.ts b/src/service/request/index.ts
index fa2b51c..ce8b565 100644
--- a/src/service/request/index.ts
+++ b/src/service/request/index.ts
@@ -13,6 +13,9 @@ const { baseURL } = getServiceBaseURL(import.meta.env, isHttpProxy);
 export const request = createFlatRequest<App.Service.Response, RequestInstanceState>(
   {
     baseURL,
+    'axios-retry': {
+      retries: 0
+    },
     headers: {
       timeout: 6000
     }

From e8cc54a4dfea5f6b6129a9fac0b2c85330de6653 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sun, 16 Jun 2024 00:14:36 +0800
Subject: [PATCH 19/39] =?UTF-8?q?fix(sj=5F1.1.0=5Fbeta1):=20DatetimeRange?=
 =?UTF-8?q?=E8=B5=B7=E5=A7=8B=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=E9=A2=A0=E5=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/common/datetime-range.vue b/src/components/common/datetime-range.vue
index f246530..065e490 100644
--- a/src/components/common/datetime-range.vue
+++ b/src/components/common/datetime-range.vue
@@ -42,7 +42,7 @@ watch(
 function getDefaultDate(): [number, number] {
   const endOfDayTimestamp = dayjs().endOf('day').valueOf();
   const startOfDayOneMonthAgoTimestamp = dayjs().subtract(1, 'month').startOf('day').valueOf();
-  return [endOfDayTimestamp, startOfDayOneMonthAgoTimestamp];
+  return [startOfDayOneMonthAgoTimestamp, endOfDayTimestamp];
 }
 
 function initDefaultDate() {

From 6ed5136d18bc2092059ceb68884a04ccd9e97ee2 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sun, 16 Jun 2024 21:55:32 +0800
Subject: [PATCH 20/39] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E6=89=B9=E6=AC=A1=E3=80=81=E9=87=8D=E8=AF=95?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E3=80=81=E9=87=8D=E8=AF=95=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/typings/api.d.ts                                       | 7 ++++---
 src/views/retry/dead-letter/index.vue                      | 4 +++-
 src/views/retry/dead-letter/modules/dead-letter-search.vue | 3 +++
 src/views/retry/log/index.vue                              | 4 +++-
 src/views/retry/log/modules/retry-log-search.vue           | 3 +++
 src/views/workflow/batch/index.vue                         | 4 +++-
 src/views/workflow/batch/modules/workflow-batch-search.vue | 3 +++
 7 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index 9cc03cf..40ea80d 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -703,7 +703,7 @@ declare namespace Api {
         Api.RetryDeadLetter.DeadLetter,
         'id' | 'uniqueId' | 'groupName' | 'sceneName' | 'idempotentId' | 'bizNo' | 'taskType' | 'createDt'
       > &
-        CommonSearchParams
+        CommonSearchParams & { beginDate: number; endDate: number }
     >;
 
     /** DeadLetter list */
@@ -1115,7 +1115,8 @@ declare namespace Api {
 
     /** workflowBatch search params */
     type WorkflowBatchSearchParams = CommonType.RecordNullable<
-      Pick<Api.WorkflowBatch.WorkflowBatch, 'workflowId' | 'groupName' | 'taskBatchStatus'> & CommonSearchParams
+      Pick<Api.WorkflowBatch.WorkflowBatch, 'workflowId' | 'groupName' | 'taskBatchStatus'> &
+        CommonSearchParams & { beginDate: number; endDate: number }
     >;
 
     /** workflowBatch list */
@@ -1165,7 +1166,7 @@ declare namespace Api {
     /** retryLog search params */
     type RetryLogSearchParams = CommonType.RecordNullable<
       Pick<Api.RetryLog.RetryLog, 'uniqueId' | 'groupName' | 'sceneName' | 'idempotentId' | 'bizNo' | 'retryStatus'> &
-        CommonSearchParams
+        CommonSearchParams & { beginDate: number; endDate: number }
     >;
 
     /** retryLog list */
diff --git a/src/views/retry/dead-letter/index.vue b/src/views/retry/dead-letter/index.vue
index 83ed710..c0a80e3 100644
--- a/src/views/retry/dead-letter/index.vue
+++ b/src/views/retry/dead-letter/index.vue
@@ -30,7 +30,9 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     page: 1,
     size: 10,
     groupName: null,
-    sceneName: null
+    sceneName: null,
+    beginDate: null,
+    endDate: null
     // if you want to use the searchParams in Form, you need to define the following properties, and the value is null
     // the value can not be undefined, otherwise the property in Form will not be reactive
   },
diff --git a/src/views/retry/dead-letter/modules/dead-letter-search.vue b/src/views/retry/dead-letter/modules/dead-letter-search.vue
index 2bdbb1b..65d3eb4 100644
--- a/src/views/retry/dead-letter/modules/dead-letter-search.vue
+++ b/src/views/retry/dead-letter/modules/dead-letter-search.vue
@@ -33,6 +33,9 @@ function search() {
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.sceneName')" path="sceneName" class="pr-24px">
       <SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" />
     </NFormItemGi>
+    <NFormItemGi span="24 s:24 m:15 l:12 xl:9" :label="$t('page.common.createTime')" path="createTime" class="pr-24px">
+      <DatetimeRange v-model:begin-date="model.beginDate" v-model:end-date="model.endDate" />
+    </NFormItemGi>
   </SearchForm>
 </template>
 
diff --git a/src/views/retry/log/index.vue b/src/views/retry/log/index.vue
index 9aca5d9..b947e29 100644
--- a/src/views/retry/log/index.vue
+++ b/src/views/retry/log/index.vue
@@ -31,7 +31,9 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     sceneName: null,
     idempotentId: null,
     bizNo: null,
-    retryStatus: null
+    retryStatus: null,
+    beginDate: null,
+    endDate: null
   },
   searchParams: {
     retryStatus
diff --git a/src/views/retry/log/modules/retry-log-search.vue b/src/views/retry/log/modules/retry-log-search.vue
index f779999..c69fd69 100644
--- a/src/views/retry/log/modules/retry-log-search.vue
+++ b/src/views/retry/log/modules/retry-log-search.vue
@@ -52,6 +52,9 @@ function search() {
         clearable
       />
     </NFormItemGi>
+    <NFormItemGi span="24 s:24 m:15 l:12 xl:9" :label="$t('page.common.createTime')" path="createTime" class="pr-24px">
+      <DatetimeRange v-model:begin-date="model.beginDate" v-model:end-date="model.endDate" />
+    </NFormItemGi>
   </SearchForm>
 </template>
 
diff --git a/src/views/workflow/batch/index.vue b/src/views/workflow/batch/index.vue
index 8a4bbfc..c621287 100644
--- a/src/views/workflow/batch/index.vue
+++ b/src/views/workflow/batch/index.vue
@@ -22,7 +22,9 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     // the value can not be undefined, otherwise the property in Form will not be reactive
     workflowId: null,
     groupName: null,
-    taskBatchStatus: null
+    taskBatchStatus: null,
+    beginDate: null,
+    endDate: null
   },
   searchParams: {
     workflowId,
diff --git a/src/views/workflow/batch/modules/workflow-batch-search.vue b/src/views/workflow/batch/modules/workflow-batch-search.vue
index 7dfe2f3..1c5f2c1 100644
--- a/src/views/workflow/batch/modules/workflow-batch-search.vue
+++ b/src/views/workflow/batch/modules/workflow-batch-search.vue
@@ -67,6 +67,9 @@ groupNameUpdate('');
     >
       <TaskBatchStatus v-model:value="model.taskBatchStatus" />
     </NFormItemGi>
+    <NFormItemGi span="24 s:24 m:15 l:12 xl:9" :label="$t('page.common.createTime')" path="createTime" class="pr-24px">
+      <DatetimeRange v-model:begin-date="model.beginDate" v-model:end-date="model.endDate" />
+    </NFormItemGi>
   </SearchForm>
 </template>
 

From 964316b1f9d6ebf9d47f9b342c9737a3e62f0738 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sun, 16 Jun 2024 23:43:41 +0800
Subject: [PATCH 21/39] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0[=E5=BA=8F?=
 =?UTF-8?q?=E5=8F=B7]=E3=80=81[=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4]?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/manager/index.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/views/user/manager/index.vue b/src/views/user/manager/index.vue
index c9b665e..849042a 100644
--- a/src/views/user/manager/index.vue
+++ b/src/views/user/manager/index.vue
@@ -57,6 +57,12 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
         );
       }
     },
+    {
+      key: 'id',
+      title: $t('common.index'),
+      align: 'left',
+      minWidth: 50
+    },
     {
       key: 'username',
       title: $t('page.userManager.username'),
@@ -93,6 +99,12 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
         return <NTag type={tagMap[row.role!]}>{label}</NTag>;
       }
     },
+    {
+      key: 'createDt',
+      title: $t('common.createDt'),
+      align: 'left',
+      minWidth: 50
+    },
     {
       key: 'updateDt',
       title: $t('common.updateDt'),

From 1c7b0732e4c069abf8d0e9ea159daceba55eef2f Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Mon, 17 Jun 2024 14:21:25 +0800
Subject: [PATCH 22/39] =?UTF-8?q?refactor(sj=5F1.1.0-beta1):=20=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/datetime-range.vue      | 67 -------------------
 src/typings/api.d.ts                          | 11 ++-
 src/views/home/modules/task-tab.vue           | 26 +++----
 src/views/job/batch/index.vue                 |  6 +-
 .../job/batch/modules/job-batch-search.vue    | 16 ++++-
 src/views/retry/dead-letter/index.vue         |  3 +-
 .../modules/dead-letter-search.vue            | 16 ++++-
 src/views/retry/log/index.vue                 |  3 +-
 .../retry/log/modules/retry-log-search.vue    | 16 ++++-
 src/views/workflow/batch/index.vue            |  3 +-
 .../batch/modules/workflow-batch-search.vue   | 16 ++++-
 11 files changed, 76 insertions(+), 107 deletions(-)
 delete mode 100644 src/components/common/datetime-range.vue

diff --git a/src/components/common/datetime-range.vue b/src/components/common/datetime-range.vue
deleted file mode 100644
index 065e490..0000000
--- a/src/components/common/datetime-range.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<script setup lang="ts">
-import dayjs from 'dayjs';
-import { ref, watch } from 'vue';
-
-defineOptions({
-  name: 'DatetimeRange'
-});
-
-interface Props {
-  beginDate?: number | null;
-  endDate?: number | null;
-}
-
-const props = defineProps<Props>();
-
-interface Emits {
-  (e: 'update:beginDate', beginDate: number | null): void;
-  (e: 'update:endDate', endDate: number | null): void;
-}
-const emit = defineEmits<Emits>();
-
-const dateRange = ref<[number, number] | undefined>(getDefaultDate());
-
-watch(
-  () => [props.beginDate, props.endDate],
-  val => {
-    if (!val[0] && !val[1]) {
-      dateRange.value = undefined;
-    }
-  }
-);
-
-watch(
-  () => dateRange.value,
-  val => {
-    emit('update:beginDate', val ? val[0] : null);
-    emit('update:endDate', val ? val[1] : null);
-  },
-  { immediate: true }
-);
-
-function getDefaultDate(): [number, number] {
-  const endOfDayTimestamp = dayjs().endOf('day').valueOf();
-  const startOfDayOneMonthAgoTimestamp = dayjs().subtract(1, 'month').startOf('day').valueOf();
-  return [startOfDayOneMonthAgoTimestamp, endOfDayTimestamp];
-}
-
-function initDefaultDate() {
-  const beginDate = props.beginDate;
-  if (typeof beginDate === 'number' && beginDate) {
-    dateRange.value![0] = beginDate;
-  }
-
-  const endDate = props.endDate;
-  if (typeof endDate === 'number' && endDate) {
-    dateRange.value![1] = endDate;
-  }
-}
-
-initDefaultDate();
-</script>
-
-<template>
-  <NDatePicker v-model:value="dateRange" class="w-full" type="datetimerange" clearable />
-</template>
-
-<style scoped lang="scss"></style>
diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index 40ea80d..85b3786 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -272,8 +272,7 @@ declare namespace Api {
       groupName?: string;
       type: DashboardLineType;
       mode?: DashboardLineMode;
-      startTime?: string;
-      endTime?: string;
+      datetimeRange?: [string, string] | null;
     } & CommonSearchParams;
 
     /**
@@ -703,7 +702,7 @@ declare namespace Api {
         Api.RetryDeadLetter.DeadLetter,
         'id' | 'uniqueId' | 'groupName' | 'sceneName' | 'idempotentId' | 'bizNo' | 'taskType' | 'createDt'
       > &
-        CommonSearchParams & { beginDate: number; endDate: number }
+        CommonSearchParams & { datetimeRange?: [string, string] }
     >;
 
     /** DeadLetter list */
@@ -1080,7 +1079,7 @@ declare namespace Api {
     /** JobBatch search params */
     type JobBatchSearchParams = CommonType.RecordNullable<
       Pick<Api.JobBatch.JobBatch, 'groupName' | 'jobName' | 'taskBatchStatus'> &
-        CommonSearchParams & { beginDate: number; endDate: number }
+        CommonSearchParams & { datetimeRange?: [string, string] }
     >;
 
     /** JobBatch list */
@@ -1116,7 +1115,7 @@ declare namespace Api {
     /** workflowBatch search params */
     type WorkflowBatchSearchParams = CommonType.RecordNullable<
       Pick<Api.WorkflowBatch.WorkflowBatch, 'workflowId' | 'groupName' | 'taskBatchStatus'> &
-        CommonSearchParams & { beginDate: number; endDate: number }
+        CommonSearchParams & { datetimeRange?: [string, string] }
     >;
 
     /** workflowBatch list */
@@ -1166,7 +1165,7 @@ declare namespace Api {
     /** retryLog search params */
     type RetryLogSearchParams = CommonType.RecordNullable<
       Pick<Api.RetryLog.RetryLog, 'uniqueId' | 'groupName' | 'sceneName' | 'idempotentId' | 'bizNo' | 'retryStatus'> &
-        CommonSearchParams & { beginDate: number; endDate: number }
+        CommonSearchParams & { datetimeRange?: [string, string] }
     >;
 
     /** retryLog list */
diff --git a/src/views/home/modules/task-tab.vue b/src/views/home/modules/task-tab.vue
index 6d9b37f..0f8d5cf 100644
--- a/src/views/home/modules/task-tab.vue
+++ b/src/views/home/modules/task-tab.vue
@@ -26,12 +26,9 @@ const tabParams = ref<Api.Dashboard.DashboardLineParams>({
   type: 'WEEK',
   page: 1,
   size: 6,
-  mode: 'JOB'
+  mode: 'JOB',
+  datetimeRange: null
 });
-const dateRange = ref<[number, number] | null>();
-const formattedValue = ref<[string, string] | null>(
-  tabParams.value.startTime && tabParams.value.endTime ? [tabParams.value.startTime, tabParams.value.endTime] : null
-);
 
 const getData = async () => {
   const { data: lineData, error } =
@@ -70,23 +67,16 @@ const onUpdateTab = (value: string) => {
 const onUpdateDate = (value: [string, string]) => {
   if (value) {
     tabParams.value.type = 'OTHERS';
-    tabParams.value.startTime = value[0];
-    tabParams.value.endTime = value[1];
   }
 };
 
 const onClearDate = () => {
   tabParams.value.type = 'WEEK';
-  tabParams.value.startTime = undefined;
-  tabParams.value.endTime = undefined;
 };
 
 const onUpdateType = (value: string) => {
   if (value !== 'OTHERS') {
-    dateRange.value = null;
-    formattedValue.value = null;
-    tabParams.value.startTime = undefined;
-    tabParams.value.endTime = undefined;
+    tabParams.value.datetimeRange = null;
   }
 };
 
@@ -214,12 +204,12 @@ getGroupNames();
         <NRadioButton value="YEAR" :label="$t('page.home.retryTab.params.year')" />
       </NRadioGroup>
       <NDatePicker
-        v-model:value="dateRange"
-        v-model:formatted-value="formattedValue"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        type="daterange"
-        class="w-300px lg:w-230px md:w-270px"
+        v-model:formatted-value="tabParams.datetimeRange"
+        type="datetimerange"
+        value-format="yyyy-MM-dd'T'HH:mm:ss"
+        class="w-400px"
         clearable
+        :default-time="['00:00:00', '23:56:56']"
         @update:formatted-value="onUpdateDate"
         @clear="onClearDate"
       />
diff --git a/src/views/job/batch/index.vue b/src/views/job/batch/index.vue
index d618a1d..4ed9111 100644
--- a/src/views/job/batch/index.vue
+++ b/src/views/job/batch/index.vue
@@ -27,8 +27,10 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
     groupName: null,
     jobName: null,
     taskBatchStatus: null,
-    beginDate: null,
-    endDate: null
+    datetimeRange: null
+
+    // beginDate: null,
+    // endDate: null
   },
   searchParams: {
     jobName,
diff --git a/src/views/job/batch/modules/job-batch-search.vue b/src/views/job/batch/modules/job-batch-search.vue
index d9e8fd7..7d10a61 100644
--- a/src/views/job/batch/modules/job-batch-search.vue
+++ b/src/views/job/batch/modules/job-batch-search.vue
@@ -36,8 +36,20 @@ function search() {
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobBatch.taskBatchStatus')" path="taskBatchStatus" class="pr-24px">
       <TaskBatchStatus v-model:value="model.taskBatchStatus" />
     </NFormItemGi>
-    <NFormItemGi span="24 s:24 m:15 l:12 xl:9" :label="$t('page.common.createTime')" path="createTime" class="pr-24px">
-      <DatetimeRange v-model:begin-date="model.beginDate" v-model:end-date="model.endDate" />
+    <NFormItemGi
+      span="24 s:24 m:15 l:12 xl:9"
+      :label="$t('page.common.createTime')"
+      path="datetimeRange"
+      class="pr-24px"
+    >
+      <NDatePicker
+        v-model:formatted-value="model.datetimeRange"
+        class="w-full"
+        type="datetimerange"
+        value-format="yyyy-MM-dd'T'HH:mm:ss"
+        :default-time="['00:00:00', '23:56:56']"
+        clearable
+      />
     </NFormItemGi>
   </SearchForm>
 </template>
diff --git a/src/views/retry/dead-letter/index.vue b/src/views/retry/dead-letter/index.vue
index c0a80e3..c810836 100644
--- a/src/views/retry/dead-letter/index.vue
+++ b/src/views/retry/dead-letter/index.vue
@@ -31,8 +31,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     size: 10,
     groupName: null,
     sceneName: null,
-    beginDate: null,
-    endDate: null
+    datetimeRange: null
     // if you want to use the searchParams in Form, you need to define the following properties, and the value is null
     // the value can not be undefined, otherwise the property in Form will not be reactive
   },
diff --git a/src/views/retry/dead-letter/modules/dead-letter-search.vue b/src/views/retry/dead-letter/modules/dead-letter-search.vue
index 65d3eb4..c4ba3ca 100644
--- a/src/views/retry/dead-letter/modules/dead-letter-search.vue
+++ b/src/views/retry/dead-letter/modules/dead-letter-search.vue
@@ -33,8 +33,20 @@ function search() {
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.sceneName')" path="sceneName" class="pr-24px">
       <SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" />
     </NFormItemGi>
-    <NFormItemGi span="24 s:24 m:15 l:12 xl:9" :label="$t('page.common.createTime')" path="createTime" class="pr-24px">
-      <DatetimeRange v-model:begin-date="model.beginDate" v-model:end-date="model.endDate" />
+    <NFormItemGi
+      span="24 s:24 m:15 l:12 xl:9"
+      :label="$t('page.common.createTime')"
+      path="datetimeRange"
+      class="pr-24px"
+    >
+      <NDatePicker
+        v-model:formatted-value="model.datetimeRange"
+        class="w-full"
+        type="datetimerange"
+        value-format="yyyy-MM-dd'T'HH:mm:ss"
+        :default-time="['00:00:00', '23:56:56']"
+        clearable
+      />
     </NFormItemGi>
   </SearchForm>
 </template>
diff --git a/src/views/retry/log/index.vue b/src/views/retry/log/index.vue
index b947e29..df49819 100644
--- a/src/views/retry/log/index.vue
+++ b/src/views/retry/log/index.vue
@@ -32,8 +32,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     idempotentId: null,
     bizNo: null,
     retryStatus: null,
-    beginDate: null,
-    endDate: null
+    datetimeRange: null
   },
   searchParams: {
     retryStatus
diff --git a/src/views/retry/log/modules/retry-log-search.vue b/src/views/retry/log/modules/retry-log-search.vue
index c69fd69..469141b 100644
--- a/src/views/retry/log/modules/retry-log-search.vue
+++ b/src/views/retry/log/modules/retry-log-search.vue
@@ -52,8 +52,20 @@ function search() {
         clearable
       />
     </NFormItemGi>
-    <NFormItemGi span="24 s:24 m:15 l:12 xl:9" :label="$t('page.common.createTime')" path="createTime" class="pr-24px">
-      <DatetimeRange v-model:begin-date="model.beginDate" v-model:end-date="model.endDate" />
+    <NFormItemGi
+      span="24 s:24 m:15 l:12 xl:9"
+      :label="$t('page.common.createTime')"
+      path="datetimeRange"
+      class="pr-24px"
+    >
+      <NDatePicker
+        v-model:formatted-value="model.datetimeRange"
+        class="w-full"
+        type="datetimerange"
+        value-format="yyyy-MM-dd'T'HH:mm:ss"
+        :default-time="['00:00:00', '23:56:56']"
+        clearable
+      />
     </NFormItemGi>
   </SearchForm>
 </template>
diff --git a/src/views/workflow/batch/index.vue b/src/views/workflow/batch/index.vue
index c621287..54096c9 100644
--- a/src/views/workflow/batch/index.vue
+++ b/src/views/workflow/batch/index.vue
@@ -23,8 +23,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     workflowId: null,
     groupName: null,
     taskBatchStatus: null,
-    beginDate: null,
-    endDate: null
+    datetimeRange: null
   },
   searchParams: {
     workflowId,
diff --git a/src/views/workflow/batch/modules/workflow-batch-search.vue b/src/views/workflow/batch/modules/workflow-batch-search.vue
index 1c5f2c1..0ce59d5 100644
--- a/src/views/workflow/batch/modules/workflow-batch-search.vue
+++ b/src/views/workflow/batch/modules/workflow-batch-search.vue
@@ -67,8 +67,20 @@ groupNameUpdate('');
     >
       <TaskBatchStatus v-model:value="model.taskBatchStatus" />
     </NFormItemGi>
-    <NFormItemGi span="24 s:24 m:15 l:12 xl:9" :label="$t('page.common.createTime')" path="createTime" class="pr-24px">
-      <DatetimeRange v-model:begin-date="model.beginDate" v-model:end-date="model.endDate" />
+    <NFormItemGi
+      span="24 s:24 m:15 l:12 xl:9"
+      :label="$t('page.common.createTime')"
+      path="datetimeRange"
+      class="pr-24px"
+    >
+      <NDatePicker
+        v-model:formatted-value="model.datetimeRange"
+        class="w-full"
+        type="datetimerange"
+        value-format="yyyy-MM-dd'T'HH:mm:ss"
+        :default-time="['00:00:00', '23:56:56']"
+        clearable
+      />
     </NFormItemGi>
   </SearchForm>
 </template>

From 91096810099d4d8d56d1a9a60fcdc540266a7e04 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Tue, 18 Jun 2024 12:04:20 +0800
Subject: [PATCH 23/39] =?UTF-8?q?style(sj=5Fdev=5F1.1.0=5Fbeta1):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E6=A0=87=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/svg-icon/logo.svg              | 3 +--
 src/layouts/modules/global-logo/index.vue | 2 +-
 src/views/_builtin/login/index.vue        | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/assets/svg-icon/logo.svg b/src/assets/svg-icon/logo.svg
index 69b5e35..7a37355 100644
--- a/src/assets/svg-icon/logo.svg
+++ b/src/assets/svg-icon/logo.svg
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <svg id="snail-job" data-name="snail-job" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 709.6845005488 690.7728719041">
-  <path fill="#1366ff" d="M338.3025810878.1920476727c-24.3000003621,2.1000000313-31.0000004619,2.8000000417-41.0000006109,4.5000000671C156.7025783818,28.3920480929,44.9025767158,131.4920496292,10.4025762017,269.0920516796,2.8025760885,299.5920521341.0025760468,322.4920524753.0025760468,354.0920529462c-.1000000015,33.1000004932,2.7000000402,55.8000008315,10.400000155,86.7000012919,9.9000001475,39.4000005871,26.0000003874,76.0000011325,47.9000007138,109.1000016257,13.9000002071,20.9000003114,25.100000374,34.7000005171,42.5000006333,52.6000007838,29.8000004441,30.5000004545,62.0000009239,53.8000008017,99.2000014782,71.8000010699,8.3000001237,4.0000000596,15.7000002339,7.3000001088,16.4000002444,7.3000001088.6000000089,0,5.4000000805,1.3000000194,10.5000001565,3.0000000447,44.7000006661,14.3000002131,92.2000013739,3.7000000551,138.4000020623-30.9000004604,4.1000000611-3.1000000462,12.9000001922-10.8000001609,19.4000002891-17.1000002548,10.1000001505-9.7000001445,12.4000001848-12.6000001878,15.2000002265-18.5000002757,15.6000002325-33.9000005051,14.6000002176-69.0000010282-3.2000000477-110.9000016525-8.6000001281-20.1000002995-25.9000003859-46.1000006869-43.3000006452-65.0000009686-3.0000000447-3.4000000507-10.7000001594-9.6000001431-17.1000002548-14.0000002086-24.5000003651-16.7000002488-43.7000006512-32.1000004783-54.3000008091-43.4000006467-6.3000000939-6.8000001013-16.1000002399-21.9000003263-18.7000002787-28.9000004306-2.8000000417-7.5000001118-3.6000000536-17.5000002608-2.0000000298-24.4000003636,1.8000000268-7.8000001162,7.2000001073-18.7000002787,12.0000001788-24.2000003606,4.1000000611-4.6000000685,4.2000000626-4.8000000715,3.5000000522-10.000000149-1.6000000238-11.7000001743-17.8000002652-62.0000009239-20.600000307-63.8000009507-.6000000089-.3000000045-3.3000000492-.9000000134-6.0000000894-1.2000000179-10.5000001565-1.3000000194-18.3000002727-6.9000001028-22.7000003383-16.6000002474-2.1000000313-4.5000000671-2.4000000358-6.4000000954-2.0000000298-12.1000001803,1.1000000164-15.500000231,13.5000002012-26.0000003874,29.2000004351-24.8000003695,18.3000002727,1.5000000224,30.1000004485,19.2000002861,23.7000003532,35.8000005335-1.2000000179,3.0000000447-2.1000000313,6.5000000969-2.1000000313,7.7000001147,0,3.1000000462,8.2000001222,18.5000002757,14.2000002116,26.6000003964,13.9000002071,18.8000002801,30.000000447,27.6000004113,48.4000007212,26.4000003934,10.600000158-.6000000089,13.3000001982-2.0000000298,16.4000002444-8.2000001222,2.3000000343-4.5000000671,2.5000000373-6.2000000924,2.5000000373-17.0000002533,0-7.7000001147-.7000000104-15.0000002235-1.9000000283-20.5000003055-2.5000000373-11.6000001729-11.3000001684-38.4000005722-13.7000002041-41.4000006169-1.1000000164-1.3000000194-4.1000000611-3.2000000477-6.8000001013-4.1000000611-14.700000219-4.900000073-23.3000003472-16.7000002488-23.3000003472-32.1000004783,0-13.1000001952,7.2000001073-24.3000003621,19.5000002906-30.000000447,7.8000001162-3.6000000536,19.0000002831-3.4000000507,27.2000004053.5000000075,3.5000000522,1.6000000238,7.8000001162,4.8000000715,10.3000001535,7.5000001118,10.3000001535,11.2000001669,11.8000001758,24.4000003636,4.5000000671,39.4000005871-3.3000000492,6.7000000998-3.0000000447,8.1000001207,5.100000076,24.6000003666,18.2000002712,36.8000005484,52.2000007778,76.8000011444,101.1000015065,118.7000017688,39.2000005841,33.7000005022,64.9000009671,65.4000009745,84.9000012651,105.1000015661,15.6000002325,31.0000004619,24.1000003591,57.9000008628,30.20000045,96.300001435,1.0000000149,6.1000000909,1.8000000268,19.7000002936,2.1000000313,34.6000005156.6000000089,26.0000003874-.3000000045,39.5000005886-3.8000000566,59.3000008836-1.1000000164,6.0000000894-1.8000000268,11.0000001639-1.6000000238,11.2000001669.8000000119.8000000119,31.7000004724-31.7000004724,40.1000005975-42.1000006273,18.9000002816-23.5000003502,38.6000005752-56.6000008434,50.400000751-84.5000012591,13.0000001937-30.800000459,22.7000003383-68.9000010267,26.4000003934-104.0000015497,1.8000000268-17.3000002578,1.5000000224-54.7000008151-.6000000089-72.0000010729-13.2000001967-111.000001654-73.5000010952-206.1000030711-167.300002493-264.0000039339-13.3000001982-8.2000001222-37.4000005573-20.5000003055-52.2000007778-26.5000003949-29.7000004426-12.1000001803-67.1000009999-21.3000003174-99.1000014767-24.5000003651-11.4000001699-1.1000000164-43.8000006527-2.0000000298-51.00000076-1.4000000209Z"/>
+  <path d="M338.3025810878.1920476727c-24.3000003621,2.1000000313-31.0000004619,2.8000000417-41.0000006109,4.5000000671C156.7025783818,28.3920480929,44.9025767158,131.4920496292,10.4025762017,269.0920516796,2.8025760885,299.5920521341.0025760468,322.4920524753.0025760468,354.0920529462c-.1000000015,33.1000004932,2.7000000402,55.8000008315,10.400000155,86.7000012919,9.9000001475,39.4000005871,26.0000003874,76.0000011325,47.9000007138,109.1000016257,13.9000002071,20.9000003114,25.100000374,34.7000005171,42.5000006333,52.6000007838,29.8000004441,30.5000004545,62.0000009239,53.8000008017,99.2000014782,71.8000010699,8.3000001237,4.0000000596,15.7000002339,7.3000001088,16.4000002444,7.3000001088.6000000089,0,5.4000000805,1.3000000194,10.5000001565,3.0000000447,44.7000006661,14.3000002131,92.2000013739,3.7000000551,138.4000020623-30.9000004604,4.1000000611-3.1000000462,12.9000001922-10.8000001609,19.4000002891-17.1000002548,10.1000001505-9.7000001445,12.4000001848-12.6000001878,15.2000002265-18.5000002757,15.6000002325-33.9000005051,14.6000002176-69.0000010282-3.2000000477-110.9000016525-8.6000001281-20.1000002995-25.9000003859-46.1000006869-43.3000006452-65.0000009686-3.0000000447-3.4000000507-10.7000001594-9.6000001431-17.1000002548-14.0000002086-24.5000003651-16.7000002488-43.7000006512-32.1000004783-54.3000008091-43.4000006467-6.3000000939-6.8000001013-16.1000002399-21.9000003263-18.7000002787-28.9000004306-2.8000000417-7.5000001118-3.6000000536-17.5000002608-2.0000000298-24.4000003636,1.8000000268-7.8000001162,7.2000001073-18.7000002787,12.0000001788-24.2000003606,4.1000000611-4.6000000685,4.2000000626-4.8000000715,3.5000000522-10.000000149-1.6000000238-11.7000001743-17.8000002652-62.0000009239-20.600000307-63.8000009507-.6000000089-.3000000045-3.3000000492-.9000000134-6.0000000894-1.2000000179-10.5000001565-1.3000000194-18.3000002727-6.9000001028-22.7000003383-16.6000002474-2.1000000313-4.5000000671-2.4000000358-6.4000000954-2.0000000298-12.1000001803,1.1000000164-15.500000231,13.5000002012-26.0000003874,29.2000004351-24.8000003695,18.3000002727,1.5000000224,30.1000004485,19.2000002861,23.7000003532,35.8000005335-1.2000000179,3.0000000447-2.1000000313,6.5000000969-2.1000000313,7.7000001147,0,3.1000000462,8.2000001222,18.5000002757,14.2000002116,26.6000003964,13.9000002071,18.8000002801,30.000000447,27.6000004113,48.4000007212,26.4000003934,10.600000158-.6000000089,13.3000001982-2.0000000298,16.4000002444-8.2000001222,2.3000000343-4.5000000671,2.5000000373-6.2000000924,2.5000000373-17.0000002533,0-7.7000001147-.7000000104-15.0000002235-1.9000000283-20.5000003055-2.5000000373-11.6000001729-11.3000001684-38.4000005722-13.7000002041-41.4000006169-1.1000000164-1.3000000194-4.1000000611-3.2000000477-6.8000001013-4.1000000611-14.700000219-4.900000073-23.3000003472-16.7000002488-23.3000003472-32.1000004783,0-13.1000001952,7.2000001073-24.3000003621,19.5000002906-30.000000447,7.8000001162-3.6000000536,19.0000002831-3.4000000507,27.2000004053.5000000075,3.5000000522,1.6000000238,7.8000001162,4.8000000715,10.3000001535,7.5000001118,10.3000001535,11.2000001669,11.8000001758,24.4000003636,4.5000000671,39.4000005871-3.3000000492,6.7000000998-3.0000000447,8.1000001207,5.100000076,24.6000003666,18.2000002712,36.8000005484,52.2000007778,76.8000011444,101.1000015065,118.7000017688,39.2000005841,33.7000005022,64.9000009671,65.4000009745,84.9000012651,105.1000015661,15.6000002325,31.0000004619,24.1000003591,57.9000008628,30.20000045,96.300001435,1.0000000149,6.1000000909,1.8000000268,19.7000002936,2.1000000313,34.6000005156.6000000089,26.0000003874-.3000000045,39.5000005886-3.8000000566,59.3000008836-1.1000000164,6.0000000894-1.8000000268,11.0000001639-1.6000000238,11.2000001669.8000000119.8000000119,31.7000004724-31.7000004724,40.1000005975-42.1000006273,18.9000002816-23.5000003502,38.6000005752-56.6000008434,50.400000751-84.5000012591,13.0000001937-30.800000459,22.7000003383-68.9000010267,26.4000003934-104.0000015497,1.8000000268-17.3000002578,1.5000000224-54.7000008151-.6000000089-72.0000010729-13.2000001967-111.000001654-73.5000010952-206.1000030711-167.300002493-264.0000039339-13.3000001982-8.2000001222-37.4000005573-20.5000003055-52.2000007778-26.5000003949-29.7000004426-12.1000001803-67.1000009999-21.3000003174-99.1000014767-24.5000003651-11.4000001699-1.1000000164-43.8000006527-2.0000000298-51.00000076-1.4000000209Z"/>
 </svg>
diff --git a/src/layouts/modules/global-logo/index.vue b/src/layouts/modules/global-logo/index.vue
index 7cda1b2..a9d25b3 100644
--- a/src/layouts/modules/global-logo/index.vue
+++ b/src/layouts/modules/global-logo/index.vue
@@ -17,7 +17,7 @@ withDefaults(defineProps<Props>(), {
 
 <template>
   <RouterLink to="/" class="w-full flex-center nowrap-hidden">
-    <SystemLogo class="text-36px text-primary" />
+    <SystemLogo class="fill-primary text-36px" />
     <h2 v-show="showTitle" class="pl-8px text-27px text-primary font-bold transition duration-300 ease-in-out">
       {{ $t('system.title') }}
     </h2>
diff --git a/src/views/_builtin/login/index.vue b/src/views/_builtin/login/index.vue
index fe926fc..5a4ed1f 100644
--- a/src/views/_builtin/login/index.vue
+++ b/src/views/_builtin/login/index.vue
@@ -70,7 +70,7 @@ const href = (url: string) => {
     <NCard :bordered="false" class="relative z-4 w-auto rd-12px">
       <div class="w-400px lt-sm:w-300px">
         <header class="flex-y-center justify-between">
-          <SystemLogo class="text-64px text-primary lt-sm:text-48px" />
+          <SystemLogo class="fill-primary text-64px lt-sm:text-48px" />
           <h3 class="flex text-28px text-primary font-500 lt-sm:text-22px">
             {{ $t('system.title') }}
             <span class="mt-3px pl-12px text-16px color-#00000072 font-600">{{ version }}</span>

From f94990614c648bd21321a80b4a5fa71c882f3d82 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Tue, 18 Jun 2024 17:41:42 +0800
Subject: [PATCH 24/39] =?UTF-8?q?style(sj=5F1.1.0=5Fbeta1):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=90=9C=E7=B4=A2=E6=A1=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/search-form.vue                      | 7 ++++---
 src/plugins/loading.ts                                     | 2 +-
 src/views/workflow/batch/modules/workflow-batch-search.vue | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/common/search-form.vue b/src/components/common/search-form.vue
index d4ba9b4..81ddaa6 100644
--- a/src/components/common/search-form.vue
+++ b/src/components/common/search-form.vue
@@ -41,15 +41,16 @@ async function search() {
 }
 
 const btnSpan = computed(() => {
-  const keyNum = Object.keys(props.model).length - 2;
-  return props.btnSpan || `24 m:12 m:${(4 - (keyNum % 4)) * 6}`;
+  const keyNum = Object.keys(props.model).length - 1;
+
+  return props.btnSpan || keyNum % 4 !== 0 ? `24 m:12 m:${(4 - ((keyNum - 1) % 4)) * 6}` : '24';
 });
 </script>
 
 <template>
   <NCard :title="title" :bordered="false" size="small" class="card-wrapper">
     <NForm ref="formRef" :model="model" label-placement="left" :label-width="80" :show-feedback="appStore.isMobile">
-      <NGrid responsive="screen" item-responsive :y-gap="8">
+      <NGrid responsive="screen" item-responsive :y-gap="12">
         <slot></slot>
         <NFormItemGi :y-gap="8" :span="btnSpan" class="pr-24px lg:p-t-0 md:p-t-16px">
           <NSpace class="min-w-172px w-full" justify="end">
diff --git a/src/plugins/loading.ts b/src/plugins/loading.ts
index 731f896..4b6dfa7 100644
--- a/src/plugins/loading.ts
+++ b/src/plugins/loading.ts
@@ -18,7 +18,7 @@ export function setupLoading() {
     'right-0 bottom-0 animate-delay-1500'
   ];
 
-  const logoWithClass = systemLogo.replace('<svg', `<svg class="size-158px text-primary"`);
+  const logoWithClass = systemLogo.replace('<svg', `<svg class="size-158px fill-primary"`);
 
   const dot = loadingClasses
     .map(item => {
diff --git a/src/views/workflow/batch/modules/workflow-batch-search.vue b/src/views/workflow/batch/modules/workflow-batch-search.vue
index 0ce59d5..17ba4ec 100644
--- a/src/views/workflow/batch/modules/workflow-batch-search.vue
+++ b/src/views/workflow/batch/modules/workflow-batch-search.vue
@@ -38,7 +38,7 @@ groupNameUpdate('');
 </script>
 
 <template>
-  <SearchForm :model="model" @search="search" @reset="reset">
+  <SearchForm btn-span="24 s:24 m:9 l:12 xl:15" :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.workflowBatch.groupName')" path="groupName" class="pr-24px">
       <SelectGroup v-model:value="model.groupName" @update:value="groupNameUpdate" />
     </NFormItemGi>

From 3b21b8064bc85579a8084f358d4ec19e37665c6a Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Wed, 19 Jun 2024 17:30:02 +0800
Subject: [PATCH 25/39] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=B2=A1=E7=94=A8=E7=BB=84=E4=BB=B6=EF=BC=8Cclearable?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/block-strategy.vue    |  1 -
 src/components/common/executor-type.vue     |  1 -
 src/components/common/operation-reason.vue  | 29 ---------------------
 src/components/common/route-key.vue         |  7 +----
 src/components/common/select-group.vue      |  5 +++-
 src/components/common/select-scene.vue      |  7 +++--
 src/components/common/task-batch-status.vue | 27 ++++++++++---------
 src/components/common/task-type.vue         |  1 -
 src/components/common/trigger-type.vue      |  1 -
 9 files changed, 25 insertions(+), 54 deletions(-)
 delete mode 100644 src/components/common/operation-reason.vue

diff --git a/src/components/common/block-strategy.vue b/src/components/common/block-strategy.vue
index b7ebb3c..245b43c 100644
--- a/src/components/common/block-strategy.vue
+++ b/src/components/common/block-strategy.vue
@@ -25,7 +25,6 @@ const handleUpdate = (value: Api.Common.BlockStrategy) => {
     v-model:value="valueRef"
     :placeholder="$t('common.blockStrategy.form')"
     :options="translateOptions(blockStrategyRecordOptions)"
-    clearable
     @update:value="handleUpdate"
   />
 </template>
diff --git a/src/components/common/executor-type.vue b/src/components/common/executor-type.vue
index 104bcb3..a52a0d8 100644
--- a/src/components/common/executor-type.vue
+++ b/src/components/common/executor-type.vue
@@ -25,7 +25,6 @@ const handleUpdate = (value: Api.Common.TriggerType) => {
     v-model:value="valueRef"
     :placeholder="$t('common.executorType.form')"
     :options="translateOptions(executorTypeRecordOptions)"
-    clearable
     @update:value="handleUpdate"
   />
 </template>
diff --git a/src/components/common/operation-reason.vue b/src/components/common/operation-reason.vue
deleted file mode 100644
index 9f35817..0000000
--- a/src/components/common/operation-reason.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<script setup lang="ts">
-import { ref } from 'vue';
-import { $t } from '@/locales';
-import { translateOptions } from '@/utils/common';
-import { operationReasonOptions } from '@/constants/business';
-
-interface Emits {
-  (e: 'update:value', value: Api.Common.OperationReason): void;
-}
-const emit = defineEmits<Emits>();
-
-const handleUpdate = (operationReason: Api.Common.OperationReason) => {
-  emit('update:value', operationReason);
-};
-
-const operationReasonRef = ref<Api.Common.OperationReason>();
-</script>
-
-<template>
-  <NSelect
-    v-model:value="operationReasonRef"
-    :placeholder="$t('common.jobOperationReason.form')"
-    :options="translateOptions(operationReasonOptions)"
-    clearable
-    @update:value="handleUpdate"
-  />
-</template>
-
-<style scoped></style>
diff --git a/src/components/common/route-key.vue b/src/components/common/route-key.vue
index 7444475..1635ed6 100644
--- a/src/components/common/route-key.vue
+++ b/src/components/common/route-key.vue
@@ -36,12 +36,7 @@ const selectOptions = computed(() => {
 </script>
 
 <template>
-  <NSelect
-    v-model:value="modelValue"
-    :placeholder="$t('common.routeKey.routeForm')"
-    :options="selectOptions"
-    clearable
-  />
+  <NSelect v-model:value="modelValue" :placeholder="$t('common.routeKey.routeForm')" :options="selectOptions" />
 </template>
 
 <style scoped></style>
diff --git a/src/components/common/select-group.vue b/src/components/common/select-group.vue
index 07e751c..a6e2e30 100644
--- a/src/components/common/select-group.vue
+++ b/src/components/common/select-group.vue
@@ -10,10 +10,12 @@ defineOptions({
 
 interface Props {
   disabled?: boolean;
+  clearable?: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
-  disabled: false
+  disabled: false,
+  clearable: false
 });
 
 const model = defineModel<string | null>();
@@ -45,6 +47,7 @@ getGroupNameList();
     :placeholder="$t('page.retryTask.form.groupName')"
     :options="translateOptions2(groupNameList)"
     :disabled="props.disabled"
+    :clearable="props.clearable"
     filterable
     @update:value="handleUpdate"
   />
diff --git a/src/components/common/select-scene.vue b/src/components/common/select-scene.vue
index a2d4c8c..b98eea0 100644
--- a/src/components/common/select-scene.vue
+++ b/src/components/common/select-scene.vue
@@ -12,9 +12,12 @@ const emit = defineEmits<Emits>();
 
 interface Props {
   groupName: string | null;
+  clearable?: boolean;
 }
 
-const props = defineProps<Props>();
+const props = withDefaults(defineProps<Props>(), {
+  clearable: false
+});
 
 /** 场景列表 */
 const sceneNameList = ref<string[]>([]);
@@ -55,7 +58,7 @@ watch(
     v-model:value="sceneNameRef"
     :placeholder="$t('page.retryTask.form.sceneName')"
     :options="translateOptions2(sceneNameList)"
-    clearable
+    :clearable="props.clearable"
   />
 </template>
 
diff --git a/src/components/common/task-batch-status.vue b/src/components/common/task-batch-status.vue
index c9357b9..d25464c 100644
--- a/src/components/common/task-batch-status.vue
+++ b/src/components/common/task-batch-status.vue
@@ -1,28 +1,31 @@
 <script setup lang="ts">
-import { ref } from 'vue';
 import { $t } from '@/locales';
 import { translateOptions } from '@/utils/common';
 import { taskBatchStatusRecordOptions } from '@/constants/business';
 
-interface Emits {
-  (e: 'update:value', value: Api.Common.TaskBatchStatus): void;
+defineOptions({
+  name: 'TaskBatchStatus'
+});
+
+interface Props {
+  disabled?: boolean;
+  clearable?: boolean;
 }
-const emit = defineEmits<Emits>();
 
-const taskBatchStatusRef = ref<Api.Common.TaskBatchStatus>();
-
-const handleUpdate = (taskBatchStatus: Api.Common.TaskBatchStatus) => {
-  emit('update:value', taskBatchStatus);
-};
+const props = withDefaults(defineProps<Props>(), {
+  disabled: false,
+  clearable: false
+});
+const modelValue = defineModel<Api.Common.TaskBatchStatus>();
 </script>
 
 <template>
   <NSelect
-    v-model:value="taskBatchStatusRef"
+    v-model:value="modelValue"
     :placeholder="$t('common.taskBatchStatus.form')"
     :options="translateOptions(taskBatchStatusRecordOptions)"
-    clearable
-    @update:value="handleUpdate"
+    :disabled="props.disabled"
+    :clearable="props.clearable"
   />
 </template>
 
diff --git a/src/components/common/task-type.vue b/src/components/common/task-type.vue
index 74dbf49..0efffe4 100644
--- a/src/components/common/task-type.vue
+++ b/src/components/common/task-type.vue
@@ -25,7 +25,6 @@ const handleUpdate = (value: Api.Common.BlockStrategy) => {
     v-model:value="valueRef"
     :placeholder="$t('common.routeKey.routeForm')"
     :options="translateOptions(taskTypeRecordRecordOptions)"
-    clearable
     @update:value="handleUpdate"
   />
 </template>
diff --git a/src/components/common/trigger-type.vue b/src/components/common/trigger-type.vue
index 614e9b5..5fbf414 100644
--- a/src/components/common/trigger-type.vue
+++ b/src/components/common/trigger-type.vue
@@ -25,7 +25,6 @@ const handleUpdate = (value: Api.Common.TriggerType) => {
     v-model:value="valueRef"
     :placeholder="$t('common.triggerType.form')"
     :options="translateOptions(triggerTypeOptions)"
-    clearable
     @update:value="handleUpdate"
   />
 </template>

From 398466a852c1ca646a7fd7273db69b02260c0d62 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Wed, 19 Jun 2024 17:32:29 +0800
Subject: [PATCH 26/39] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E6=90=9C=E7=B4=A2=E6=A1=86=E5=85=81=E8=AE=B8=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/group/modules/group-search.vue        |  2 +-
 .../job/batch/modules/job-batch-search.vue      |  6 +++---
 src/views/job/task/modules/job-task-search.vue  |  5 +++--
 .../namespace/modules/namespace-search.vue      |  2 +-
 .../modules/notify-recipient-search.vue         |  6 +++++-
 .../modules/notify-config-operate-drawer.vue    | 15 +++++++++------
 .../scene/modules/notify-config-search.vue      | 17 ++++++++++++-----
 src/views/pods/modules/pods-search.vue          |  2 +-
 .../dead-letter/modules/dead-letter-search.vue  |  4 ++--
 .../retry/log/modules/retry-log-search.vue      | 10 +++++-----
 src/views/retry/scene/modules/scene-search.vue  |  4 ++--
 .../retry/task/modules/retry-task-search.vue    | 11 ++++++-----
 .../manager/modules/user-manager-search.vue     |  2 +-
 .../batch/modules/workflow-batch-search.vue     |  4 ++--
 .../workflow/task/modules/workflow-search.vue   |  5 +++--
 15 files changed, 56 insertions(+), 39 deletions(-)

diff --git a/src/views/group/modules/group-search.vue b/src/views/group/modules/group-search.vue
index 66406b0..394e659 100644
--- a/src/views/group/modules/group-search.vue
+++ b/src/views/group/modules/group-search.vue
@@ -28,7 +28,7 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.groupConfig.groupName')" path="groupName" class="pr-24px">
-      <NInput v-model:value="model.groupName" :placeholder="$t('page.groupConfig.form.groupName')" />
+      <NInput v-model:value="model.groupName" :placeholder="$t('page.groupConfig.form.groupName')" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.groupConfig.groupStatus')" path="groupStatus" class="pr-24px">
       <NSelect
diff --git a/src/views/job/batch/modules/job-batch-search.vue b/src/views/job/batch/modules/job-batch-search.vue
index 7d10a61..557c5d6 100644
--- a/src/views/job/batch/modules/job-batch-search.vue
+++ b/src/views/job/batch/modules/job-batch-search.vue
@@ -28,13 +28,13 @@ function search() {
 <template>
   <SearchForm btn-span="24 s:24 m:9 l:12 xl:15" :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobBatch.groupName')" path="groupName" class="pr-24px">
-      <SelectGroup v-model:value="model.groupName" />
+      <SelectGroup v-model:value="model.groupName" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobBatch.jobName')" path="jobName" class="pr-24px">
-      <NInput v-model:value="model.jobName" :placeholder="$t('page.jobBatch.form.jobName')" />
+      <NInput v-model:value="model.jobName" :placeholder="$t('page.jobBatch.form.jobName')" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobBatch.taskBatchStatus')" path="taskBatchStatus" class="pr-24px">
-      <TaskBatchStatus v-model:value="model.taskBatchStatus" />
+      <TaskBatchStatus v-model:value="model.taskBatchStatus" clearable />
     </NFormItemGi>
     <NFormItemGi
       span="24 s:24 m:15 l:12 xl:9"
diff --git a/src/views/job/task/modules/job-task-search.vue b/src/views/job/task/modules/job-task-search.vue
index 8fd52f4..2411c56 100644
--- a/src/views/job/task/modules/job-task-search.vue
+++ b/src/views/job/task/modules/job-task-search.vue
@@ -29,16 +29,17 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobTask.groupName')" path="groupName" class="pr-24px">
-      <SelectGroup v-model:value="model.groupName" />
+      <SelectGroup v-model:value="model.groupName" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobTask.jobName')" path="jobName" class="pr-24px">
-      <NInput v-model:value="model.jobName" :placeholder="$t('page.jobTask.form.jobName')" />
+      <NInput v-model:value="model.jobName" :placeholder="$t('page.jobTask.form.jobName')" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobTask.jobStatus')" path="jobStatus" class="pr-24px">
       <NSelect
         v-model:value="model.jobStatus"
         :placeholder="$t('page.jobTask.form.jobStatus')"
         :options="translateOptions(enableStatusNumberOptions)"
+        clearable
       />
     </NFormItemGi>
   </SearchForm>
diff --git a/src/views/namespace/modules/namespace-search.vue b/src/views/namespace/modules/namespace-search.vue
index 8ebd551..7a314a5 100644
--- a/src/views/namespace/modules/namespace-search.vue
+++ b/src/views/namespace/modules/namespace-search.vue
@@ -26,7 +26,7 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.namespace.keyword')" path="keyword" class="pr-24px">
-      <NInput v-model:value="model.keyword" :placeholder="$t('page.namespace.form.keyword')" />
+      <NInput v-model:value="model.keyword" :placeholder="$t('page.namespace.form.keyword')" clearable />
     </NFormItemGi>
   </SearchForm>
 </template>
diff --git a/src/views/notify/recipient/modules/notify-recipient-search.vue b/src/views/notify/recipient/modules/notify-recipient-search.vue
index 08847c2..1920aea 100644
--- a/src/views/notify/recipient/modules/notify-recipient-search.vue
+++ b/src/views/notify/recipient/modules/notify-recipient-search.vue
@@ -35,7 +35,11 @@ function search() {
       path="recipientName"
       class="pr-24px"
     >
-      <NInput v-model:value="model.recipientName" :placeholder="$t('page.notifyRecipient.form.recipientName')" />
+      <NInput
+        v-model:value="model.recipientName"
+        :placeholder="$t('page.notifyRecipient.form.recipientName')"
+        clearable
+      />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.notifyRecipient.notifyType')" path="notifyType" class="pr-24px">
       <NSelect
diff --git a/src/views/notify/scene/modules/notify-config-operate-drawer.vue b/src/views/notify/scene/modules/notify-config-operate-drawer.vue
index 87e33db..f6dab5b 100644
--- a/src/views/notify/scene/modules/notify-config-operate-drawer.vue
+++ b/src/views/notify/scene/modules/notify-config-operate-drawer.vue
@@ -115,12 +115,20 @@ function createDefaultModel(): Model {
 
 type RuleKey = Extract<
   keyof Model,
-  'groupName' | 'businessId' | 'recipientIds' | 'notifyStatus' | 'notifyScene' | 'rateLimiterStatus' | 'notifyThreshold'
+  | 'groupName'
+  | 'businessId'
+  | 'systemTaskType'
+  | 'recipientIds'
+  | 'notifyStatus'
+  | 'notifyScene'
+  | 'rateLimiterStatus'
+  | 'notifyThreshold'
 >;
 
 const rules: Record<RuleKey, App.Global.FormRule> = {
   groupName: defaultRequiredRule,
   businessId: defaultRequiredRule,
+  systemTaskType: defaultRequiredRule,
   notifyStatus: defaultRequiredRule,
   notifyScene: defaultRequiredRule,
   recipientIds: defaultRequiredRule,
@@ -277,7 +285,6 @@ watch(visible, () => {
           v-model:value="model.systemTaskType"
           :placeholder="$t('page.notifyConfig.form.systemTaskType')"
           :options="translateOptions(systemTaskTypeOptions)"
-          clearable
           @update:value="systemTaskTypeChange"
         />
       </NFormItem>
@@ -288,7 +295,6 @@ watch(visible, () => {
           :options="retryScenes"
           label-field="sceneName"
           value-field="sceneName"
-          clearable
         />
       </NFormItem>
       <NFormItem v-if="model.systemTaskType === 3" :label="$t('page.notifyConfig.job')" path="businessId">
@@ -298,7 +304,6 @@ watch(visible, () => {
           :options="jobs"
           label-field="jobName"
           value-field="id"
-          clearable
         />
       </NFormItem>
       <NFormItem v-if="model.systemTaskType === 4" :label="$t('page.notifyConfig.workflow')" path="businessId">
@@ -308,7 +313,6 @@ watch(visible, () => {
           :options="workflows"
           label-field="workflowName"
           value-field="id"
-          clearable
         />
       </NFormItem>
       <NFormItem :label="$t('page.notifyConfig.notifyScene')" path="notifyScene">
@@ -316,7 +320,6 @@ watch(visible, () => {
           v-model:value="model.notifyScene"
           :placeholder="$t('page.notifyConfig.form.notifyScene')"
           :options="notifySceneOptions"
-          clearable
           @update:value="retrySceneChange"
         />
       </NFormItem>
diff --git a/src/views/notify/scene/modules/notify-config-search.vue b/src/views/notify/scene/modules/notify-config-search.vue
index fbb3ca9..baf6ceb 100644
--- a/src/views/notify/scene/modules/notify-config-search.vue
+++ b/src/views/notify/scene/modules/notify-config-search.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
 import { $t } from '@/locales';
+import { translateOptions } from '@/utils/common';
+import { enableStatusNumberOptions } from '@/constants/business';
 
 defineOptions({
   name: 'NotifyConfigSearch'
@@ -26,13 +28,18 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.notifyConfig.groupName')" path="groupName" class="pr-24px">
-      <NSelect v-model:value="model.groupName" :placeholder="$t('page.notifyConfig.groupName')" clearable />
-    </NFormItemGi>
-    <NFormItemGi span="24 s:12 m:6" :label="$t('page.notifyConfig.notifyStatus')" path="notifyStatus" class="pr-24px">
-      <NSelect v-model:value="model.notifyStatus" :placeholder="$t('page.notifyConfig.notifyStatus')" clearable />
+      <SelectGroup v-model:value="model.groupName" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.notifyConfig.notifyScene')" path="notifyScene" class="pr-24px">
-      <NSelect v-model:value="model.notifyScene" :placeholder="$t('page.notifyConfig.notifyScene')" clearable />
+      <SelectScene v-model:value="model.notifyScene" :group-name="model.groupName as string" clearable />
+    </NFormItemGi>
+    <NFormItemGi span="24 s:12 m:6" :label="$t('page.notifyConfig.notifyStatus')" path="notifyStatus" class="pr-24px">
+      <NSelect
+        v-model:value="model.notifyStatus"
+        :placeholder="$t('page.notifyConfig.notifyStatus')"
+        :options="translateOptions(enableStatusNumberOptions)"
+        clearable
+      />
     </NFormItemGi>
   </SearchForm>
 </template>
diff --git a/src/views/pods/modules/pods-search.vue b/src/views/pods/modules/pods-search.vue
index 53b1814..33bc8f9 100644
--- a/src/views/pods/modules/pods-search.vue
+++ b/src/views/pods/modules/pods-search.vue
@@ -27,7 +27,7 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.pods.groupName')" path="groupName" class="pr-24px">
-      <SelectGroup v-model:value="model.groupName" :placeholder="$t('page.pods.form.groupName')" />
+      <SelectGroup v-model:value="model.groupName" :placeholder="$t('page.pods.form.groupName')" clearable />
     </NFormItemGi>
   </SearchForm>
 </template>
diff --git a/src/views/retry/dead-letter/modules/dead-letter-search.vue b/src/views/retry/dead-letter/modules/dead-letter-search.vue
index c4ba3ca..a14b005 100644
--- a/src/views/retry/dead-letter/modules/dead-letter-search.vue
+++ b/src/views/retry/dead-letter/modules/dead-letter-search.vue
@@ -28,10 +28,10 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.groupName')" path="groupName" class="pr-24px">
-      <SelectGroup v-model:value="model.groupName" />
+      <SelectGroup v-model:value="model.groupName" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.sceneName')" path="sceneName" class="pr-24px">
-      <SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" />
+      <SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" clearable />
     </NFormItemGi>
     <NFormItemGi
       span="24 s:24 m:15 l:12 xl:9"
diff --git a/src/views/retry/log/modules/retry-log-search.vue b/src/views/retry/log/modules/retry-log-search.vue
index 469141b..083aa05 100644
--- a/src/views/retry/log/modules/retry-log-search.vue
+++ b/src/views/retry/log/modules/retry-log-search.vue
@@ -30,19 +30,19 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.groupName')" path="groupName" class="pr-24px">
-      <SelectGroup v-model:value="model.groupName" />
+      <SelectGroup v-model:value="model.groupName" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.sceneName')" path="sceneName" class="pr-24px">
-      <SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" />
+      <SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.UniqueId')" path="UniqueId" class="pr-24px">
-      <NInput v-model:value="model.uniqueId" :placeholder="$t('page.retryLog.form.UniqueId')" />
+      <NInput v-model:value="model.uniqueId" :placeholder="$t('page.retryLog.form.UniqueId')" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.idempotentId')" path="idempotentId" class="pr-24px">
-      <NInput v-model:value="model.idempotentId" :placeholder="$t('page.retryLog.form.idempotentId')" />
+      <NInput v-model:value="model.idempotentId" :placeholder="$t('page.retryLog.form.idempotentId')" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.bizNo')" path="bizNo" class="pr-24px">
-      <NInput v-model:value="model.bizNo" :placeholder="$t('page.retryLog.form.bizNo')" />
+      <NInput v-model:value="model.bizNo" :placeholder="$t('page.retryLog.form.bizNo')" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.retryStatus')" path="taskBatchStatus" class="pr-24px">
       <NSelect
diff --git a/src/views/retry/scene/modules/scene-search.vue b/src/views/retry/scene/modules/scene-search.vue
index f553dc7..8cc9b73 100644
--- a/src/views/retry/scene/modules/scene-search.vue
+++ b/src/views/retry/scene/modules/scene-search.vue
@@ -29,10 +29,10 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryScene.groupName')" path="groupName" class="pr-24px">
-      <SelectGroup v-model:value="model.groupName" />
+      <SelectGroup v-model:value="model.groupName" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryScene.sceneName')" path="sceneName" class="pr-24px">
-      <NInput v-model:value="model.sceneName" :placeholder="$t('page.retryScene.form.sceneName')" />
+      <SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryScene.sceneStatus')" path="sceneStatus" class="pr-24px">
       <NSelect
diff --git a/src/views/retry/task/modules/retry-task-search.vue b/src/views/retry/task/modules/retry-task-search.vue
index f0078a8..39f133d 100644
--- a/src/views/retry/task/modules/retry-task-search.vue
+++ b/src/views/retry/task/modules/retry-task-search.vue
@@ -30,25 +30,26 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryTask.groupName')" path="groupName" class="pr-24px">
-      <SelectGroup v-model:value="model.groupName" />
+      <SelectGroup v-model:value="model.groupName" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryTask.sceneName')" path="sceneName" class="pr-24px">
-      <SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" />
+      <SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryTask.uniqueId')" path="uniqueId" class="pr-24px">
-      <NInput v-model:value="model.uniqueId" :placeholder="$t('page.retryTask.form.uniqueId')" />
+      <NInput v-model:value="model.uniqueId" :placeholder="$t('page.retryTask.form.uniqueId')" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryTask.idempotentId')" path="idempotentId" class="pr-24px">
-      <NInput v-model:value="model.idempotentId" :placeholder="$t('page.retryTask.form.idempotentId')" />
+      <NInput v-model:value="model.idempotentId" :placeholder="$t('page.retryTask.form.idempotentId')" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryTask.bizNo')" path="bizNo" class="pr-24px">
-      <NInput v-model:value="model.bizNo" :placeholder="$t('page.retryTask.form.bizNo')" />
+      <NInput v-model:value="model.bizNo" :placeholder="$t('page.retryTask.form.bizNo')" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryTask.retryStatus')" path="retryStatus" class="pr-24px">
       <NSelect
         v-model:value="model.retryStatus"
         :placeholder="$t('page.retryTask.form.retryStatus')"
         :options="translateOptions(retryTaskStatusTypeOptions)"
+        clearable
       />
     </NFormItemGi>
   </SearchForm>
diff --git a/src/views/user/manager/modules/user-manager-search.vue b/src/views/user/manager/modules/user-manager-search.vue
index 44005c9..5aaef6e 100644
--- a/src/views/user/manager/modules/user-manager-search.vue
+++ b/src/views/user/manager/modules/user-manager-search.vue
@@ -26,7 +26,7 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.userManager.username')" path="username" class="pr-24px">
-      <NInput v-model:value="model.username" :placeholder="$t('page.userManager.form.username')" />
+      <NInput v-model:value="model.username" :placeholder="$t('page.userManager.form.username')" clearable />
     </NFormItemGi>
   </SearchForm>
 </template>
diff --git a/src/views/workflow/batch/modules/workflow-batch-search.vue b/src/views/workflow/batch/modules/workflow-batch-search.vue
index 17ba4ec..b9b8ea2 100644
--- a/src/views/workflow/batch/modules/workflow-batch-search.vue
+++ b/src/views/workflow/batch/modules/workflow-batch-search.vue
@@ -40,7 +40,7 @@ groupNameUpdate('');
 <template>
   <SearchForm btn-span="24 s:24 m:9 l:12 xl:15" :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.workflowBatch.groupName')" path="groupName" class="pr-24px">
-      <SelectGroup v-model:value="model.groupName" @update:value="groupNameUpdate" />
+      <SelectGroup v-model:value="model.groupName" clearable @update:value="groupNameUpdate" />
     </NFormItemGi>
     <NFormItemGi
       span="24 s:12 m:6"
@@ -65,7 +65,7 @@ groupNameUpdate('');
       path="taskBatchStatus"
       class="pr-24px"
     >
-      <TaskBatchStatus v-model:value="model.taskBatchStatus" />
+      <TaskBatchStatus v-model:value="model.taskBatchStatus" clearable />
     </NFormItemGi>
     <NFormItemGi
       span="24 s:24 m:15 l:12 xl:9"
diff --git a/src/views/workflow/task/modules/workflow-search.vue b/src/views/workflow/task/modules/workflow-search.vue
index 622755b..aec3b40 100644
--- a/src/views/workflow/task/modules/workflow-search.vue
+++ b/src/views/workflow/task/modules/workflow-search.vue
@@ -29,7 +29,7 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.workflow.groupName')" path="groupName" class="pr-24px">
-      <SelectGroup v-model:value="model.groupName" />
+      <SelectGroup v-model:value="model.groupName" clearable />
     </NFormItemGi>
     <NFormItemGi
       span="24 s:12 m:6"
@@ -38,13 +38,14 @@ function search() {
       class="pr-24px"
       :label-width="100"
     >
-      <NInput v-model:value="model.workflowName" :placeholder="$t('page.workflow.form.workflowName')" />
+      <NInput v-model:value="model.workflowName" :placeholder="$t('page.workflow.form.workflowName')" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.workflow.workflowStatus')" path="workflowStatus" class="pr-24px">
       <NSelect
         v-model:value="model.workflowStatus"
         :placeholder="$t('page.workflow.form.workflowStatus')"
         :options="translateOptions(enableStatusNumberOptions)"
+        clearable
       />
     </NFormItemGi>
   </SearchForm>

From 47f4a3b30a3bef3c871c5642a546fd77b64f4e7a Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Wed, 19 Jun 2024 17:34:00 +0800
Subject: [PATCH 27/39] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=90=9C=E7=B4=A2=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=AE=9A=E4=B9=89=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/service/api/workflow.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/service/api/workflow.ts b/src/service/api/workflow.ts
index 087fe26..4123686 100644
--- a/src/service/api/workflow.ts
+++ b/src/service/api/workflow.ts
@@ -18,7 +18,7 @@ export function fetchTriggerWorkflow(id: string) {
 }
 
 /** get namespace list */
-export function fetchGetWorkflowNameList(params?: Api.WorkflowBatch.WorkflowBatchSearchParams) {
+export function fetchGetWorkflowNameList(params?: Api.Workflow.WorkflowSearchParams) {
   return request<Api.Workflow.Workflow[]>({
     url: '/workflow/workflow-name/list',
     method: 'get',

From 8744c00bcb5b327d04e3b17ad6a7a5e82781efaf Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Fri, 21 Jun 2024 23:01:44 +0800
Subject: [PATCH 28/39] =?UTF-8?q?Revert=20"feat(sj=5F1.1.0-beta1):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=AE=9A=E4=B9=89=E9=94=99=E8=AF=AF"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 47f4a3b30a3bef3c871c5642a546fd77b64f4e7a.
---
 src/service/api/workflow.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/service/api/workflow.ts b/src/service/api/workflow.ts
index 4123686..087fe26 100644
--- a/src/service/api/workflow.ts
+++ b/src/service/api/workflow.ts
@@ -18,7 +18,7 @@ export function fetchTriggerWorkflow(id: string) {
 }
 
 /** get namespace list */
-export function fetchGetWorkflowNameList(params?: Api.Workflow.WorkflowSearchParams) {
+export function fetchGetWorkflowNameList(params?: Api.WorkflowBatch.WorkflowBatchSearchParams) {
   return request<Api.Workflow.Workflow[]>({
     url: '/workflow/workflow-name/list',
     method: 'get',

From 03824ba28e97af42ce1b4f331d6cf50b7f3b43bd Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Sat, 22 Jun 2024 00:01:32 +0800
Subject: [PATCH 29/39] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=9F=A5=E8=AF=A2=E4=BD=93?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                          |  2 +-
 src/service/api/workflow.ts                   |  2 +-
 src/typings/api.d.ts                          | 12 ++++++
 .../batch/modules/workflow-batch-search.vue   | 39 +++++++++++++++++--
 4 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/.env b/.env
index 8aaf51f..ac7d66d 100644
--- a/.env
+++ b/.env
@@ -2,7 +2,7 @@ VITE_APP_TITLE=Snail Job
 
 VITE_APP_DESC=A flexible, reliable, and fast platform for distributed task retry and distributed task scheduling.
 
-VITE_APP_VERSION=1.0.0
+VITE_APP_VERSION=1.1.0-beta1
 
 VITE_APP_DEFAULT_TOKEN=SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj
 
diff --git a/src/service/api/workflow.ts b/src/service/api/workflow.ts
index 087fe26..0dbcb7e 100644
--- a/src/service/api/workflow.ts
+++ b/src/service/api/workflow.ts
@@ -18,7 +18,7 @@ export function fetchTriggerWorkflow(id: string) {
 }
 
 /** get namespace list */
-export function fetchGetWorkflowNameList(params?: Api.WorkflowBatch.WorkflowBatchSearchParams) {
+export function fetchGetWorkflowNameList(params?: Api.Workflow.WorkflowNameSearchParams) {
   return request<Api.Workflow.Workflow[]>({
     url: '/workflow/workflow-name/list',
     method: 'get',
diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index 85b3786..233a420 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -898,6 +898,18 @@ declare namespace Api {
       Pick<Api.Workflow.Workflow, 'workflowName' | 'groupName' | 'workflowStatus'> & CommonSearchParams
     >;
 
+    /** workflow name search params */
+    type WorkflowNameSearchParams = CommonType.RecordNullable<
+      Pick<
+        Common.CommonRecord<{
+          keywords: string;
+          workflowId: number;
+          groupName: string;
+        }>,
+        'keywords' | 'workflowId' | 'groupName'
+      >
+    >;
+
     type ExportWorkflow = Common.CommonRecord<{
       workflowIds: String[];
     }> &
diff --git a/src/views/workflow/batch/modules/workflow-batch-search.vue b/src/views/workflow/batch/modules/workflow-batch-search.vue
index b9b8ea2..b371962 100644
--- a/src/views/workflow/batch/modules/workflow-batch-search.vue
+++ b/src/views/workflow/batch/modules/workflow-batch-search.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref } from 'vue';
+import { ref, watch } from 'vue';
 import { $t } from '@/locales';
 import SelectGroup from '@/components/common/select-group.vue';
 import TaskBatchStatus from '@/components/common/task-batch-status.vue';
@@ -14,6 +14,8 @@ interface Emits {
   (e: 'reset'): void;
   (e: 'search'): void;
 }
+const keywords = ref<string>('');
+const noSearchFlag = ref(false);
 
 const emit = defineEmits<Emits>();
 /** 组列表 */
@@ -34,7 +36,34 @@ async function groupNameUpdate(groupName: string) {
   workflowList.value = res.data as Api.Workflow.Workflow[];
 }
 
+async function keywordsUpdate() {
+  const res = await fetchGetWorkflowNameList({ keywords: keywords.value });
+  workflowList.value = res.data as Api.Workflow.Workflow[];
+}
+
+function handleSelect(value: number) {
+  model.value.workflowId = value;
+}
+
+watch(
+  () => keywords.value,
+  (value: string) => {
+    if (value.length !== 0) {
+      keywordsUpdate();
+    } else {
+      noSearchFlag.value = false;
+    }
+  }
+);
+
 groupNameUpdate('');
+
+function translateOptions(options: Api.Workflow.Workflow[]) {
+  return options.map(option => ({
+    value: option.id,
+    label: option.workflowName
+  }));
+}
 </script>
 
 <template>
@@ -49,14 +78,16 @@ groupNameUpdate('');
       path="workflowName"
       class="pr-24px"
     >
-      <NSelect
-        v-model:value="model.workflowId"
+      <NAutoComplete
+        v-model:value="keywords"
         :placeholder="$t('page.workflowBatch.form.workflowName')"
         value-field="id"
         label-field="workflowName"
-        :options="workflowList"
+        :options="translateOptions(workflowList)"
+        :empty-visible="noSearchFlag"
         clearable
         filterable
+        @select="handleSelect"
       />
     </NFormItemGi>
     <NFormItemGi

From 824ef290721978fdb570db71938dd7d88208661c Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sat, 22 Jun 2024 09:29:47 +0800
Subject: [PATCH 30/39] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E5=B0=81=E8=A3=85DatetimeRange=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=B9=B6=E5=A4=8D=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/datetime-range.vue      | 61 +++++++++++++++++++
 src/locales/langs/en-us.ts                    |  5 +-
 src/locales/langs/zh-cn.ts                    |  5 +-
 src/typings/app.d.ts                          |  3 +
 src/views/home/modules/task-tab.vue           | 15 ++---
 .../job/batch/modules/job-batch-search.vue    | 10 +--
 .../modules/dead-letter-search.vue            | 10 +--
 .../retry/log/modules/retry-log-search.vue    | 10 +--
 .../batch/modules/workflow-batch-search.vue   | 10 +--
 9 files changed, 86 insertions(+), 43 deletions(-)
 create mode 100644 src/components/common/datetime-range.vue

diff --git a/src/components/common/datetime-range.vue b/src/components/common/datetime-range.vue
new file mode 100644
index 0000000..706c2a9
--- /dev/null
+++ b/src/components/common/datetime-range.vue
@@ -0,0 +1,61 @@
+<script setup lang="ts">
+import { ref } from 'vue';
+import dayjs from 'dayjs';
+import { $t } from '@/locales';
+
+defineOptions({
+  name: 'DatetimeRange'
+});
+
+const DATETIME_FORMAT_ISO8601 = "yyyy-MM-dd'T'HH:mm:ss";
+
+/** 创建 `过去n个自然月` 时间区间 */
+const monthRange = (months: number) =>
+  [
+    dayjs()
+      .subtract(months - 1, 'month')
+      .startOf('month')
+      .valueOf(),
+    dayjs().endOf('day').valueOf()
+  ] as const;
+
+const modelValue = defineModel<[string, string] | null>('value');
+
+interface Props {
+  noDefault?: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  noDefault: false
+});
+
+const onUpdateFormattedValue = (formattedValue: [string, string] | null) => {
+  modelValue.value = formattedValue;
+};
+
+const timestampValue = ref<[number, number] | null>(props.noDefault ? null : [...monthRange(1)]);
+
+const createShortcuts = () => {
+  const shortcuts: any = {};
+  shortcuts[$t('common.currentMonth')] = monthRange(1);
+  shortcuts[$t('common.lastMonth')] = monthRange(2);
+  shortcuts[$t('common.lastTwoMonth')] = monthRange(3);
+  return shortcuts;
+};
+</script>
+
+<template>
+  <NDatePicker
+    v-model:value="timestampValue"
+    type="datetimerange"
+    :value-format="DATETIME_FORMAT_ISO8601"
+    class="w-400px"
+    clearable
+    :default-time="['00:00:00', '23:56:56']"
+    :shortcuts="createShortcuts()"
+    :actions="['clear', 'confirm']"
+    @update:formatted-value="onUpdateFormattedValue"
+  />
+</template>
+
+<style scoped lang="scss"></style>
diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index 8530c8b..da4fd54 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -185,7 +185,10 @@ const local: App.I18n.Schema = {
       }
     },
     updateDt: 'Updated Time',
-    createDt: 'Created Time'
+    createDt: 'Created Time',
+    currentMonth: 'Current Month',
+    lastMonth: 'Last Month',
+    lastTwoMonth: 'Last 2 Month'
   },
   request: {
     logout: 'Logout user after request failed',
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index 58e9b78..f3bc9fc 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -185,7 +185,10 @@ const local: App.I18n.Schema = {
       }
     },
     updateDt: '更新时间',
-    createDt: '创建时间'
+    createDt: '创建时间',
+    currentMonth: '当月',
+    lastMonth: '最近一月',
+    lastTwoMonth: '最近两月'
   },
   request: {
     logout: '请求失败后登出用户',
diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts
index 045cd82..999a07f 100644
--- a/src/typings/app.d.ts
+++ b/src/typings/app.d.ts
@@ -436,6 +436,9 @@ declare namespace App {
         };
         updateDt: string;
         createDt: string;
+        currentMonth: string;
+        lastMonth: string;
+        lastTwoMonth: string;
       };
       request: {
         logout: string;
diff --git a/src/views/home/modules/task-tab.vue b/src/views/home/modules/task-tab.vue
index 0f8d5cf..60f6759 100644
--- a/src/views/home/modules/task-tab.vue
+++ b/src/views/home/modules/task-tab.vue
@@ -4,6 +4,7 @@ import type { DataTableColumns } from 'naive-ui';
 import { $t } from '@/locales';
 import { useAppStore } from '@/store/modules/app';
 import { fetchAllGroupName, fetchJobLine, fetchRetryLine } from '@/service/api';
+import DatetimeRange from '@/components/common/datetime-range.vue';
 import TaskLineChart from './task-line-chart.vue';
 import TaskPieChart from './task-pie-chart.vue';
 
@@ -64,7 +65,7 @@ const onUpdateTab = (value: string) => {
   }
 };
 
-const onUpdateDate = (value: [string, string]) => {
+const onUpdateDate = (value: [string, string] | null) => {
   if (value) {
     tabParams.value.type = 'OTHERS';
   }
@@ -203,14 +204,10 @@ getGroupNames();
         <NRadioButton value="MONTH" :label="$t('page.home.retryTab.params.month')" />
         <NRadioButton value="YEAR" :label="$t('page.home.retryTab.params.year')" />
       </NRadioGroup>
-      <NDatePicker
-        v-model:formatted-value="tabParams.datetimeRange"
-        type="datetimerange"
-        value-format="yyyy-MM-dd'T'HH:mm:ss"
-        class="w-400px"
-        clearable
-        :default-time="['00:00:00', '23:56:56']"
-        @update:formatted-value="onUpdateDate"
+      <DatetimeRange
+        v-model:value="tabParams.datetimeRange"
+        no-default
+        @update:value="onUpdateDate"
         @clear="onClearDate"
       />
       <NSelect v-model:value="tabParams.groupName" :options="groupOptions" class="w-200px lg:w-150px md:w-170px" />
diff --git a/src/views/job/batch/modules/job-batch-search.vue b/src/views/job/batch/modules/job-batch-search.vue
index 557c5d6..57b8856 100644
--- a/src/views/job/batch/modules/job-batch-search.vue
+++ b/src/views/job/batch/modules/job-batch-search.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import SelectGroup from '@/components/common/select-group.vue';
 import TaskBatchStatus from '@/components/common/task-batch-status.vue';
+import DatetimeRange from '@/components/common/datetime-range.vue';
 import { $t } from '@/locales';
 
 defineOptions({
@@ -42,14 +43,7 @@ function search() {
       path="datetimeRange"
       class="pr-24px"
     >
-      <NDatePicker
-        v-model:formatted-value="model.datetimeRange"
-        class="w-full"
-        type="datetimerange"
-        value-format="yyyy-MM-dd'T'HH:mm:ss"
-        :default-time="['00:00:00', '23:56:56']"
-        clearable
-      />
+      <DatetimeRange v-model:value="model.datetimeRange!" />
     </NFormItemGi>
   </SearchForm>
 </template>
diff --git a/src/views/retry/dead-letter/modules/dead-letter-search.vue b/src/views/retry/dead-letter/modules/dead-letter-search.vue
index a14b005..ace5d12 100644
--- a/src/views/retry/dead-letter/modules/dead-letter-search.vue
+++ b/src/views/retry/dead-letter/modules/dead-letter-search.vue
@@ -2,6 +2,7 @@
 import { $t } from '@/locales';
 import SelectGroup from '@/components/common/select-group.vue';
 import SelectScene from '@/components/common/select-scene.vue';
+import DatetimeRange from '@/components/common/datetime-range.vue';
 
 defineOptions({
   name: 'RetryDeadLetterSearch'
@@ -39,14 +40,7 @@ function search() {
       path="datetimeRange"
       class="pr-24px"
     >
-      <NDatePicker
-        v-model:formatted-value="model.datetimeRange"
-        class="w-full"
-        type="datetimerange"
-        value-format="yyyy-MM-dd'T'HH:mm:ss"
-        :default-time="['00:00:00', '23:56:56']"
-        clearable
-      />
+      <DatetimeRange v-model:value="model.datetimeRange!" />
     </NFormItemGi>
   </SearchForm>
 </template>
diff --git a/src/views/retry/log/modules/retry-log-search.vue b/src/views/retry/log/modules/retry-log-search.vue
index 083aa05..d344398 100644
--- a/src/views/retry/log/modules/retry-log-search.vue
+++ b/src/views/retry/log/modules/retry-log-search.vue
@@ -4,6 +4,7 @@ import { translateOptions } from '@/utils/common';
 import { retryTaskStatusTypeOptions } from '@/constants/business';
 import SelectGroup from '@/components/common/select-group.vue';
 import SelectScene from '@/components/common/select-scene.vue';
+import DatetimeRange from '@/components/common/datetime-range.vue';
 
 defineOptions({
   name: 'RetryLogSearch'
@@ -58,14 +59,7 @@ function search() {
       path="datetimeRange"
       class="pr-24px"
     >
-      <NDatePicker
-        v-model:formatted-value="model.datetimeRange"
-        class="w-full"
-        type="datetimerange"
-        value-format="yyyy-MM-dd'T'HH:mm:ss"
-        :default-time="['00:00:00', '23:56:56']"
-        clearable
-      />
+      <DatetimeRange v-model:value="model.datetimeRange!" />
     </NFormItemGi>
   </SearchForm>
 </template>
diff --git a/src/views/workflow/batch/modules/workflow-batch-search.vue b/src/views/workflow/batch/modules/workflow-batch-search.vue
index b371962..e49e55e 100644
--- a/src/views/workflow/batch/modules/workflow-batch-search.vue
+++ b/src/views/workflow/batch/modules/workflow-batch-search.vue
@@ -3,6 +3,7 @@ import { ref, watch } from 'vue';
 import { $t } from '@/locales';
 import SelectGroup from '@/components/common/select-group.vue';
 import TaskBatchStatus from '@/components/common/task-batch-status.vue';
+import DatetimeRange from '@/components/common/datetime-range.vue';
 
 import { fetchGetWorkflowNameList } from '@/service/api';
 
@@ -104,14 +105,7 @@ function translateOptions(options: Api.Workflow.Workflow[]) {
       path="datetimeRange"
       class="pr-24px"
     >
-      <NDatePicker
-        v-model:formatted-value="model.datetimeRange"
-        class="w-full"
-        type="datetimerange"
-        value-format="yyyy-MM-dd'T'HH:mm:ss"
-        :default-time="['00:00:00', '23:56:56']"
-        clearable
-      />
+      <DatetimeRange v-model:value="model.datetimeRange!" />
     </NFormItemGi>
   </SearchForm>
 </template>

From 179f23211ee985a2e4ff8e6b5d16d9f45f469dbe Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Sat, 22 Jun 2024 09:48:45 +0800
Subject: [PATCH 31/39] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=89=B9=E6=AC=A1=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/batch/modules/workflow-batch-search.vue  | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/views/workflow/batch/modules/workflow-batch-search.vue b/src/views/workflow/batch/modules/workflow-batch-search.vue
index e49e55e..710e4f8 100644
--- a/src/views/workflow/batch/modules/workflow-batch-search.vue
+++ b/src/views/workflow/batch/modules/workflow-batch-search.vue
@@ -32,13 +32,8 @@ function search() {
   emit('search');
 }
 
-async function groupNameUpdate(groupName: string) {
-  const res = await fetchGetWorkflowNameList({ groupName });
-  workflowList.value = res.data as Api.Workflow.Workflow[];
-}
-
 async function keywordsUpdate() {
-  const res = await fetchGetWorkflowNameList({ keywords: keywords.value });
+  const res = await fetchGetWorkflowNameList({ keywords: keywords.value, groupName: model.value.groupName });
   workflowList.value = res.data as Api.Workflow.Workflow[];
 }
 
@@ -57,7 +52,7 @@ watch(
   }
 );
 
-groupNameUpdate('');
+// groupNameUpdate('');
 
 function translateOptions(options: Api.Workflow.Workflow[]) {
   return options.map(option => ({
@@ -70,7 +65,7 @@ function translateOptions(options: Api.Workflow.Workflow[]) {
 <template>
   <SearchForm btn-span="24 s:24 m:9 l:12 xl:15" :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.workflowBatch.groupName')" path="groupName" class="pr-24px">
-      <SelectGroup v-model:value="model.groupName" clearable @update:value="groupNameUpdate" />
+      <SelectGroup v-model:value="model.groupName" clearable />
     </NFormItemGi>
     <NFormItemGi
       span="24 s:12 m:6"

From 1b02b7e1915a6735322f1693d99b391afb736f78 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sat, 22 Jun 2024 15:59:43 +0800
Subject: [PATCH 32/39] =?UTF-8?q?feat(sj=5F1.1.0):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E6=90=9C=E7=B4=A2=E6=97=B6=E9=97=B4=E5=8C=BA?=
 =?UTF-8?q?=E9=97=B4=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/datetime-range.vue | 38 ++++--------------------
 src/utils/common.ts                      | 29 ++++++++++++++++++
 src/views/home/modules/task-tab.vue      |  7 +----
 src/views/job/batch/index.vue            |  7 ++---
 src/views/retry/dead-letter/index.vue    |  4 +--
 src/views/retry/log/index.vue            |  4 +--
 src/views/workflow/batch/index.vue       |  4 ++-
 7 files changed, 45 insertions(+), 48 deletions(-)

diff --git a/src/components/common/datetime-range.vue b/src/components/common/datetime-range.vue
index 706c2a9..c780241 100644
--- a/src/components/common/datetime-range.vue
+++ b/src/components/common/datetime-range.vue
@@ -1,60 +1,34 @@
 <script setup lang="ts">
-import { ref } from 'vue';
-import dayjs from 'dayjs';
 import { $t } from '@/locales';
+import { monthRange } from '@/utils/common';
 
 defineOptions({
   name: 'DatetimeRange'
 });
 
+// 注意：格式与 day.js 大小写不一样
 const DATETIME_FORMAT_ISO8601 = "yyyy-MM-dd'T'HH:mm:ss";
 
-/** 创建 `过去n个自然月` 时间区间 */
-const monthRange = (months: number) =>
-  [
-    dayjs()
-      .subtract(months - 1, 'month')
-      .startOf('month')
-      .valueOf(),
-    dayjs().endOf('day').valueOf()
-  ] as const;
-
 const modelValue = defineModel<[string, string] | null>('value');
 
-interface Props {
-  noDefault?: boolean;
-}
-
-const props = withDefaults(defineProps<Props>(), {
-  noDefault: false
-});
-
-const onUpdateFormattedValue = (formattedValue: [string, string] | null) => {
-  modelValue.value = formattedValue;
-};
-
-const timestampValue = ref<[number, number] | null>(props.noDefault ? null : [...monthRange(1)]);
-
 const createShortcuts = () => {
   const shortcuts: any = {};
-  shortcuts[$t('common.currentMonth')] = monthRange(1);
-  shortcuts[$t('common.lastMonth')] = monthRange(2);
-  shortcuts[$t('common.lastTwoMonth')] = monthRange(3);
+  shortcuts[$t('common.currentMonth')] = monthRange(0, 'month');
+  shortcuts[$t('common.lastMonth')] = monthRange(1, 'month');
+  shortcuts[$t('common.lastTwoMonth')] = monthRange(2, 'month');
   return shortcuts;
 };
 </script>
 
 <template>
   <NDatePicker
-    v-model:value="timestampValue"
+    v-model:formatted-value="modelValue"
     type="datetimerange"
     :value-format="DATETIME_FORMAT_ISO8601"
-    class="w-400px"
     clearable
     :default-time="['00:00:00', '23:56:56']"
     :shortcuts="createShortcuts()"
     :actions="['clear', 'confirm']"
-    @update:formatted-value="onUpdateFormattedValue"
   />
 </template>
 
diff --git a/src/utils/common.ts b/src/utils/common.ts
index 6fc8aae..ab2388a 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -1,4 +1,5 @@
 import { Md5 } from 'ts-md5';
+import dayjs from 'dayjs';
 import { $t } from '@/locales';
 
 /**
@@ -117,3 +118,31 @@ export function toggleHtmlClass(className: string) {
     remove
   };
 }
+
+/**
+ * 创建 `最近n个自然月` timestamp时间区间
+ *
+ * @param months 月数
+ * @param startOf 时间的开始类型
+ * @returns timestamp时间区间
+ */
+export function monthRange(months: number = 1, startOf: dayjs.OpUnitType = 'day') {
+  return [dayjs().subtract(months, 'month').startOf(startOf).valueOf(), dayjs().endOf('day').valueOf()] as [
+    number,
+    number
+  ];
+}
+
+/**
+ * 创建 `最近n个自然月` 字符串时间区间
+ *
+ * @param months 月数
+ * @param startOf 时间的开始类型
+ * @returns 字符串时间区间
+ */
+export function monthRangeISO8601(months: number = 1, startOf: dayjs.OpUnitType = 'day') {
+  return [
+    dayjs().subtract(months, 'month').startOf(startOf).format('YYYY-MM-DDTHH:mm:ss'),
+    dayjs().endOf('day').format('YYYY-MM-DDTHH:mm:ss')
+  ] as [string, string];
+}
diff --git a/src/views/home/modules/task-tab.vue b/src/views/home/modules/task-tab.vue
index 60f6759..403a282 100644
--- a/src/views/home/modules/task-tab.vue
+++ b/src/views/home/modules/task-tab.vue
@@ -204,12 +204,7 @@ getGroupNames();
         <NRadioButton value="MONTH" :label="$t('page.home.retryTab.params.month')" />
         <NRadioButton value="YEAR" :label="$t('page.home.retryTab.params.year')" />
       </NRadioGroup>
-      <DatetimeRange
-        v-model:value="tabParams.datetimeRange"
-        no-default
-        @update:value="onUpdateDate"
-        @clear="onClearDate"
-      />
+      <DatetimeRange v-model:value="tabParams.datetimeRange" @update:value="onUpdateDate" @clear="onClearDate" />
       <NSelect v-model:value="tabParams.groupName" :options="groupOptions" class="w-200px lg:w-150px md:w-170px" />
     </div>
   </div>
diff --git a/src/views/job/batch/index.vue b/src/views/job/batch/index.vue
index 4ed9111..053afd4 100644
--- a/src/views/job/batch/index.vue
+++ b/src/views/job/batch/index.vue
@@ -7,7 +7,7 @@ import { $t } from '@/locales';
 import { useAppStore } from '@/store/modules/app';
 import { useTable } from '@/hooks/common/table';
 import { operationReasonRecord, taskBatchStatusRecord } from '@/constants/business';
-import { tagColor } from '@/utils/common';
+import { monthRangeISO8601, tagColor } from '@/utils/common';
 import JobBatchSearch from './modules/job-batch-search.vue';
 import JobBatchDetailDrawer from './modules/job-batch-detail-drawer.vue';
 
@@ -27,10 +27,7 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
     groupName: null,
     jobName: null,
     taskBatchStatus: null,
-    datetimeRange: null
-
-    // beginDate: null,
-    // endDate: null
+    datetimeRange: monthRangeISO8601()
   },
   searchParams: {
     jobName,
diff --git a/src/views/retry/dead-letter/index.vue b/src/views/retry/dead-letter/index.vue
index c810836..fb45cf0 100644
--- a/src/views/retry/dead-letter/index.vue
+++ b/src/views/retry/dead-letter/index.vue
@@ -13,7 +13,7 @@ import { $t } from '@/locales';
 import { useAppStore } from '@/store/modules/app';
 import { useTable, useTableOperate } from '@/hooks/common/table';
 import { retryTaskTypeRecord } from '@/constants/business';
-import { tagColor } from '@/utils/common';
+import { monthRangeISO8601, tagColor } from '@/utils/common';
 import RetryDeadLetterSearch from './modules/dead-letter-search.vue';
 import RetryDeadLetterDetailDrawer from './modules/retry-letter-detail-drawer.vue';
 
@@ -31,7 +31,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     size: 10,
     groupName: null,
     sceneName: null,
-    datetimeRange: null
+    datetimeRange: monthRangeISO8601()
     // if you want to use the searchParams in Form, you need to define the following properties, and the value is null
     // the value can not be undefined, otherwise the property in Form will not be reactive
   },
diff --git a/src/views/retry/log/index.vue b/src/views/retry/log/index.vue
index df49819..80f37a7 100644
--- a/src/views/retry/log/index.vue
+++ b/src/views/retry/log/index.vue
@@ -7,7 +7,7 @@ import { $t } from '@/locales';
 import { useAppStore } from '@/store/modules/app';
 import { useTable, useTableOperate } from '@/hooks/common/table';
 import { retryTaskStatusTypeRecord, retryTaskTypeRecord } from '@/constants/business';
-import { tagColor } from '@/utils/common';
+import { monthRangeISO8601, tagColor } from '@/utils/common';
 import RetryLogSearch from './modules/retry-log-search.vue';
 import RetryLogDetailDrawer from './modules/retry-log-detail-drawer.vue';
 
@@ -32,7 +32,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     idempotentId: null,
     bizNo: null,
     retryStatus: null,
-    datetimeRange: null
+    datetimeRange: monthRangeISO8601()
   },
   searchParams: {
     retryStatus
diff --git a/src/views/workflow/batch/index.vue b/src/views/workflow/batch/index.vue
index 54096c9..c877943 100644
--- a/src/views/workflow/batch/index.vue
+++ b/src/views/workflow/batch/index.vue
@@ -6,7 +6,9 @@ import { $t } from '@/locales';
 import { useAppStore } from '@/store/modules/app';
 import { useTable, useTableOperate } from '@/hooks/common/table';
 import { operationReasonRecord, taskBatchStatusRecord } from '@/constants/business';
+import { monthRangeISO8601 } from '@/utils/common';
 import WorkflowBatchSearch from './modules/workflow-batch-search.vue';
+
 const router = useRouter();
 
 const appStore = useAppStore();
@@ -23,7 +25,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     workflowId: null,
     groupName: null,
     taskBatchStatus: null,
-    datetimeRange: null
+    datetimeRange: monthRangeISO8601()
   },
   searchParams: {
     workflowId,

From b06852feff83ca672659312d6ae02f7dc69180bb Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Sat, 22 Jun 2024 17:02:32 +0800
Subject: [PATCH 33/39] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/typings/api.d.ts                          |  2 +-
 .../job/batch/modules/job-batch-search.vue    | 49 ++++++++++++++++++-
 .../batch/modules/workflow-batch-search.vue   |  9 ++--
 3 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index 233a420..148ae43 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -1090,7 +1090,7 @@ declare namespace Api {
 
     /** JobBatch search params */
     type JobBatchSearchParams = CommonType.RecordNullable<
-      Pick<Api.JobBatch.JobBatch, 'groupName' | 'jobName' | 'taskBatchStatus'> &
+      Pick<Api.JobBatch.JobBatch, 'groupName' | 'jobName' | 'taskBatchStatus' | 'jobId'> &
         CommonSearchParams & { datetimeRange?: [string, string] }
     >;
 
diff --git a/src/views/job/batch/modules/job-batch-search.vue b/src/views/job/batch/modules/job-batch-search.vue
index 57b8856..b5b7ddb 100644
--- a/src/views/job/batch/modules/job-batch-search.vue
+++ b/src/views/job/batch/modules/job-batch-search.vue
@@ -1,8 +1,10 @@
 <script setup lang="ts">
+import { ref, watch } from 'vue';
 import SelectGroup from '@/components/common/select-group.vue';
 import TaskBatchStatus from '@/components/common/task-batch-status.vue';
 import DatetimeRange from '@/components/common/datetime-range.vue';
 import { $t } from '@/locales';
+import { fetchGetJobNameList } from '@/service/api';
 
 defineOptions({
   name: 'JobBatchSearch'
@@ -13,17 +15,52 @@ interface Emits {
   (e: 'search'): void;
 }
 
+const keywords = ref<string>('');
+
+const noSearchFlag = ref(false);
+
 const emit = defineEmits<Emits>();
 
+/** 定时任务列表 */
+const jobList = ref<Api.Job.Job[]>([]);
+
 const model = defineModel<Api.JobBatch.JobBatchSearchParams>('model', { required: true });
 
 function reset() {
+  keywords.value = '';
   emit('reset');
 }
 
 function search() {
   emit('search');
 }
+
+async function keywordsUpdate() {
+  const res = await fetchGetJobNameList({ keywords: keywords.value, groupName: model.value.groupName });
+  jobList.value = res.data as Api.Job.Job[];
+}
+
+function handleSelect(value: string) {
+  model.value.jobId = value;
+}
+
+watch(
+  () => keywords.value,
+  (value: string) => {
+    if (value.length !== 0) {
+      keywordsUpdate();
+    } else {
+      noSearchFlag.value = false;
+    }
+  }
+);
+
+function translateOptions(options: Api.Job.Job[]) {
+  return options.map(option => ({
+    value: option.id,
+    label: `${option.jobName}(${option.id})`
+  }));
+}
 </script>
 
 <template>
@@ -32,7 +69,17 @@ function search() {
       <SelectGroup v-model:value="model.groupName" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobBatch.jobName')" path="jobName" class="pr-24px">
-      <NInput v-model:value="model.jobName" :placeholder="$t('page.jobBatch.form.jobName')" clearable />
+      <NAutoComplete
+        v-model:value="keywords"
+        :placeholder="$t('page.jobBatch.form.jobName')"
+        value-field="id"
+        label-field="workflowName"
+        :options="translateOptions(jobList)"
+        :empty-visible="noSearchFlag"
+        clearable
+        filterable
+        @select="handleSelect"
+      />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobBatch.taskBatchStatus')" path="taskBatchStatus" class="pr-24px">
       <TaskBatchStatus v-model:value="model.taskBatchStatus" clearable />
diff --git a/src/views/workflow/batch/modules/workflow-batch-search.vue b/src/views/workflow/batch/modules/workflow-batch-search.vue
index 710e4f8..71a3041 100644
--- a/src/views/workflow/batch/modules/workflow-batch-search.vue
+++ b/src/views/workflow/batch/modules/workflow-batch-search.vue
@@ -19,12 +19,13 @@ const keywords = ref<string>('');
 const noSearchFlag = ref(false);
 
 const emit = defineEmits<Emits>();
-/** 组列表 */
+/** 工作流列表 */
 const workflowList = ref<Api.Workflow.Workflow[]>([]);
 
 const model = defineModel<Api.WorkflowBatch.WorkflowBatchSearchParams>('model', { required: true });
 
 function reset() {
+  keywords.value = '';
   emit('reset');
 }
 
@@ -52,12 +53,10 @@ watch(
   }
 );
 
-// groupNameUpdate('');
-
 function translateOptions(options: Api.Workflow.Workflow[]) {
   return options.map(option => ({
     value: option.id,
-    label: option.workflowName
+    label: `${option.workflowName}(${option.id})`
   }));
 }
 </script>
@@ -77,8 +76,6 @@ function translateOptions(options: Api.Workflow.Workflow[]) {
       <NAutoComplete
         v-model:value="keywords"
         :placeholder="$t('page.workflowBatch.form.workflowName')"
-        value-field="id"
-        label-field="workflowName"
         :options="translateOptions(workflowList)"
         :empty-visible="noSearchFlag"
         clearable

From 3e0d2d926bc84d67ac0545e6264774c97dbb8a67 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sat, 22 Jun 2024 17:30:12 +0800
Subject: [PATCH 34/39] =?UTF-8?q?feat(sj=5F1.1.0):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=AD=96=E7=95=A5=EF=BC=9A=E5=AD=97=E6=AF=8D?=
 =?UTF-8?q?=E3=80=81=E6=95=B0=E5=AD=97=E3=80=81=E7=89=B9=E6=AE=8A=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=EF=BC=8C=E4=BB=BB=E6=84=8F2=E7=A7=8D=E7=BB=84?=
 =?UTF-8?q?=E6=88=90=EF=BC=8C6-20=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/constants/reg.ts b/src/constants/reg.ts
index 8805ca8..a0c2be4 100644
--- a/src/constants/reg.ts
+++ b/src/constants/reg.ts
@@ -7,9 +7,9 @@ export const REG_PHONE =
 /**
  * Password reg
  *
- * 6-18 characters, including letters, numbers, and underscores
+ * 由字母、数字、特殊字符，任意2种组成，6-20位
  */
-export const REG_PWD = /^\w{6,18}$/;
+export const REG_PWD = /^(?![a-zA-Z]+$)(?!\d+$)(?![^\da-zA-Z\s]+$).{6,20}$/;
 
 /** Email reg */
 export const REG_EMAIL = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;
diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index da4fd54..c2be41f 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -873,7 +873,7 @@ const local: App.I18n.Schema = {
     },
     pwd: {
       required: 'Please enter password',
-      invalid: '6-18 characters, including letters, numbers, and underscores'
+      invalid: 'Letters, numbers, and special characters, combination of two, 6 to 20 characters'
     },
     confirmPwd: {
       required: 'Please enter password again',
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index f3bc9fc..f49e79a 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -881,7 +881,7 @@ const local: App.I18n.Schema = {
     },
     pwd: {
       required: '请输入密码',
-      invalid: '密码格式不正确，6-18位字符，包含字母、数字、下划线'
+      invalid: '由字母、数字、特殊字符，任意2种组成，6-20位'
     },
     confirmPwd: {
       required: '请输入确认密码',

From 91b1eca3cabee4eb06463946e6f893a6ec435726 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Sat, 22 Jun 2024 17:50:26 +0800
Subject: [PATCH 35/39] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BB=8E=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=89=B9=E6=AC=A1=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=97=B6=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/job/batch/index.vue                    | 3 +++
 src/views/job/batch/modules/job-batch-search.vue | 3 +--
 src/views/job/task/index.vue                     | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/job/batch/index.vue b/src/views/job/batch/index.vue
index 053afd4..707f906 100644
--- a/src/views/job/batch/index.vue
+++ b/src/views/job/batch/index.vue
@@ -17,6 +17,7 @@ const detailData = ref<Api.JobBatch.JobBatch | null>();
 /** 详情页可见状态 */
 const { bool: detailVisible, setTrue: openDetail } = useBoolean(false);
 const jobName = history.state.jobName;
+const jobId = history.state.jobId;
 const taskBatchStatus = history.state.taskBatchStatus;
 
 const { columnChecks, columns, data, getData, loading, mobilePagination, searchParams, resetSearchParams } = useTable({
@@ -27,9 +28,11 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
     groupName: null,
     jobName: null,
     taskBatchStatus: null,
+    jobId: null,
     datetimeRange: monthRangeISO8601()
   },
   searchParams: {
+    jobId,
     jobName,
     taskBatchStatus
   },
diff --git a/src/views/job/batch/modules/job-batch-search.vue b/src/views/job/batch/modules/job-batch-search.vue
index b5b7ddb..c359b60 100644
--- a/src/views/job/batch/modules/job-batch-search.vue
+++ b/src/views/job/batch/modules/job-batch-search.vue
@@ -15,8 +15,6 @@ interface Emits {
   (e: 'search'): void;
 }
 
-const keywords = ref<string>('');
-
 const noSearchFlag = ref(false);
 
 const emit = defineEmits<Emits>();
@@ -25,6 +23,7 @@ const emit = defineEmits<Emits>();
 const jobList = ref<Api.Job.Job[]>([]);
 
 const model = defineModel<Api.JobBatch.JobBatchSearchParams>('model', { required: true });
+const keywords = ref<string>(model.value.jobName as string);
 
 function reset() {
   keywords.value = '';
diff --git a/src/views/job/task/index.vue b/src/views/job/task/index.vue
index f75ce89..72724e6 100644
--- a/src/views/job/task/index.vue
+++ b/src/views/job/task/index.vue
@@ -251,7 +251,7 @@ async function handleTriggerJob(id: string) {
 
 function goToBatch(jobId: string) {
   const findItem = data.value.find(item => item.id === jobId)!;
-  routerPushByKey('job_batch', { state: { jobName: findItem.jobName } });
+  routerPushByKey('job_batch', { state: { jobId, jobName: findItem.jobName } });
 }
 
 function body(): Api.Job.ExportJob {

From 121ac94cff2587ed1c3623de9fecc5719bb4b0b8 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Sat, 22 Jun 2024 18:24:24 +0800
Subject: [PATCH 36/39] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=B7=A5=E4=BD=9C=E6=B5=81=E4=BB=8E=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=89=B9=E6=AC=A1=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=97=B6=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/typings/api.d.ts                               |  2 +-
 src/views/workflow/batch/index.vue                 |  3 +++
 .../batch/modules/workflow-batch-search.vue        |  2 +-
 src/views/workflow/task/index.vue                  | 14 ++++++++++----
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index 148ae43..55c7ed5 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -1126,7 +1126,7 @@ declare namespace Api {
 
     /** workflowBatch search params */
     type WorkflowBatchSearchParams = CommonType.RecordNullable<
-      Pick<Api.WorkflowBatch.WorkflowBatch, 'workflowId' | 'groupName' | 'taskBatchStatus'> &
+      Pick<Api.WorkflowBatch.WorkflowBatch, 'workflowId' | 'groupName' | 'workflowName' | 'taskBatchStatus'> &
         CommonSearchParams & { datetimeRange?: [string, string] }
     >;
 
diff --git a/src/views/workflow/batch/index.vue b/src/views/workflow/batch/index.vue
index c877943..c276ca5 100644
--- a/src/views/workflow/batch/index.vue
+++ b/src/views/workflow/batch/index.vue
@@ -13,6 +13,7 @@ const router = useRouter();
 
 const appStore = useAppStore();
 const workflowId = history.state.workflowId;
+const workflowName = history.state.workflowName;
 const taskBatchStatus = history.state.taskBatchStatus;
 
 const { columns, columnChecks, data, getData, loading, mobilePagination, searchParams, resetSearchParams } = useTable({
@@ -23,12 +24,14 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     // if you want to use the searchParams in Form, you need to define the following properties, and the value is null
     // the value can not be undefined, otherwise the property in Form will not be reactive
     workflowId: null,
+    workflowName: null,
     groupName: null,
     taskBatchStatus: null,
     datetimeRange: monthRangeISO8601()
   },
   searchParams: {
     workflowId,
+    workflowName,
     taskBatchStatus
   },
   columns: () => [
diff --git a/src/views/workflow/batch/modules/workflow-batch-search.vue b/src/views/workflow/batch/modules/workflow-batch-search.vue
index 71a3041..412fc54 100644
--- a/src/views/workflow/batch/modules/workflow-batch-search.vue
+++ b/src/views/workflow/batch/modules/workflow-batch-search.vue
@@ -15,7 +15,6 @@ interface Emits {
   (e: 'reset'): void;
   (e: 'search'): void;
 }
-const keywords = ref<string>('');
 const noSearchFlag = ref(false);
 
 const emit = defineEmits<Emits>();
@@ -23,6 +22,7 @@ const emit = defineEmits<Emits>();
 const workflowList = ref<Api.Workflow.Workflow[]>([]);
 
 const model = defineModel<Api.WorkflowBatch.WorkflowBatchSearchParams>('model', { required: true });
+const keywords = ref<string>(model.value.workflowName as any);
 
 function reset() {
   keywords.value = '';
diff --git a/src/views/workflow/task/index.vue b/src/views/workflow/task/index.vue
index 8a75ecf..d879b2c 100644
--- a/src/views/workflow/task/index.vue
+++ b/src/views/workflow/task/index.vue
@@ -15,11 +15,13 @@ import StatusSwitch from '@/components/common/status-switch.vue';
 import { tagColor } from '@/utils/common';
 import { useAuth } from '@/hooks/business/auth';
 import { downloadFetch } from '@/utils/download';
+import { useRouterPush } from '@/hooks/common/router';
 import WorkflowSearch from './modules/workflow-search.vue';
 const { hasAuth } = useAuth();
 
 const router = useRouter();
 const appStore = useAppStore();
+const { routerPushByKey } = useRouterPush();
 
 const { columns, columnChecks, data, getData, loading, mobilePagination, searchParams, resetSearchParams } = useTable({
   apiFn: fetchGetWorkflowPageList,
@@ -152,7 +154,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
           {
             label: $t('common.batchList'),
             key: 'batchList',
-            click: () => batch(row.id!)
+            click: () => goToBatch(row.id!)
           }
         ];
 
@@ -237,9 +239,9 @@ function copy(id: string) {
   router.push({ path: '/workflow/form/copy', query: { id } });
 }
 
-function batch(id: string) {
-  router.push({ path: '/workflow/batch', state: { workflowId: id } });
-}
+// function batch(id: string) {
+//   router.push({ path: '/workflow/batch', state: { workflowId: id } });
+// }
 
 async function execute(id: string) {
   const { error } = await fetchTriggerWorkflow(id);
@@ -261,6 +263,10 @@ function body(): Api.Workflow.ExportWorkflow {
 function handleExport() {
   downloadFetch('/workflow/export', body(), $t('page.workflow.title'));
 }
+function goToBatch(workflowId: string) {
+  const findItem = data.value.find(item => item.id === workflowId)!;
+  routerPushByKey('workflow_batch', { state: { workflowId, workflowName: findItem.workflowName } });
+}
 </script>
 
 <template>

From 79b5c588cd89fd0df12e2170a0d2f4421dea99ac Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sat, 22 Jun 2024 20:04:24 +0800
Subject: [PATCH 37/39] =?UTF-8?q?refactor(sj=5F1.1.0-beta1):=20=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9=20notify/scene=20?=
 =?UTF-8?q?=3D>=20notify/config?=
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 +-
 src/router/elegant/imports.ts                 |  2 +-
 src/router/elegant/routes.ts                  | 20 +++++++++----------
 src/views/notify/{scene => config}/index.vue  |  6 +++---
 .../modules/notify-config-detail-drawer.vue   |  0
 .../modules/notify-config-operate-drawer.vue  |  0
 .../modules/notify-config-search.vue          |  0
 8 files changed, 16 insertions(+), 16 deletions(-)
 rename src/views/notify/{scene => config}/index.vue (96%)
 rename src/views/notify/{scene => config}/modules/notify-config-detail-drawer.vue (100%)
 rename src/views/notify/{scene => config}/modules/notify-config-operate-drawer.vue (100%)
 rename src/views/notify/{scene => config}/modules/notify-config-search.vue (100%)

diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index c2be41f..9fb826b 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -303,7 +303,7 @@ const local: App.I18n.Schema = {
     namespace: 'Namespace',
     notify: 'Notify',
     notify_recipient: 'Notify Recipient',
-    notify_scene: 'Notify Scene',
+    notify_config: 'Notify Config',
     retry: 'Retry Task',
     retry_task: 'Retry Task',
     retry_scene: 'Retry Scene',
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index f49e79a..c0c7303 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -304,7 +304,7 @@ const local: App.I18n.Schema = {
     group: '组管理',
     notify: '告警通知',
     notify_recipient: '通知人',
-    notify_scene: '通知场景',
+    notify_config: '通知配置',
     retry: '重试任务',
     retry_task: '任务管理',
     'retry_dead-letter': '死信任务',
diff --git a/src/router/elegant/imports.ts b/src/router/elegant/imports.ts
index 953936a..0f5bca2 100644
--- a/src/router/elegant/imports.ts
+++ b/src/router/elegant/imports.ts
@@ -26,8 +26,8 @@ export const views: Record<LastLevelRouteKey, RouteComponent | (() => Promise<Ro
   job_batch: () => import("@/views/job/batch/index.vue"),
   job_task: () => import("@/views/job/task/index.vue"),
   namespace: () => import("@/views/namespace/index.vue"),
+  notify_config: () => import("@/views/notify/config/index.vue"),
   notify_recipient: () => import("@/views/notify/recipient/index.vue"),
-  notify_scene: () => import("@/views/notify/scene/index.vue"),
   pods: () => import("@/views/pods/index.vue"),
   "retry_dead-letter": () => import("@/views/retry/dead-letter/index.vue"),
   retry_log: () => import("@/views/retry/log/index.vue"),
diff --git a/src/router/elegant/routes.ts b/src/router/elegant/routes.ts
index f518d7a..12f43c2 100644
--- a/src/router/elegant/routes.ts
+++ b/src/router/elegant/routes.ts
@@ -155,6 +155,16 @@ export const generatedRoutes: GeneratedRoute[] = [
       icon: 'material-symbols:notifications-active-outline-rounded'
     },
     children: [
+      {
+        name: 'notify_config',
+        path: '/notify/config',
+        component: 'view.notify_config',
+        meta: {
+          title: 'notify_config',
+          i18nKey: 'route.notify_config',
+          icon: 'cbi:scene-dynamic'
+        }
+      },
       {
         name: 'notify_recipient',
         path: '/notify/recipient',
@@ -164,16 +174,6 @@ export const generatedRoutes: GeneratedRoute[] = [
           i18nKey: 'route.notify_recipient',
           icon: 'fluent:people-call-20-filled'
         }
-      },
-      {
-        name: 'notify_scene',
-        path: '/notify/scene',
-        component: 'view.notify_scene',
-        meta: {
-          title: 'notify_scene',
-          i18nKey: 'route.notify_scene',
-          icon: 'cbi:scene-dynamic'
-        }
       }
     ]
   },
diff --git a/src/views/notify/scene/index.vue b/src/views/notify/config/index.vue
similarity index 96%
rename from src/views/notify/scene/index.vue
rename to src/views/notify/config/index.vue
index e1102b5..fe1bfd5 100644
--- a/src/views/notify/scene/index.vue
+++ b/src/views/notify/config/index.vue
@@ -6,9 +6,9 @@ import { fetchBatchDeleteNotify, fetchGetNotifyConfigList, fetchUpdateNotifyStat
 import { $t } from '@/locales';
 import { useAppStore } from '@/store/modules/app';
 import { useTable, useTableOperate } from '@/hooks/common/table';
-import NotifyConfigOperateDrawer from '@/views/notify/scene/modules/notify-config-operate-drawer.vue';
-import NotifyConfigSearch from '@/views/notify/scene/modules/notify-config-search.vue';
-import NotifyConfigDetailDrawer from '@/views/notify/scene/modules/notify-config-detail-drawer.vue';
+import NotifyConfigOperateDrawer from '@/views/notify/config/modules/notify-config-operate-drawer.vue';
+import NotifyConfigSearch from '@/views/notify/config/modules/notify-config-search.vue';
+import NotifyConfigDetailDrawer from '@/views/notify/config/modules/notify-config-detail-drawer.vue';
 import StatusSwitch from '@/components/common/status-switch.vue';
 import { jobNotifyScene, retryNotifyScene, systemTaskType, workflowNotifyScene } from '@/constants/business';
 import { tagColor } from '@/utils/common';
diff --git a/src/views/notify/scene/modules/notify-config-detail-drawer.vue b/src/views/notify/config/modules/notify-config-detail-drawer.vue
similarity index 100%
rename from src/views/notify/scene/modules/notify-config-detail-drawer.vue
rename to src/views/notify/config/modules/notify-config-detail-drawer.vue
diff --git a/src/views/notify/scene/modules/notify-config-operate-drawer.vue b/src/views/notify/config/modules/notify-config-operate-drawer.vue
similarity index 100%
rename from src/views/notify/scene/modules/notify-config-operate-drawer.vue
rename to src/views/notify/config/modules/notify-config-operate-drawer.vue
diff --git a/src/views/notify/scene/modules/notify-config-search.vue b/src/views/notify/config/modules/notify-config-search.vue
similarity index 100%
rename from src/views/notify/scene/modules/notify-config-search.vue
rename to src/views/notify/config/modules/notify-config-search.vue

From 35e63abcb6a9871e3b206e310eb56a78a4d9396f Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Sat, 22 Jun 2024 23:14:51 +0800
Subject: [PATCH 38/39] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=E5=92=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AF=86=E7=A0=81=E6=9C=AA=E9=87=8D=E5=AE=9A=E5=90=91?=
 =?UTF-8?q?=E5=88=B0=E7=99=BB=E5=BD=95=E9=A1=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/modules/namespace-select/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/modules/namespace-select/index.vue b/src/layouts/modules/namespace-select/index.vue
index ae1ec56..26287dc 100644
--- a/src/layouts/modules/namespace-select/index.vue
+++ b/src/layouts/modules/namespace-select/index.vue
@@ -65,7 +65,7 @@ const onChange = (value: string) => {
 };
 
 const namespaceName = computed(() => {
-  return namespaceIds.value.filter(item => item.uniqueId === namespaceId.value)[0].name || 'Default';
+  return namespaceIds.value.filter(item => item.uniqueId === namespaceId.value)[0]?.name || 'Default';
 });
 </script>
 

From 829f5ed956f0b6b3d7d4e4b1af02a3ae29af5f21 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Sat, 22 Jun 2024 23:49:14 +0800
Subject: [PATCH 39/39] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=92=8C=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E6=89=B9=E6=AC=A1=E4=BB=BB=E5=8A=A1=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/job/batch/modules/job-batch-search.vue       | 10 +++++++---
 .../workflow/batch/modules/workflow-batch-search.vue   |  8 +++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/views/job/batch/modules/job-batch-search.vue b/src/views/job/batch/modules/job-batch-search.vue
index c359b60..31d2ada 100644
--- a/src/views/job/batch/modules/job-batch-search.vue
+++ b/src/views/job/batch/modules/job-batch-search.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { ref, watch } from 'vue';
+import type { SelectOption } from 'naive-ui';
 import SelectGroup from '@/components/common/select-group.vue';
 import TaskBatchStatus from '@/components/common/task-batch-status.vue';
 import DatetimeRange from '@/components/common/datetime-range.vue';
@@ -57,9 +58,13 @@ watch(
 function translateOptions(options: Api.Job.Job[]) {
   return options.map(option => ({
     value: option.id,
-    label: `${option.jobName}(${option.id})`
+    label: option.jobName
   }));
 }
+
+function renderLabel(option: SelectOption) {
+  return [option.label as string, `(${option.value})`];
+}
 </script>
 
 <template>
@@ -71,12 +76,11 @@ function translateOptions(options: Api.Job.Job[]) {
       <NAutoComplete
         v-model:value="keywords"
         :placeholder="$t('page.jobBatch.form.jobName')"
-        value-field="id"
-        label-field="workflowName"
         :options="translateOptions(jobList)"
         :empty-visible="noSearchFlag"
         clearable
         filterable
+        :render-label="renderLabel"
         @select="handleSelect"
       />
     </NFormItemGi>
diff --git a/src/views/workflow/batch/modules/workflow-batch-search.vue b/src/views/workflow/batch/modules/workflow-batch-search.vue
index 412fc54..1768911 100644
--- a/src/views/workflow/batch/modules/workflow-batch-search.vue
+++ b/src/views/workflow/batch/modules/workflow-batch-search.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { ref, watch } from 'vue';
+import type { SelectOption } from 'naive-ui';
 import { $t } from '@/locales';
 import SelectGroup from '@/components/common/select-group.vue';
 import TaskBatchStatus from '@/components/common/task-batch-status.vue';
@@ -56,9 +57,13 @@ watch(
 function translateOptions(options: Api.Workflow.Workflow[]) {
   return options.map(option => ({
     value: option.id,
-    label: `${option.workflowName}(${option.id})`
+    label: option.workflowName
   }));
 }
+
+function renderLabel(option: SelectOption) {
+  return [option.label as string, `(${option.value})`];
+}
 </script>
 
 <template>
@@ -80,6 +85,7 @@ function translateOptions(options: Api.Workflow.Workflow[]) {
         :empty-visible="noSearchFlag"
         clearable
         filterable
+        :render-label="renderLabel"
         @select="handleSelect"
       />
     </NFormItemGi>