From 44db284845f70af9483485fef2d6851f1850711f Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Thu, 5 Sep 2024 22:35:22 +0800
Subject: [PATCH] =?UTF-8?q?fix(sj=5F1.2.0=5Fbeta1):=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E7=8A=B6=E6=80=81=E5=A4=9A=E4=BD=99=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/job/batch/modules/job-batch-search.vue | 16 ++++++++++++----
 .../job/task/modules/job-task-operate-drawer.vue |  8 ++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/views/job/batch/modules/job-batch-search.vue b/src/views/job/batch/modules/job-batch-search.vue
index b826d97..b609de5 100644
--- a/src/views/job/batch/modules/job-batch-search.vue
+++ b/src/views/job/batch/modules/job-batch-search.vue
@@ -2,10 +2,11 @@
 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';
 import { $t } from '@/locales';
 import { fetchGetJobNameList } from '@/service/api';
+import { taskBatchStatusRecordOptions } from '@/constants/business';
+import { translateOptions } from '@/utils/common';
 
 defineOptions({
   name: 'JobBatchSearch'
@@ -56,7 +57,7 @@ watch(
   }
 );
 
-function translateOptions(options: Api.Job.Job[]) {
+function translateJobOptions(options: Api.Job.Job[]) {
   return options.map(option => ({
     value: option.id,
     label: option.jobName
@@ -77,7 +78,7 @@ function renderLabel(option: SelectOption) {
       <NAutoComplete
         v-model:value="keywords"
         :placeholder="$t('page.jobBatch.form.jobName')"
-        :options="translateOptions(jobList)"
+        :options="translateJobOptions(jobList)"
         :empty-visible="noSearchFlag"
         clearable
         filterable
@@ -86,7 +87,14 @@ function renderLabel(option: SelectOption) {
       />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:8" :label="$t('page.jobBatch.taskBatchStatus')" path="taskBatchStatus" class="pr-24px">
-      <TaskBatchStatus v-model:value="model.taskBatchStatus" clearable />
+      <NSelect
+        v-model:value="model.taskBatchStatus"
+        :placeholder="$t('common.taskBatchStatus.form')"
+        :options="
+          translateOptions(taskBatchStatusRecordOptions).filter(item => ![98, 99].includes(item.value as number))
+        "
+        clearable
+      />
     </NFormItemGi>
     <NFormItemGi
       span="24 s:24 m:14 l:12 xl:8"
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 e134099..7658889 100644
--- a/src/views/job/task/modules/job-task-operate-drawer.vue
+++ b/src/views/job/task/modules/job-task-operate-drawer.vue
@@ -546,9 +546,7 @@ const scriptMethodOptions = [
                     required: true,
                     message: `请输入键`,
                     trigger: ['input', 'blur'],
-                    validator() {
-                      return isNotNull(httpHeaders[index].key);
-                    }
+                    validator: () => isNotNull(httpHeaders[index].key)
                   }"
                 >
                   <NInput v-model:value="httpHeaders[index].key" placeholder="Key" @keydown.enter.prevent />
@@ -562,9 +560,7 @@ const scriptMethodOptions = [
                     required: true,
                     message: `请输入值`,
                     trigger: ['input', 'blur'],
-                    validator() {
-                      return isNotNull(httpHeaders[index].value);
-                    }
+                    validator: () => isNotNull(httpHeaders[index].value)
                   }"
                 >
                   <NInput v-model:value="httpHeaders[index].value" placeholder="Value" @keydown.enter.prevent />