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) => {
移除可疑文件夹
-
+
批量审批
- + diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue index f03a7bf..0d1308a 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 @@ -1183,6 +1184,7 @@ defineExpose({ } .grid{ + padding-top: 3px; grid-gap: 10px 10px; }