From 7574acdad218f515e5cb1359d8d6438c7123ce78 Mon Sep 17 00:00:00 2001
From: Miao_Spring <539943419@qq.com>
Date: Fri, 30 Aug 2024 20:58:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=201.=E4=BC=98=E5=8C=96=E4=BA=86miaoDirect?=
 =?UTF-8?q?ory=E4=B8=AD=E5=A4=9A=E9=80=89=E7=9A=84=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=E8=A1=A8=E7=8E=B0=E3=80=822.=E5=9B=BE=E7=89=87=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E7=BB=84=E4=BB=B6=E6=96=B0=E5=A2=9E=E6=8B=96=E5=85=A5?=
 =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=96=87=E4=BB=B6/=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=B9=E7=9B=B8=E5=85=B3=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/miaoLazyDiv.vue | 62 +++++++++++++++++++++++++++++-----
 src/views/miaoDirectory.vue    | 25 ++++++++------
 src/views/miaoImages.vue       | 52 ++++++++++++++++++----------
 3 files changed, 102 insertions(+), 37 deletions(-)

diff --git a/src/components/miaoLazyDiv.vue b/src/components/miaoLazyDiv.vue
index 178c275..64bcab7 100644
--- a/src/components/miaoLazyDiv.vue
+++ b/src/components/miaoLazyDiv.vue
@@ -1,3 +1,5 @@
+<!-- 只适合用于渲染过程较为复杂的组件，不然可能得不偿失
+     这么泛用的组件，性能差点也能理解 -->
 <template>
     <div class="miao-lazy" ref="miaoLazyRoot" :style="!show ? { minHeight, minWidth } : {}">
         <slot v-if="show" />
@@ -5,13 +7,14 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref } from 'vue';
+import { onBeforeUnmount, onMounted, ref } from 'vue';
 
 const props = defineProps({
-    show: {
+    disableLazy: {
         type: Boolean,
         default: false,
     },
+    // 仅在内容未加载时生效，用于占位
     minHeight: {
         type: String,
         default: 'none',
@@ -24,26 +27,69 @@ const props = defineProps({
 
 const miaoLazyRoot = ref<HTMLDivElement>()
 
-const show = ref<boolean>(props.show === true)
+const show = ref<boolean>(props.disableLazy)
+
+const isVisible = (dom: HTMLDivElement) => {
+    const offset = dom.getBoundingClientRect().top
+    return offset > 0 && offset < 2000
+}
+
+const { showSlot, hideSlot, clearTimer } = (() => {
+    let timer: any
+    let timerInterval: any
+    const clearTimer = () => {
+        timer && clearTimeout(timer)
+        timerInterval && clearInterval(timerInterval)
+        timer = undefined
+        timerInterval = undefined
+    }
+    const hideSlot = () => {
+        clearTimer()
+        show.value = false
+    }
+    const showSlot = () => {
+        if (show.value === true) {
+            return
+        }
+        clearTimer()
+        // timer = setTimeout(() => {
+        if (!miaoLazyRoot.value || isVisible(miaoLazyRoot.value) === false) {
+            return
+        }
+        show.value = true
+        timerInterval = setInterval(() => {
+            if (show.value === false || miaoLazyRoot.value === undefined) {
+                return
+            }
+            if (isVisible(miaoLazyRoot.value) === false) {
+                hideSlot()
+            }
+        }, 1000)
+        // })
+    }
+    return { showSlot, hideSlot, clearTimer }
+})()
 
 onMounted(() => {
     if (show.value === false) {
         let options = {
-            root: null, // 默认为视窗
-            rootMargin: '0px', // 视窗的外边距
-            threshold: 0.1 // 目标元素可见比例达到 10% 时触发回调
+            threshold: 0
         };
 
         let observer: IntersectionObserver | undefined = new IntersectionObserver((entries) => {
             if (entries[0].isIntersecting) {
-                show.value = true
+                showSlot()
                 // miaoLazyRoot.value && observer?.unobserve(miaoLazyRoot.value)
                 // observer = undefined
             } else {
-                show.value = false
+                hideSlot()
             }
         }, options);
         miaoLazyRoot.value && observer.observe(miaoLazyRoot.value);
     }
 })
+
+onBeforeUnmount(() => {
+    clearTimer()
+})
 </script>
\ No newline at end of file
diff --git a/src/views/miaoDirectory.vue b/src/views/miaoDirectory.vue
index d02132a..b13708d 100644
--- a/src/views/miaoDirectory.vue
+++ b/src/views/miaoDirectory.vue
@@ -42,8 +42,8 @@
             }">
                 <n-scrollbar ref="scrollbarRef">
                     <transition-group name="dirItem">
-                        <miao-lazy-div v-for="(dir, index) in showData_directory" :key="dir.uid" :show="index < 20"
-                            min-height="50px">
+                        <miao-lazy-div v-for="(dir, index) in showData_directory" :key="dir.uid"
+                            :disableLazy="index < 20" min-height="50px">
                             <miaoDirectoryItem :item="dir" :color="props.color" :selectedItem="selectedItem.value"
                                 @delete="handleItemDelete(dir)" @click="handleItemClick(dir)"
                                 @drag-start="handleItemDragStart" @rename="handleItemRename(dir)"
@@ -51,7 +51,7 @@
                         </miao-lazy-div>
                     </transition-group>
                     <transition-group name="dirItem">
-                        <miao-lazy-div v-for="(file, index) in showData_files" :key="file.uid" :show="index < 20"
+                        <miao-lazy-div v-for="(file, index) in showData_files" :key="file.uid" :disableLazy="index < 20"
                             min-height="50px">
                             <miaoDirectoryItem :item="file" :color="props.color" :selectedItem="selectedItem.value"
                                 @click="handleItemClick(file)" @download="handleItemDownload(file)"
@@ -158,12 +158,13 @@ class SelectedItem {
     }
     // 保证内容仍然存在于dir中且各个元素不重复
     get value() {
+        const _filterList = [...(currentDirectory.value?.directories ?? []), ...(currentDirectory.value?.files ?? [])]
         return uniq(this._selectedItem).filter(v => {
             if (currentDirectory.value === undefined) {
                 return false
             }
             // @ts-ignore
-            return [...currentDirectory.value?.directories, ...currentDirectory.value?.files].includes(v)
+            return _filterList.includes(v)
         })
     }
 }
@@ -221,14 +222,16 @@ const setCurrentDirectory = async (virtualDirectory: VirtualDirectory) => {
     } else {
         virtualDirectory.update()
     }
-    currentDirectories.value[0] !== virtualDirectory && selectedItem.clear()
-    currentDirectories.value[0] = virtualDirectory
-    nextTick(() => {
-        scrollbarRef.value.scrollTo({
-            top: 0,
-            behavior: "instant"
+    if (currentDirectories.value[0] !== virtualDirectory) {
+        selectedItem.clear()
+        nextTick(() => {
+            scrollbarRef.value.scrollTo({
+                top: 0,
+                behavior: "instant"
+            })
         })
-    })
+    }
+    currentDirectories.value[0] = virtualDirectory
 }
 
 const reload = () => {
diff --git a/src/views/miaoImages.vue b/src/views/miaoImages.vue
index d3c9e95..06f7408 100644
--- a/src/views/miaoImages.vue
+++ b/src/views/miaoImages.vue
@@ -1,30 +1,33 @@
 <template>
-    <div class="miaoImage" ref="rootRef">
-        <n-scrollbar ref="NScrollbarRef">
-            <div class="miaoImage-container">
-                <div class="miaoImage-container-row" v-for="(src, index) in imageSrcList" :key="index">
-                    <img :src="src" class="miaoImage-container-row-image" loading="lazy"
-                        :class="activeImageIndex === index ? 'miaoImage-container-row-image-active' : ''"
-                        @click="activeImageIndex = index" draggable="false" />
+    <miao-drop-handler @on-virtual-directory="handleDrop" @on-virtual-files="handleDrop">
+        <div class="miaoImage" ref="rootRef">
+            <n-scrollbar ref="NScrollbarRef">
+                <div class="miaoImage-container">
+                    <div class="miaoImage-container-row" v-for="(src, index) in imageSrcList" :key="index">
+                        <img :src="src" class="miaoImage-container-row-image" loading="lazy"
+                            :class="activeImageIndex === index ? 'miaoImage-container-row-image-active' : ''"
+                            @click="activeImageIndex = index" />
+                    </div>
                 </div>
-            </div>
-        </n-scrollbar>
-        <miao-mask :show="activeImageIndex !== -1" @click="activeImageIndex = -1" class="miaoImage-mask">
-            <ChevronBack class="miaoImage-mask-btn miaoImage-mask-btn-back" @click="handleActiveImageIndexBack" />
-            <img :src="imageSrcList[activeImageIndex]" class="miaoImage-mask-active" @click="e => e.stopPropagation()"
-                draggable="false">
-            <ChevronForward class="miaoImage-mask-btn miaoImage-mask-btn-forward"
-                @click="handleActiveImageIndexForward" />
-        </miao-mask>
-    </div>
+            </n-scrollbar>
+            <miao-mask :show="activeImageIndex !== -1" @click="activeImageIndex = -1" class="miaoImage-mask">
+                <ChevronBack class="miaoImage-mask-btn miaoImage-mask-btn-back" @click="handleActiveImageIndexBack" />
+                <img :src="imageSrcList[activeImageIndex]" class="miaoImage-mask-active"
+                    @click="e => e.stopPropagation()" draggable="false">
+                <ChevronForward class="miaoImage-mask-btn miaoImage-mask-btn-forward"
+                    @click="handleActiveImageIndexForward" />
+            </miao-mask>
+        </div>
+    </miao-drop-handler>
 </template>
 
 <script setup lang="ts">
+import miaoMask from '@/components/miaoMask.vue';
+import miaoDropHandler from '@/components/miaoDropHandler.vue';
 import VirtualDirectory, { VirtualFile } from '@/class/VirtualDirectory'
 import { uniq } from 'lodash';
 import { nextTick, onMounted, ref } from 'vue'
 import { NScrollbar } from 'naive-ui';
-import miaoMask from '@/components/miaoMask.vue';
 import { ChevronBack, ChevronForward } from '@vicons/ionicons5'
 
 const imageSuffixList = [
@@ -82,6 +85,19 @@ const handleActiveImageIndexForward = (e: any) => {
     nextTick(scrollToActiveImage)
 }
 
+const handleDrop = (vItems: (VirtualFile | VirtualDirectory)[]) => {
+    if (vItems[0].type === 'directory') {
+        // @ts-ignore
+        currentDirectories.value = [...currentDirectories.value, ...vItems]
+    } else {
+        // @ts-ignore
+        currentFiles.value = [...currentFiles, ...vItems]
+    }
+    vItems.forEach(v => {
+        updateImageSrcList(v)
+    })
+}
+
 const updateImageSrcList = async (source: VirtualFile | VirtualDirectory) => {
     let srcList: string[]
     if (source.type === 'directory') {