From 0910b25915cd47cfb5e61dd7382223eac4240d9c Mon Sep 17 00:00:00 2001
From: keno-lee <keno.lee@foxmail.com>
Date: Fri, 11 Oct 2024 19:28:25 +0800
Subject: [PATCH] 1.5.2

---
 docs/demos/tree/Drag.vue       |  24 ++----
 package.json                   |   2 +-
 src/VirtGrid.tsx               |   1 +
 src/components/tree/useDrag.ts | 148 +++++++++++++++++++++------------
 4 files changed, 107 insertions(+), 68 deletions(-)

diff --git a/docs/demos/tree/Drag.vue b/docs/demos/tree/Drag.vue
index 96b4f6c..cd6a949 100644
--- a/docs/demos/tree/Drag.vue
+++ b/docs/demos/tree/Drag.vue
@@ -54,23 +54,17 @@ function onDragstart() {
 }
 
 function onDragEnd(data: any) {
-  console.log('onDragend', data);
   if (data) {
-    const { node, prevNode, parentNode } = data;
-    console.log('node', node);
-    console.log('prevNode', prevNode);
-    console.log('parentNode', parentNode);
+    console.log('drag success', data);
+    // const { node, prevNode, parentNode } = data;
+    // console.log('drag node', node);
+    // console.log('target prevNode', prevNode);
+    // console.log('target parentNode', parentNode);
+  } else {
+    console.warn('drag fail: Invalid');
   }
 }
 
-function onBeforeDrag(data: any) {
-  console.log('onDragMove', data);
-  if (data.placement === 'center' && data.node.data.id === 3) {
-    return false;
-  }
-  return true;
-}
-
 const draggable = ref(true);
 
 // setTimeout(() => {
@@ -96,18 +90,18 @@ const expandedKeys = ref<number[]>([1, 100, 102]);
         v-model:expandedKeys="expandedKeys"
         :list="list"
         :fieldNames="customFieldNames"
-        :indent="28"
+        :indent="16"
         :iconSize="14"
         :filter-method="filterMethod"
         :itemGap="4"
         :draggable="draggable"
-        :beforeDrag="onBeforeDrag"
         @dragstart="onDragstart"
         @dragend="onDragEnd"
         dragOnly
         dragGhostClass="drag-ghost-class"
         dragClass="drag-class"
         expandOnClickNode
+        default-expand-all
       >
         <template #empty>
           <div style="padding: 16px">暂无数据</div>
diff --git a/package.json b/package.json
index 1ac4f56..e7866f4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-virt-list",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "Tiny & Virtual scroll list & Huge amount data & High performance (support vue2.x&vue3.x)",
   "author": "keno-lee",
   "license": "MIT",
diff --git a/src/VirtGrid.tsx b/src/VirtGrid.tsx
index 0f312ca..bf1a41f 100644
--- a/src/VirtGrid.tsx
+++ b/src/VirtGrid.tsx
@@ -24,6 +24,7 @@ const VirtGrid = defineComponent({
     const gridList: Ref<{ _id: number; children: any[] }[]> = shallowRef([]);
 
     function updateList() {
+      if (props.gridItems === 0) return;
       // reset gridList
       const list = [];
       for (let i = 0; i < props.list.length; i += props.gridItems) {
diff --git a/src/components/tree/useDrag.ts b/src/components/tree/useDrag.ts
index 801017e..99ad63c 100644
--- a/src/components/tree/useDrag.ts
+++ b/src/components/tree/useDrag.ts
@@ -37,6 +37,9 @@ export const useDrag = ({
   let startY = 0;
   let initialX = 10;
   let initialY = 10;
+  // 鼠标位置
+  let mouseX = 0;
+  let mouseY = 0;
   // 是否是一个有效的拖拽
   let dragEffect = false;
   // 拖拽线前后元素的最小层级，用来生成层级分段
@@ -86,6 +89,7 @@ export const useDrag = ({
 
   // 找到目标元素 virt-tree-item
   let scrollElementRect: DOMRect | undefined = undefined;
+  let clientElementRect: DOMRect | undefined = undefined;
 
   const dragBox = document.createElement('div');
   dragBox.classList.add('virt-tree-drag-box');
@@ -108,23 +112,29 @@ export const useDrag = ({
     event.preventDefault();
     event.stopPropagation();
 
+    const clientElement = virtListRef.value?.$el;
+    clientElementRect = clientElement?.getBoundingClientRect();
+    scrollElement = getScrollParentElement(clientElement);
+    scrollElementRect = scrollElement?.getBoundingClientRect();
+    // console.log('scrollElement', scrollElement);
+
+    scrollElement?.addEventListener('scroll', onScroll);
     document.addEventListener('mousemove', onMousemove);
     document.addEventListener('mouseup', onMouseup);
     document.addEventListener('keydown', onKeydown);
   }
 
+  function onScroll() {
+    if (dragging.value) {
+      dragProcess();
+    }
+  }
+
   function dragstart() {
     if (!sourceTreeItem) return;
-    // 拿到treeNode后生成一个一样的元素用来拖拽
-    const clientElement = virtListRef.value?.$el;
-    scrollElement = getScrollParentElement(clientElement);
-    scrollElementRect = scrollElement?.getBoundingClientRect();
-    // console.log('scrollElement', scrollElement);
-
     // 找到目标元素的virt-tree-node，判断是否展开状态，如果是，则定时1s后折叠
     // 数据&交互处理
     const nodeKey = sourceTreeItem?.dataset?.id ?? '';
-    // if (treeInfo && nodeKey) {
     sourceNode = getTreeNode(nodeKey);
     if (!sourceNode) return;
 
@@ -161,29 +171,64 @@ export const useDrag = ({
 
     return cloneTreeItem;
   }
-  function onMousemove(event: MouseEvent) {
-    if (!cloneTreeItem) {
-      dragstart();
-    }
-    if (!cloneTreeItem) return;
 
-    dragging.value = true;
+  // 自动滚动
+  function autoScroll() {
+    if (scrollElement !== null && scrollElementRect !== undefined) {
+      // 每次先清除旧定时器
+      if (autoScrollTimer) {
+        clearInterval(autoScrollTimer);
+        autoScrollTimer = null;
+      }
+      // 判断是否在可视区域
+      if (clientElementRect) {
+        if (
+          mouseX < clientElementRect.left ||
+          mouseX > clientElementRect.right ||
+          mouseY < clientElementRect.top ||
+          mouseY > clientElementRect.bottom
+        ) {
+          return;
+        }
+      }
+      // 4等分
+      const equalPart = scrollElementRect.height / 4;
+      const multiple = 20;
+      if (
+        scrollElementRect.top < mouseY &&
+        mouseY < scrollElementRect.top + equalPart
+      ) {
+        const relative =
+          (1 - (mouseY - scrollElementRect.top) / equalPart) * multiple;
+        if (!autoScrollTimer) {
+          autoScrollTimer = setInterval(() => {
+            scrollElement!.scrollTop -= relative;
+          }, 10);
+        }
+      } else if (
+        scrollElementRect.top + equalPart * 3 < mouseY &&
+        mouseY < scrollElementRect.bottom
+      ) {
+        const relative =
+          ((mouseY - (scrollElementRect.top + equalPart * 3)) / equalPart) *
+          multiple;
+        if (!autoScrollTimer) {
+          autoScrollTimer = setInterval(() => {
+            scrollElement!.scrollTop += relative;
+          }, 10);
+        }
+      }
+    }
+  }
 
-    const clientX = event.clientX;
-    const clientY = event.clientY;
-    const dx = clientX - startX;
-    const dy = clientY - startY;
-    cloneTreeItem.style.left = `${initialX + dx}px`;
-    cloneTreeItem.style.top = `${initialY + dy}px`;
-    const clientElement = virtListRef.value?.$el;
-    const clientElementRect = clientElement?.getBoundingClientRect();
+  function dragProcess() {
+    // 判断是否在可视区域，不在则移除
     if (clientElementRect) {
-      // 不在可视区域，移除
       if (
-        clientX < clientElementRect.left ||
-        clientX > clientElementRect.right ||
-        clientY < clientElementRect.top ||
-        clientY > clientElementRect.bottom
+        mouseX < clientElementRect.left ||
+        mouseX > clientElementRect.right ||
+        mouseY < clientElementRect.top ||
+        mouseY > clientElementRect.bottom
       ) {
         // 移除 line
         if (hasStyleTreeItem?.contains(dragLine)) {
@@ -199,32 +244,10 @@ export const useDrag = ({
       }
     }
 
-    if (scrollElement && scrollElementRect) {
-      // 自动滚动
-      if (clientY > scrollElementRect.bottom) {
-        if (!autoScrollTimer) {
-          autoScrollTimer = setInterval(() => {
-            scrollElement!.scrollTop += 2;
-          }, 10);
-        }
-      } else if (clientY < scrollElementRect.top) {
-        if (!autoScrollTimer) {
-          autoScrollTimer = setInterval(() => {
-            scrollElement!.scrollTop -= 2;
-          }, 10);
-        }
-      } else {
-        if (autoScrollTimer) {
-          clearInterval(autoScrollTimer);
-          autoScrollTimer = null;
-        }
-      }
-    }
-
-    const hoverElement = document.elementFromPoint(clientX, clientY);
+    // 获取hover元素
+    const hoverElement = document.elementFromPoint(mouseX, mouseY);
     if (!hoverElement) return;
     hoverTreeItem = findAncestorWithClass(hoverElement, 'virt-tree-item');
-
     if (!hoverTreeItem) {
       return;
     }
@@ -252,7 +275,6 @@ export const useDrag = ({
 
     const elementTop = hoverTreeItemRect.top;
     const elementHeight = hoverTreeItemRect.height;
-    const mouseY = event.clientY;
     // 鼠标相对于元素顶部的距离
     const relativeY = mouseY - elementTop;
     // 计算鼠标相对于元素高度的比例
@@ -408,7 +430,7 @@ export const useDrag = ({
 
     if (placement !== 'center') {
       // 需要减去第一个indent
-      const relativeX = clientX - hoverTreeItemRect.left - props.indent;
+      const relativeX = mouseX - hoverTreeItemRect.left - props.indent;
       targetLevel = Math.ceil(relativeX / props.indent);
       if (targetLevel <= minLevel) targetLevel = minLevel;
       if (targetLevel >= maxLevel) targetLevel = maxLevel;
@@ -425,6 +447,27 @@ export const useDrag = ({
       }
     }
   }
+
+  function onMousemove(event: any) {
+    if (!cloneTreeItem) {
+      dragstart();
+    }
+    if (!cloneTreeItem) return;
+
+    dragging.value = true;
+
+    mouseX = event.clientX;
+    mouseY = event.clientY;
+    const dx = mouseX - startX;
+    const dy = mouseY - startY;
+    cloneTreeItem.style.left = `${initialX + dx}px`;
+    cloneTreeItem.style.top = `${initialY + dy}px`;
+
+    autoScroll();
+
+    dragProcess();
+  }
+
   function onMouseup() {
     if (dragging.value) {
       // 延迟一下，不然click仍然会被触发
@@ -521,6 +564,7 @@ export const useDrag = ({
       sourceTreeItem = null;
     }
 
+    scrollElement?.removeEventListener('scroll', onScroll);
     document.removeEventListener('mousemove', onMousemove);
     document.removeEventListener('mouseup', onMouseup);
   }