From e1aef477cb3d1c2a767e3c8e2c74c8da21f95e90 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Tue, 4 Jun 2024 15:44:56 +0800
Subject: [PATCH] =?UTF-8?q?style(sj=5F1.0.0=5Fbeta4):=20=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=8C=89=E9=92=AE=E5=8F=B3=E9=9D=A0=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/search-form.vue | 9 +++++++--
 src/views/user/manager/index.vue      | 3 +--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/common/search-form.vue b/src/components/common/search-form.vue
index 16ef179..991299e 100644
--- a/src/components/common/search-form.vue
+++ b/src/components/common/search-form.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref } from 'vue';
+import { computed, ref } from 'vue';
 import { $t } from '@/locales';
 import { useAppStore } from '@/store/modules/app';
 import { useNaiveForm } from '@/hooks/common/form';
@@ -38,6 +38,11 @@ async function search() {
   Object.assign(props.model, { ...props.model, page: 1 });
   emit('search');
 }
+
+const btnSpan = computed(() => {
+  const keyNum = Object.keys(props.model).length - 2;
+  return `24 m:12 m:${(4 - (keyNum % 4)) * 6}`;
+});
 </script>
 
 <template>
@@ -45,7 +50,7 @@ async function search() {
     <NForm ref="formRef" :model="model" label-placement="left" :label-width="80" :show-feedback="appStore.isMobile">
       <NGrid responsive="screen" item-responsive :y-gap="5">
         <slot></slot>
-        <NFormItemGi :y-gap="8" span="24 m:12 m:6" class="pr-24px lg:p-t-0 md:p-t-16px">
+        <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>
diff --git a/src/views/user/manager/index.vue b/src/views/user/manager/index.vue
index b25e04e..c9b665e 100644
--- a/src/views/user/manager/index.vue
+++ b/src/views/user/manager/index.vue
@@ -25,8 +25,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     size: 10,
     // if you want to use the searchParams in Form, you need to define the following properties, and the value is null
     // the value can not be undefined, otherwise the property in Form will not be reactive
-    username: null,
-    role: null
+    username: null
   },
   columns: () => [
     {