From f1fd15a6955d1f6deac58f61076dfecb3bd87089 Mon Sep 17 00:00:00 2001
From: raoyongjun <2641346316@qq.com>
Date: Thu, 9 May 2024 14:38:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/content/Content.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index f03a7bf..ac26c7d 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -227,6 +227,7 @@ watch(() => collapse.value, (newVal, oldVal) => {
 
 const asideLoadMore = debounce(() => {
   console.log('加载了这里首页的数据--------------------')
+  reset()
   loadMore()
 }, 400)
 
@@ -241,7 +242,7 @@ watch(
       // listData.value = more
       // isInitSeaerch.value = false
       // // configStore.setSearchValue("");
-      reset()
+      // reset()
       // loadMore()
       asideLoadMore()
       isInitSeaerch.value = false
@@ -264,7 +265,7 @@ watch(
   async (newVal, oldVal) => {
     // console.log('configStore.getAsideValue首页变化了啊', newVal, oldVal, Object.entries(newVal).toString() === Object.entries(oldVal).toString(), pagination.pageNo)
     if (pagination.pageNo > 1 && newVal && !(Object.entries(newVal).toString() === Object.entries(oldVal).toString())) {
-      reset()
+      // reset()
       asideLoadMore()
     }
   },
@@ -360,7 +361,7 @@ async function featchList(userSearchId?: string) {
 }
 
 async function loadMore() {
-  console.log('loadMore加兹安pagination.pageNo----------------', pagination.pageNo)
+  console.log('loadMore首页pagination.pageNo----------------', pagination.pageNo)
   if (loading.value || el.value == null)
     return
   canloadMore = false
@@ -368,7 +369,7 @@ async function loadMore() {
   more.forEach((item) => {
     item.calHeight = 182 * item.high / item.wide
   })
-  console.log('loadMore加载后的pagination.pageNo----------------', pagination.pageNo)
+  console.log('loadMore加载后首页的pagination.pageNo----------------', pagination.pageNo)
   // listData.value.push(...more)
   if (pagination.pageNo <= 1) {
     listData.value = []
@@ -595,7 +596,7 @@ function reset(val?) {
 }
 
 async function refreshHandler(filtersearchId?: any) {
-  reset(true)
+  // reset(true)
 
   if (filtersearchId)
     filterId = filtersearchId

From 397b700a49862dfbb0dcd6a2710290d4b0af28e8 Mon Sep 17 00:00:00 2001
From: raoyongjun <2641346316@qq.com>
Date: Fri, 10 May 2024 18:14:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/RecycleModal.vue | 14 +++++++++-----
 src/views/home/content/Content.vue            |  1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue
index 18be55a..bd9a441 100644
--- a/src/layout/components/Header/RecycleModal.vue
+++ b/src/layout/components/Header/RecycleModal.vue
@@ -506,13 +506,17 @@ function remove() {
   confrimModalRef?.value?.showModal()
 }
 
-function setBatch(value) {
+function setBatch(value, isUpdate?) {
+  console.log('执行了设置夸勾选-------------')
   if (value && batch.value)
     batch.value = !value
   else
     batch.value = value
-  // waterfallRef.value?.resize()
-  updateHtml()
+  if (!isUpdate)
+    updateHtml()
+  else
+    waterfallRef.value?.resize()
+
   if (value === false) {
     selectIds.value = []
     selectedApproveItems.value.forEach(item => (item.checked = false))
@@ -756,12 +760,12 @@ watch(() => show.value, async (newVal) => {
                 <div class="remove" @click="remove">
                   移除可疑文件夹
                 </div>
-                <div v-show="!showActions" class="wrapper-content-form-button" @click="setBatch(true)">
+                <div v-show="!showActions" class="wrapper-content-form-button" @click="setBatch(true, true)">
                   <SvgIcon style="margin-right: 6px;" size="14" name="tf" />
                   批量审批
                 </div>
                 <div v-show="showActions" class="batch">
-                  <n-button text style="margin-left: 20px;" @click="setBatch(false)">
+                  <n-button text style="margin-left: 20px;" @click="setBatch(false, true)">
                     <template #icon>
                       <SvgIcon name="revoke" />
                     </template>
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index ac26c7d..0d1308a 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -1184,6 +1184,7 @@ defineExpose({
     }
 
     .grid{
+      padding-top: 3px;
       grid-gap: 10px 10px;
     }