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] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=92=8C=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E6=89=B9=E6=AC=A1=E4=BB=BB=E5=8A=A1=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=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>