From 7eb47bd54b07fb897b5e5f63f4b506e29a1adda8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E9=9B=A8=E7=BF=94?= <1372201820@qq.com> Date: Tue, 6 Sep 2022 14:48:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E6=8B=96=E6=8B=BD=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=BB=84=E4=BB=B6dragover+=E9=98=B2=E6=8A=96=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E5=86=85=E6=A0=B7=E5=BC=8F=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/components/src/upload/dragger.vue | 30 ++++++++++++---------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/packages/components/src/upload/dragger.vue b/packages/components/src/upload/dragger.vue index 41bba50..03c68ea 100644 --- a/packages/components/src/upload/dragger.vue +++ b/packages/components/src/upload/dragger.vue @@ -15,7 +15,9 @@ import Icon from '../Icon/icon.vue' const emits = defineEmits(['getFilesList', 'fileUpload']) const fileArea = ref() const isEnter = ref(false) +const timer = ref(null); const filesList = ref([]) + onMounted(() => { fileArea.value.addEventListener('drop', (e: any) => { e.preventDefault() @@ -23,19 +25,21 @@ onMounted(() => { emits('getFilesList', filesList.value) }, false) - fileArea.value.addEventListener('dragover', (e: Event) => { - e.preventDefault(); + fileArea.value.addEventListener('dragover', onDragover, false); +}) - }, false) - fileArea.value.addEventListener('dragenter', (e: Event) => { - isEnter.value = true - e.preventDefault(); +const onDragover = (e:Event) => { + isEnter.value = true; + // dragover+防抖代替dragenter和dragleave,因为dragleave进入子元素也会触发 + if (timer.value !== null) { + clearTimeout(timer.value); + } + timer.value = setTimeout(() => { + isEnter.value = false; + timer.value = null; + }, 100); - }, false) - fileArea.value.addEventListener('dragleave', (e: Event) => { - isEnter.value = false - e.preventDefault(); - - }, false) -}) + e.stopPropagation(); + e.preventDefault(); +}; \ No newline at end of file -- Gitee From 5d4e1fb3592bd70d2cf31f8f053d1fa52f33ede5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=BF=AA=E7=94=9F?= <2046353594@qq.com> Date: Tue, 6 Sep 2022 18:22:02 +0800 Subject: [PATCH 2/2] publish: 3.0.11 --- packages/components/src/upload/dragger.vue | 28 ++++++++++----------- packages/components/transitpkg/package.json | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/components/src/upload/dragger.vue b/packages/components/src/upload/dragger.vue index 03c68ea..2e5a8df 100644 --- a/packages/components/src/upload/dragger.vue +++ b/packages/components/src/upload/dragger.vue @@ -1,11 +1,11 @@