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] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=89=B9=E6=AC=A1=E6=9F=A5?=
 =?UTF-8?q?=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