From 73ad5f8f644aa7e66a8b8ce8f3384e89d98c8cdb Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Tue, 2 Apr 2024 18:17:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=85=A7=E7=89=87?= =?UTF-8?q?=E5=A2=99=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=8F=AF?= =?UTF-8?q?=E7=96=91=E6=96=87=E4=BB=B6=E5=A4=B9=E5=A4=9A=E9=80=89=E5=88=A0?= =?UTF-8?q?=E9=99=A4id=E9=94=99=E8=AF=AF=E5=A4=B1=E8=B4=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Header/RecycleModal.vue | 12 +- src/views/worksheet/components/PhotoWall.vue | 491 ++++++++++++++++++ 2 files changed, 497 insertions(+), 6 deletions(-) create mode 100644 src/views/worksheet/components/PhotoWall.vue diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue index d3a551e..c5e7fe5 100644 --- a/src/layout/components/Header/RecycleModal.vue +++ b/src/layout/components/Header/RecycleModal.vue @@ -173,15 +173,14 @@ function imUpdateSelectIds(x: number, y: number, w: number, h: number) { items.forEach((item: HTMLDivElement) => { const rect = item.getBoundingClientRect() const index = selectIds.value.indexOf(item.dataset.id!) - if (rect.right > x && rect.bottom > y && rect.left < x + w && rect.top < y + h) index === -1 && selectIds.value.push(item.dataset.id!) else index !== -1 && selectIds.value.splice(index, 1) }) } -function isSelected(id: number) { - return selectIds.value.includes(String(id)) +function isSelected(pictureId: number) { + return selectIds.value.includes(String(pictureId)) } function moveHandler(e: MouseEvent) { @@ -241,6 +240,7 @@ onMounted(() => { async function showModal() { show.value = true + reset() pagination.pageNo = 1 const list = await featchList() listData.value = list @@ -296,7 +296,6 @@ defineExpose({ const notPassModalRef = ref(null) const showActions = computed(() => { - console.log('selectedApproveItems', selectedApproveItems) return selectedApproveItems.value.length > 0 && batch; }); @@ -318,6 +317,7 @@ function reset() { batch.value = false; pagination.pageNo = 1; pagination.pageSize = 20; + selectIds.value = []; selectedApproveItems.value.length = 0; loading = false; canloadMore = true; @@ -457,8 +457,8 @@ async function refreshHandler() {