From 8b15a96ab4edbf97fb33247e610f86cb11e87fda Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Tue, 7 May 2024 00:33:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E6=94=AF=E6=8C=81=E5=8F=82=E6=95=B0=E4=BC=A0?=
 =?UTF-8?q?=E9=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/service/api/job.ts                        |  9 ++++++
 src/typings/api.d.ts                          |  6 ++++
 src/views/job/batch/index.vue                 | 31 +++++++++++++++++--
 .../job/batch/modules/job-batch-search.vue    |  3 +-
 src/views/job/task/index.vue                  | 11 ++++++-
 5 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/src/service/api/job.ts b/src/service/api/job.ts
index 8e75c17..1c9be27 100644
--- a/src/service/api/job.ts
+++ b/src/service/api/job.ts
@@ -60,3 +60,12 @@ export function fetchTriggerJob(jobId: string) {
     method: 'post'
   });
 }
+
+/** job name list */
+export function fetchGetJobNameList(params?: Api.Job.JobNameListSearchParams) {
+  return request<Api.Job.Job[]>({
+    url: '/job/job-name/list',
+    method: 'get',
+    params
+  });
+}
diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index 0dd07e2..a5b3620 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -980,6 +980,12 @@ declare namespace Api {
 
     /** 2、固定时间 3、CRON表达式 99、工作流 */
     type TriggerType = 2 | 3 | 99;
+
+    type JobNameListSearchParams = CommonType.RecordNullable<{
+      groupName?: string;
+      jobId?: number;
+      keywords?: string;
+    }>;
   }
 
   /**
diff --git a/src/views/job/batch/index.vue b/src/views/job/batch/index.vue
index 4570d7e..00f5182 100644
--- a/src/views/job/batch/index.vue
+++ b/src/views/job/batch/index.vue
@@ -1,8 +1,9 @@
 <script setup lang="tsx">
 import { NButton, NTag } from 'naive-ui';
 import { useBoolean } from '@sa/hooks';
-import { ref } from 'vue';
-import { fetchGetJobBatchList } from '@/service/api';
+import { ref, watch } from 'vue';
+import { useRoute } from 'vue-router';
+import { fetchGetJobBatchList, fetchGetJobNameList } from '@/service/api';
 import { $t } from '@/locales';
 import { useAppStore } from '@/store/modules/app';
 import { useTable } from '@/hooks/common/table';
@@ -12,6 +13,7 @@ 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>();
@@ -97,6 +99,31 @@ const { columns, data, getData, loading, mobilePagination, searchParams, resetSe
 function detail(id: string) {
   console.log(id);
 }
+
+/** 处理路由 query 参数变化 */
+async function handleQueryChanged(jobId: number) {
+  if (jobId === 0) {
+    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 }
+);
 </script>
 
 <template>
diff --git a/src/views/job/batch/modules/job-batch-search.vue b/src/views/job/batch/modules/job-batch-search.vue
index 85d9d04..2df1836 100644
--- a/src/views/job/batch/modules/job-batch-search.vue
+++ b/src/views/job/batch/modules/job-batch-search.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import SelectGroup from '@/components/common/select-group.vue';
 import TaskBatchStatus from '@/components/common/task-batch-status.vue';
 import { $t } from '@/locales';
 
@@ -27,7 +28,7 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobBatch.groupName')" path="groupName" class="pr-24px">
-      <NInput v-model:value="model.groupName" :placeholder="$t('page.jobBatch.form.groupName')" />
+      <SelectGroup v-model:value="model.groupName" />
     </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')" />
diff --git a/src/views/job/task/index.vue b/src/views/job/task/index.vue
index aacf79b..b9da3d6 100644
--- a/src/views/job/task/index.vue
+++ b/src/views/job/task/index.vue
@@ -8,11 +8,13 @@ import { useAppStore } from '@/store/modules/app';
 import { useTable, useTableOperate } from '@/hooks/common/table';
 import { blockStrategyRecord, taskTypeRecord, triggerTypeRecord } from '@/constants/business';
 import StatusSwitch from '@/components/common/status-switch.vue';
+import { useRouterPush } from '@/hooks/common/router';
 import JobTaskOperateDrawer from './modules/job-task-operate-drawer.vue';
 import JobTaskSearch from './modules/job-task-search.vue';
 import JobTaskDetailDrawer from './modules/job-task-detail-drawer.vue';
 
 const appStore = useAppStore();
+const { routerPushByKey } = useRouterPush();
 
 /** 详情页属性数据 */
 const detailData = ref<Api.Job.Job | null>();
@@ -162,7 +164,7 @@ const { columns, data, getData, loading, mobilePagination, searchParams, resetSe
       key: 'operate',
       title: $t('common.operate'),
       align: 'center',
-      width: 130,
+      width: 260,
       render: row => (
         <div class="flex-center gap-8px">
           <NButton type="primary" ghost size="small" onClick={() => edit(row.id!)}>
@@ -188,6 +190,9 @@ const { columns, data, getData, loading, mobilePagination, searchParams, resetSe
               )
             }}
           </NPopconfirm>
+          <NButton type="primary" ghost size="small" onClick={() => goToBatch(row.id!)}>
+            {$t('common.batchList')}
+          </NButton>
         </div>
       )
     }
@@ -223,6 +228,10 @@ async function handleTriggerJob(id: string) {
     window.$message?.error($t('common.executeFailed'));
   }
 }
+
+function goToBatch(jobId: string) {
+  routerPushByKey('job_batch', { query: { jobId } });
+}
 </script>
 
 <template>