From c14b0aadc352399085bf52f6c718f1ba06da3d4f Mon Sep 17 00:00:00 2001
From: npmrun <1549469775@qq.com>
Date: Thu, 1 Dec 2022 21:09:48 +0800
Subject: [PATCH] fixed bug

---
 packages/components/tree/node.vue |  3 +++
 packages/components/tree/tree.vue | 19 +++++++++++++++++--
 packages/princess-ui/package.json |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/packages/components/tree/node.vue b/packages/components/tree/node.vue
index b9cb185..46ee1c1 100644
--- a/packages/components/tree/node.vue
+++ b/packages/components/tree/node.vue
@@ -43,6 +43,7 @@
                     @onDragend="(e: INiuTreeKey) => emit('onDragend', e)"
                     @onDrop="(e: INiuTreeKey, s?: ENiuTreeStatus) => emit('onDrop', e, s)"
                     @onDragover="(e: INiuTreeKey) => emit('onDragover', e)"
+                    @onDragoverSelf="() => emit('onDragoverSelf')"
                     @onDragleave="(e: INiuTreeKey) => emit('onDragleave', e)"
                     @expand="(e: INiuTreeData) => emit('expand', e)" @click="(e: INiuTreeData) => emit('click', e)"
                     :data-source-key="dataSourceKey" :data="item" :list="list" :level="level + 1">
@@ -118,6 +119,7 @@ const emit = defineEmits<{
     (e: 'onDragend', key: INiuTreeKey): void
     (e: 'onDrop', key: INiuTreeKey, status?: ENiuTreeStatus): void
     (e: 'onDragover', key: INiuTreeKey): void
+    (e: 'onDragoverSelf'): void
     (e: 'onDragleave', key: INiuTreeKey): void
 }>()
 const draggable = ref(true)
@@ -163,6 +165,7 @@ function onDrop(e: DragEvent) {
 function onDragover(event: DragEvent) {
     event.preventDefault()
     if (!props.dataSourceKey) return
+    emit('onDragoverSelf')
     if (props.dataSourceKey === props.data.key) return
     if (
         props.dataSourceKey &&
diff --git a/packages/components/tree/tree.vue b/packages/components/tree/tree.vue
index bfe2357..880691d 100644
--- a/packages/components/tree/tree.vue
+++ b/packages/components/tree/tree.vue
@@ -1,8 +1,8 @@
 <template>
-    <div class="ps-tree component" draggable="true" :style="{backgroundColor: isDrag?bg:''}" @dragover.prevent="onDragover2"
+    <div class="ps-tree component" :style="{backgroundColor: isDrag?bg:''}" @dragover.prevent="onDragover2"
         @dragleave.stop="onDragleave2" @drop.stop="onDrop2">
         <template v-for="(item, index) in sortedList" :key="item.key">
-            <node @onDragstart="onDragstart" @expand="onExpand" @onDragEnd="onDragEnd" @onDrop="onDrop"
+            <node @onDragstart="onDragstart" @expand="onExpand" @onDragover="onDragover" @onDragoverSelf="onDragoverSelf" @onDragEnd="onDragEnd" @onDrop="onDrop"
                 :data-source-key="dataSourceKey" :data="item" :list="sortedList" :level="level"
                 @click="(item) => clickNode(item)" :bg="bg">
                 <template
@@ -136,8 +136,22 @@ function onDragstart(key: INiuTreeKey) {
     dataSourceKey.value = key
     emit("itemDragstart")
 }
+function onDragover(key: INiuTreeKey) {
+    if (!props.sort) return
+    if (!key) return
+    let data = findByKey(key, props.list)
+    if (isChild(key, props.list) && data.isFile) {
+        isDrag.value = true
+    }else{
+        isDrag.value = false
+    }
+}
+function onDragoverSelf() {
+    isDrag.value = false
+}
 function onDragEnd(key: INiuTreeKey) {
     dataSourceKey.value = undefined
+    isDrag.value = false
     emit("itemDragend")
 }
 async function onDrop(key: INiuTreeKey, status?: ENiuTreeStatus) {
@@ -147,6 +161,7 @@ async function onDrop(key: INiuTreeKey, status?: ENiuTreeStatus) {
     let targetData = findByKey(key, props.list)
     const sourceKey = dataSourceKey.value;
     dataSourceKey.value = undefined
+    isDrag.value = false
     switch (status) {
         case ENiuTreeStatus.DragInner: 
             const parentData = findByKeyParent(key, props.list)
diff --git a/packages/princess-ui/package.json b/packages/princess-ui/package.json
index 040feac..f8c2188 100644
--- a/packages/princess-ui/package.json
+++ b/packages/princess-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "princess-ui",
-  "version": "0.0.8-beta.14",
+  "version": "0.0.8-beta.16",
   "description": "a vue3 ui, just for personal use",
   "scripts": {
       "build": "tsc ./PrincessResolver.ts --skipLibCheck --esModuleInterop"