From 34826d7ea44db9a765e9321202f8ce9a66cc9696 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Mon, 24 Jun 2024 16:27:41 +0800
Subject: [PATCH] =?UTF-8?q?style(sj=5Fmap=5Freduce):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/search-form.vue         |  5 ++--
 src/store/modules/log/index.ts                |  7 +----
 src/views/_builtin/log/index.vue              | 30 ++++++++++++++-----
 .../job/batch/modules/job-batch-search.vue    | 10 +++----
 .../batch/modules/workflow-batch-search.vue   | 10 +++----
 5 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/src/components/common/search-form.vue b/src/components/common/search-form.vue
index 81ddaa6..78dbf74 100644
--- a/src/components/common/search-form.vue
+++ b/src/components/common/search-form.vue
@@ -42,15 +42,14 @@ async function search() {
 
 const btnSpan = computed(() => {
   const keyNum = Object.keys(props.model).length - 1;
-
-  return props.btnSpan || keyNum % 4 !== 0 ? `24 m:12 m:${(4 - ((keyNum - 1) % 4)) * 6}` : '24';
+  return props.btnSpan || (keyNum % 4 !== 0 ? `24 m:12 m:${(4 - ((keyNum - 1) % 4)) * 6}` : '24');
 });
 </script>
 
 <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" item-responsive :y-gap="12">
+      <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">
diff --git a/src/store/modules/log/index.ts b/src/store/modules/log/index.ts
index 7838896..778ea9e 100644
--- a/src/store/modules/log/index.ts
+++ b/src/store/modules/log/index.ts
@@ -24,17 +24,12 @@ export const useLogStore = defineStore('log', () => {
     localStg.remove('log');
   }
 
-  function getLogStg() {
-    return localStg.get('log');
-  }
-
   return {
     taskName,
     taskBatchId,
     data,
     clear,
     setTaskInfo,
-    setData,
-    getLogStg
+    setData
   };
 });
diff --git a/src/views/_builtin/log/index.vue b/src/views/_builtin/log/index.vue
index 3fa72d1..1b52465 100644
--- a/src/views/_builtin/log/index.vue
+++ b/src/views/_builtin/log/index.vue
@@ -1,10 +1,23 @@
 <script setup lang="ts">
 import { onUnmounted, ref } from 'vue';
 import { useLogStore } from '@/store/modules/log';
+import { useRouterPush } from '@/hooks/common/router';
+import { localStg } from '@/utils/storage';
 
 const store = useLogStore();
 
-const data = ref(store.getLogStg());
+const data = ref();
+const { routerPushByKey } = useRouterPush();
+
+function init() {
+  const logData = localStg.get('log');
+  if (!logData?.data) {
+    data.value = logData;
+    routerPushByKey('404');
+  }
+}
+
+init();
 
 onUnmounted(() => {
   store.clear();
@@ -12,13 +25,14 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <NCard
-    :title="`${$t('page.log.title')} ------ ${$t('page.jobBatch.jobName')}: ${data?.taskName}, ${$t('common.batchList')} ID: ${data?.taskBatchId}`"
-    :bordered="false"
-    size="small"
-    class="h-full sm:flex-1-hidden card-wrapper"
-    header-class="view-card-header"
-  >
+  <NCard :bordered="false" size="small" class="h-full sm:flex-1-hidden card-wrapper" header-class="view-card-header">
+    <template #header>
+      <span v-if="data?.taskName">
+        {{
+          `${$t('page.log.title')} ------ ${$t('page.jobBatch.jobName')}: ${data?.taskName}, ${$t('common.batchList')} ID: ${data?.taskBatchId}`
+        }}
+      </span>
+    </template>
     <LogDrawer :model-value="data?.data" :drawer="false" />
   </NCard>
 </template>
diff --git a/src/views/job/batch/modules/job-batch-search.vue b/src/views/job/batch/modules/job-batch-search.vue
index 31d2ada..01c52ab 100644
--- a/src/views/job/batch/modules/job-batch-search.vue
+++ b/src/views/job/batch/modules/job-batch-search.vue
@@ -68,11 +68,11 @@ function renderLabel(option: SelectOption) {
 </script>
 
 <template>
-  <SearchForm btn-span="24 s:24 m:9 l:12 xl:15" :model="model" @search="search" @reset="reset">
-    <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobBatch.groupName')" path="groupName" class="pr-24px">
+  <SearchForm btn-span="12 s:24 m:10 l:12 xl:16" :model="model" @search="search" @reset="reset">
+    <NFormItemGi span="24 s:12 m:8" :label="$t('page.jobBatch.groupName')" path="groupName" class="pr-24px">
       <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">
+    <NFormItemGi span="24 s:12 m:8" :label="$t('page.jobBatch.jobName')" path="jobName" class="pr-24px">
       <NAutoComplete
         v-model:value="keywords"
         :placeholder="$t('page.jobBatch.form.jobName')"
@@ -84,11 +84,11 @@ function renderLabel(option: SelectOption) {
         @select="handleSelect"
       />
     </NFormItemGi>
-    <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobBatch.taskBatchStatus')" path="taskBatchStatus" class="pr-24px">
+    <NFormItemGi span="24 s:12 m:8" :label="$t('page.jobBatch.taskBatchStatus')" path="taskBatchStatus" class="pr-24px">
       <TaskBatchStatus v-model:value="model.taskBatchStatus" clearable />
     </NFormItemGi>
     <NFormItemGi
-      span="24 s:24 m:15 l:12 xl:9"
+      span="24 s:24 m:14 l:12 xl:8"
       :label="$t('page.common.createTime')"
       path="datetimeRange"
       class="pr-24px"
diff --git a/src/views/workflow/batch/modules/workflow-batch-search.vue b/src/views/workflow/batch/modules/workflow-batch-search.vue
index 1768911..55419c9 100644
--- a/src/views/workflow/batch/modules/workflow-batch-search.vue
+++ b/src/views/workflow/batch/modules/workflow-batch-search.vue
@@ -67,12 +67,12 @@ function renderLabel(option: SelectOption) {
 </script>
 
 <template>
-  <SearchForm btn-span="24 s:24 m:9 l:12 xl:15" :model="model" @search="search" @reset="reset">
-    <NFormItemGi span="24 s:12 m:6" :label="$t('page.workflowBatch.groupName')" path="groupName" class="pr-24px">
+  <SearchForm btn-span="12 s:24 m:10 l:12 xl:16" :model="model" @search="search" @reset="reset">
+    <NFormItemGi span="24 s:12 m:8" :label="$t('page.workflowBatch.groupName')" path="groupName" class="pr-24px">
       <SelectGroup v-model:value="model.groupName" clearable />
     </NFormItemGi>
     <NFormItemGi
-      span="24 s:12 m:6"
+      span="24 s:12 m:8"
       :label="$t('page.workflowBatch.workflowName')"
       :label-width="100"
       path="workflowName"
@@ -90,7 +90,7 @@ function renderLabel(option: SelectOption) {
       />
     </NFormItemGi>
     <NFormItemGi
-      span="24 s:12 m:6"
+      span="24 s:12 m:8"
       :label="$t('page.workflowBatch.taskBatchStatus')"
       path="taskBatchStatus"
       class="pr-24px"
@@ -98,7 +98,7 @@ function renderLabel(option: SelectOption) {
       <TaskBatchStatus v-model:value="model.taskBatchStatus" clearable />
     </NFormItemGi>
     <NFormItemGi
-      span="24 s:24 m:15 l:12 xl:9"
+      span="24 s:24 m:14 l:12 xl:8"
       :label="$t('page.common.createTime')"
       path="datetimeRange"
       class="pr-24px"