From f94990614c648bd21321a80b4a5fa71c882f3d82 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Tue, 18 Jun 2024 17:41:42 +0800
Subject: [PATCH] =?UTF-8?q?style(sj=5F1.1.0=5Fbeta1):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=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                      | 7 ++++---
 src/plugins/loading.ts                                     | 2 +-
 src/views/workflow/batch/modules/workflow-batch-search.vue | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/common/search-form.vue b/src/components/common/search-form.vue
index d4ba9b4..81ddaa6 100644
--- a/src/components/common/search-form.vue
+++ b/src/components/common/search-form.vue
@@ -41,15 +41,16 @@ async function search() {
 }
 
 const btnSpan = computed(() => {
-  const keyNum = Object.keys(props.model).length - 2;
-  return props.btnSpan || `24 m:12 m:${(4 - (keyNum % 4)) * 6}`;
+  const keyNum = Object.keys(props.model).length - 1;
+
+  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="8">
+      <NGrid responsive="screen" 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/plugins/loading.ts b/src/plugins/loading.ts
index 731f896..4b6dfa7 100644
--- a/src/plugins/loading.ts
+++ b/src/plugins/loading.ts
@@ -18,7 +18,7 @@ export function setupLoading() {
     'right-0 bottom-0 animate-delay-1500'
   ];
 
-  const logoWithClass = systemLogo.replace('<svg', `<svg class="size-158px text-primary"`);
+  const logoWithClass = systemLogo.replace('<svg', `<svg class="size-158px fill-primary"`);
 
   const dot = loadingClasses
     .map(item => {
diff --git a/src/views/workflow/batch/modules/workflow-batch-search.vue b/src/views/workflow/batch/modules/workflow-batch-search.vue
index 0ce59d5..17ba4ec 100644
--- a/src/views/workflow/batch/modules/workflow-batch-search.vue
+++ b/src/views/workflow/batch/modules/workflow-batch-search.vue
@@ -38,7 +38,7 @@ groupNameUpdate('');
 </script>
 
 <template>
-  <SearchForm :model="model" @search="search" @reset="reset">
+  <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">
       <SelectGroup v-model:value="model.groupName" @update:value="groupNameUpdate" />
     </NFormItemGi>