feat: 修改bug

src/layout/components/Header/RecycleModal.vue

@@ -7,7 +7,7 @@ import { dubiousfilelist, removeFiles } from '@/api/task/task'
 import { viewOptions } from '@/config/home'
 import { useInfiniteScroll } from '@vueuse/core'
 import imagesloaded from 'imagesloaded'
-import { debounce } from 'lodash-es'
+import { debounce, cloneDeep } from 'lodash-es'
 
 import { audit } from '@/api/task/task'
 import NotPassed from '@/components/Approval/NotPassed.vue'
@@ -103,6 +103,7 @@ const layout = debounce(() => {
     const top = scrollHeight - clientHeight - 20
     el.value!.scrollTo({ top, behavior: 'instant' })
     loading = false
+    console.log("loading---------------", loading);
   })
 }, 300)
 
@@ -145,10 +146,11 @@ async function featchList() {
 }
 
 async function loadMore() {
+  console.log("执行l------------------------", loading, el.value);
   if (loading || el.value == null)
     return
 
-  loading = true
+  // loading = true
   const more = await featchList()
   listData.value.push(...more)
 }
@@ -156,7 +158,7 @@ async function loadMore() {
 onUpdated(() => {
   if(startCalTime) {
     endTime = new Date().getTime();
-    if(endTime - startTime > 1000) {
+    if(endTime - startTime > 500) {
       createDom()
     }
   }else {
@@ -178,7 +180,6 @@ let selectionBox: HTMLDivElement | null
 const selectIds = ref<string[]>([])
 
 function downHandler(event: MouseEvent) {
-  console.log("downHandler-------------------", event);
   startTime = new Date().getTime();
   startCalTime = true;
   if (!selectionBox)
@@ -208,22 +209,27 @@ function imUpdateSelectIds(x: number, y: number, w: number, h: number) {
       index === -1 && selectIds.value.push(item.dataset.id!)
     else index !== -1 && selectIds.value.splice(index, 1)
 
-    let tempApproveIndex = -1;
-    selectedApproveItems.value.map((approveItem, approveIndex) => {
-      if(approveItem.dataset.id == item.dataset.id) {
-        tempApproveIndex = approveIndex;
-      }
-    })
-    if (tempApproveIndex === -1 && item.className.indexOf('grid-item-selected') != -1) {
-      selectedApproveItems.value.push(item)
-    } else {
-      selectedApproveItems.value.splice(tempApproveIndex, 1);
-    }
+    // let tempApproveIndex = -1;
+    // selectedApproveItems.value.map((approveItem, approveIndex) => {
+    //   console.log("approveItem and item", approveItem, item );
+    //   if(approveItem.selfId == item.dataset.id) {
+    //     tempApproveIndex = approveIndex;
+    //   }
+    // })
+    // if (tempApproveIndex === -1 && item.className.indexOf('grid-item-selected') != -1) {
+    //   let tempItem: any = cloneDeep(item);
+    //   tempItem.selfId = item.dataset.id;
+    //   selectedApproveItems.value.push(tempItem)
+    // } else {
+    //   selectedApproveItems.value.splice(tempApproveIndex, 1);
+    // }
   })
+  selectedApproveItems.value = [];
   // 选中复选框
   listData.value.map(item => {
     if(selectIds.value.includes(String(item.pictureId))) {
       item.checked = true;
+      selectedApproveItems.value.push(item);
     }
   });
 
@@ -238,7 +244,7 @@ function isSelected(pictureId: number) {
 function moveHandler(e: MouseEvent) {
   if(startCalTime) {
     endTime = new Date().getTime();
-    if(endTime - startTime > 1000) {
+    if(endTime - startTime > 500) {
       createDom()
     }
   }else {
@@ -282,8 +288,7 @@ function removeDom() {
 function upHandler(event: MouseEvent) {
   endTime = new Date().getTime();
   startCalTime = false;
-  console.log("upHandle--------------------", startTime, endTime);
-  if(endTime - startTime > 1000) {
+  if(endTime - startTime > 500) {
     createDom()
   }else {
     removeDom()
@@ -300,7 +305,6 @@ function upHandler(event: MouseEvent) {
     selectIds.value = []
     selectedApproveItems.value.forEach((item) => (item.checked = false));
     selectedApproveItems.value.length = 0;
-    console.log("11111111111111", event, selectionBox.style);
     listData.value.map(item => {
       item.checked = false;
     });
@@ -374,6 +378,7 @@ async function onChange() {
   pagination.pageNo = 1
   const list = await featchList()
   listData.value = list
+  layout()
 }
 
 async function onChangeView() {
@@ -389,6 +394,7 @@ async function onChangeView() {
   pagination.pageNo = 1
   const list = await featchList()
   listData.value = list
+  layout()
 }
 
 function closeModal(event: MouseEvent) {
@@ -407,6 +413,7 @@ async function commit() {
   }
 }
 function remove() {
+  // console.log("finally-selectedApproveItems------------", selectedApproveItems.value);
   if (!selectIds.value || selectIds.value.length === 0) {
     message.error('至少选中一个')
     return
@@ -457,7 +464,6 @@ function onCheckChange(checked: any, item: any) {
   setTimeout(() => {
     nextTick(() => {
       batch.value = true
-      console.log("2222222222222222222");
     })
   }, 100)
 }
@@ -469,12 +475,14 @@ function rejectHandler() {
 
 function reset() {
   batch.value = false;
-  pagination.pageNo = 1;
+  // pagination.pageNo = 1;
+  pagination.pageNo = 0;
   pagination.pageSize = 20;
   selectIds.value = [];
   selectedApproveItems.value.length = 0;
   loading = false;
   canloadMore = true;
+  layout();
 }
 function validate(items: any[]) {
   if (items.length === 0) return "至少选中一个任务";
@@ -547,7 +555,7 @@ async function refreshHandler(filtersearchId?: any) {
   reset()
   const list = await featchList()
   listData.value = list
-  layout()
+  // layout()
 // 注释 rao end
   // reset();
 
@@ -555,30 +563,19 @@ async function refreshHandler(filtersearchId?: any) {
   //   filterId = filtersearchId;
   // }
 
-  // nextTick(() => {
-  //   setTimeout(() => {
-  //     useInfiniteScroll(
-  //       el as any,
-  //       () => {
-  //         loadMore();
-  //       },
-  //       { distance: 10, canLoadMore: () => canloadMore }
-  //     );
-  //   }, 300);
-  // });
-}
-
-function previewHandler(index: number, event: MouseEvent) {
-  console.log("imageRef.value?.[index]", imageRef.value?.[index]);
-  // event.stopImmediatePropagation();
-  // event.stopPropagation();
-  if (imageRef.value?.[index] && (imageRef.value[index] as any).src)
-    (imageRef.value?.[index] as any).click();
+  nextTick(() => {
+    setTimeout(() => {
+      useInfiniteScroll(
+        el as any,
+        () => {
+          loadMore();
+        },
+        { distance: 10, canLoadMore: () => canloadMore }
+      );
+    }, 300);
+  });
 }
 
-function showjjj (e) {
-  console.log("showjjj------------------", e);
-}
 </script>
 
 <template>
@@ -907,7 +904,8 @@ function showjjj (e) {
 
     .scroll {
       overflow-y: auto;
-      height: calc(100vh - 282px);
+      // height: calc(100vh - 282px);
+      height: 800px;
       margin-left: 20px;
     }
   }