From 855d8f22e2f513617a8be162a07aa510869e4a6d Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Mon, 3 Mar 2025 13:34:01 +0800
Subject: [PATCH] =?UTF-8?q?feat(1.4.0-beta2):=20=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A1=86=E6=96=B0=E5=A2=9E=E6=8A=98=E5=8F=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                          |  2 +-
 src/components/common/search-form.vue | 52 +++++++++++++++------------
 src/views/job/batch/index.vue         |  2 +-
 3 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index 44d0904..ef1a591 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "snail-job",
   "type": "module",
-  "version": "1.3.0-beta1",
+  "version": "1.4.0-beta2",
   "description": "A flexible, reliable, and fast platform for distributed task retry and distributed task scheduling.",
   "license": "Apache-2.0",
   "homepage": "https://gitee.com/aizuda/snail-job",
diff --git a/src/components/common/search-form.vue b/src/components/common/search-form.vue
index 9d0c404..9de9484 100644
--- a/src/components/common/search-form.vue
+++ b/src/components/common/search-form.vue
@@ -60,28 +60,36 @@ onMounted(() => {
 
 <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" cols="24" 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">
-            <NButton @click="reset">
-              <template #icon>
-                <icon-ic-round-refresh class="text-icon" />
-              </template>
-              {{ $t('common.reset') }}
-            </NButton>
-            <NButton type="primary" ghost @click="search">
-              <template #icon>
-                <icon-ic-round-search class="text-icon" />
-              </template>
-              {{ $t('common.search') }}
-            </NButton>
-          </NSpace>
-        </NFormItemGi>
-      </NGrid>
-    </NForm>
+    <NCollapse :default-expanded-names="String(route.name)">
+      <NCollapseItem :title="$t('common.search')" :name="String(route.name)">
+        <NForm ref="formRef" :model="model" label-placement="left" :label-width="80" :show-feedback="appStore.isMobile">
+          <NGrid responsive="screen" cols="24" 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">
+                <NButton @click="reset">
+                  <template #icon>
+                    <icon-ic-round-refresh class="text-icon" />
+                  </template>
+                  {{ $t('common.reset') }}
+                </NButton>
+                <NButton type="primary" ghost @click="search">
+                  <template #icon>
+                    <icon-ic-round-search class="text-icon" />
+                  </template>
+                  {{ $t('common.search') }}
+                </NButton>
+              </NSpace>
+            </NFormItemGi>
+          </NGrid>
+        </NForm>
+      </NCollapseItem>
+    </NCollapse>
   </NCard>
 </template>
 
-<style scoped></style>
+<style scoped>
+:deep(.n-collapse-item__content-inner) {
+  padding-top: 12px !important;
+}
+</style>
diff --git a/src/views/job/batch/index.vue b/src/views/job/batch/index.vue
index 918cb7b..b37e0cf 100644
--- a/src/views/job/batch/index.vue
+++ b/src/views/job/batch/index.vue
@@ -27,7 +27,7 @@ const { bool: detailVisible, setTrue: openDetail } = useBoolean(false);
 const { bool: detailLog, setBool: setDetailLog } = useBoolean(false);
 const jobName = history.state.jobName;
 const jobId = history.state.jobId;
-const taskBatchStatus = [history.state.taskBatchStatus];
+const taskBatchStatus = history.state.taskBatchStatus ? [history.state.taskBatchStatus] : [];
 
 const { columnChecks, columns, data, getData, loading, mobilePagination, searchParams, resetSearchParams } = useTable({
   apiFn: fetchGetJobBatchList,