From 0708c96f00ca1505cda6144442a8f0e3eafb389d Mon Sep 17 00:00:00 2001
From: npmrun <kk1549469775@gmail.com>
Date: Mon, 26 Sep 2022 16:14:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=91=E7=8A=B6=E6=95=B0=E6=8D=AE=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/components/tree/node.vue            | 47 ++++++++++++----
 packages/components/tree/tree.vue            | 80 ++++++++++++++++++++++++----
 packages/components/tree/type.ts             |  1 +
 packages/components/tree/util.ts             | 11 +++-
 packages/playground/src/components/Panel.vue |  2 +-
 packages/playground/src/dev/tree.vue         | 41 ++++++++++++--
 packages/theme-chalk/src/tree.scss           |  8 ++-
 7 files changed, 161 insertions(+), 29 deletions(-)

diff --git a/packages/components/tree/node.vue b/packages/components/tree/node.vue
index 66db489..24346bb 100644
--- a/packages/components/tree/node.vue
+++ b/packages/components/tree/node.vue
@@ -1,7 +1,17 @@
 <template>
-    <div class="ps-tree-node component" :class="[{ draging: status === ENiuTreeStatus.DragIng }]">
-        <div class="ps-tree-node-wrapper" ref="nodeEL" :draggable="draggable" :onDragstart="onDragstart"
-            :onDragend="onDragend" :onDrop="onDrop" :onDragover="onDragover" :onDragleave="onDragleave"
+<div>
+<div :style="{ marginLeft: parentLevel * 10 + 'px' }" :class="[
+        {
+        'ps-tree-drag-in':
+            dataSourceKey != data.key &&
+            dataSourceKey &&
+            !isChildOf(data.key, dataSourceKey, list) &&
+            status === ENiuTreeStatus.DragInner,
+    },
+]"></div>
+<div class="ps-tree-node component" :class="[{ draging: status === ENiuTreeStatus.DragIng }]">
+        <div class="ps-tree-node-wrapper" ref="nodeEL" :draggable="draggable" @dragstart.stop="onDragstart"
+            @dragend.stop="onDragend" @drop.stop="onDrop" @dragover.stop="onDragover" @dragleave.stop="onDragleave"
             @click.stop="emit('click', data)">
             <slot :data="data" :deep="level" :dataSourceKey="dataSourceKey" :status="status">
                 <div :style="{
@@ -57,6 +67,7 @@
             </template>
         </div>
     </div>
+</div>
 </template>
 
 <script lang="ts" setup>
@@ -92,6 +103,12 @@ const props = withDefaults(
         level: 0,
     }
 )
+
+const parentLevel = computed(()=>{
+    let level = props.level - 1
+    return level>=0?level:0
+})
+
 const slots = useSlots()
 const aa = (fuck: any)=>renderSlot(slots, "default", fuck)
 
@@ -160,14 +177,22 @@ function onDragover(event: DragEvent) {
         return
     const y = event.offsetY
     const h = (event.currentTarget as HTMLDivElement).offsetHeight
-    if (y < h / 3 && !opts.sort) {
-        status.value = ENiuTreeStatus.DragUp
-    } else if (y <= (h * 2) / 3 && y >= h / 3 && props.data.children) {
-        status.value = ENiuTreeStatus.DragIn
-    } else if (y > (h * 2) / 3 && !opts.sort) {
-        status.value = ENiuTreeStatus.DragDown
-    } else {
-        status.value = undefined
+    if(!opts.sort){
+        if (y < h / 3) {
+            status.value = ENiuTreeStatus.DragUp
+        } else if (y <= (h * 2) / 3 && y >= h / 3 && props.data.children) {
+            status.value = ENiuTreeStatus.DragIn
+        } else if (y > (h * 2) / 3) {
+            status.value = ENiuTreeStatus.DragDown
+        } else {
+            status.value = undefined
+        }
+    }else{
+        if (props.data.children) {
+            status.value = ENiuTreeStatus.DragIn
+        } else if (!props.data.children && opts.sort) {
+            status.value = ENiuTreeStatus.DragInner
+        }
     }
     emit('onDragover', props.data.key)
 }
diff --git a/packages/components/tree/tree.vue b/packages/components/tree/tree.vue
index 14e584f..739baf8 100644
--- a/packages/components/tree/tree.vue
+++ b/packages/components/tree/tree.vue
@@ -1,8 +1,10 @@
 <template>
-    <div class="ps-tree component">
+    <div class="ps-tree component" draggable="true" :class="{ aaa: isDrag }" @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" :data-source-key="dataSourceKey"
-                :data="item" :list="sortedList" :level="level" @click="(item) => clickNode(item)">
+            <node @onDragstart="onDragstart" @expand="onExpand" @onDragEnd="onDragEnd" @onDrop="onDrop"
+                :data-source-key="dataSourceKey" :data="item" :list="sortedList" :level="level"
+                @click="(item) => clickNode(item)">
                 <template
                     #default="{ data, deep, dataSourceKey, status }: { data: INiuTreeData, deep: number, dataSourceKey: INiuTreeKey, status: ENiuTreeStatus }">
                     <slot :data="data" :deep="deep" :dataSourceKey="dataSourceKey" :status="status"></slot>
@@ -18,18 +20,20 @@ import type { INiuTreeData, INiuTreeKey } from './type'
 import { ENiuTreeStatus } from './type'
 import {
     findByKey,
+    findByKeyParent,
     forEachTree,
     insertAfterByKey,
     insertBeforeByKey,
+    isChild,
     isChildOf,
     removeByKey,
 } from './util'
 
-import {betterDirectorySort} from "./better-directory-sort"
+import { betterDirectorySort } from "./better-directory-sort"
 import { computed } from "@vue/reactivity"
 
-const sortedList = computed(()=>{
-    if(props.sort){
+const sortedList = computed(() => {
+    if (props.sort) {
         return props.list.sort((a, b) => {
             return betterDirectorySort(
                 { name: a.title, isDirectory: a.isFolder },
@@ -40,6 +44,39 @@ const sortedList = computed(()=>{
     return props.list
 })
 
+const isDrag = ref(false)
+function onDragover2() {
+    if (!props.sort) return
+    if (!dataSourceKey.value) return
+    if (!isChild(dataSourceKey.value, props.list)) {
+        isDrag.value = true
+    }
+}
+function onDragleave2() {
+    if (!props.sort) return
+    isDrag.value = false
+}
+async function onDrop2(ev) {
+    if (!props.sort) return
+    if (!dataSourceKey.value) return
+    if (!isDrag.value) return
+    isDrag.value = false
+    let data = findByKey(dataSourceKey.value, props.list)
+    const sourceKey = dataSourceKey.value;
+    dataSourceKey.value = undefined
+    if (
+        data
+    ) {
+        const isSuccess = (await props.dropFn?.(ENiuTreeStatus.DragIn, data, props.list))
+        if (isSuccess == undefined || isSuccess) {
+            removeByKey(sourceKey, props.list)
+            props.list.push(data)
+            emit("change")
+        }
+
+    }
+}
+
 const props = withDefaults(
     defineProps<{
         list: INiuTreeData[]
@@ -48,7 +85,7 @@ const props = withDefaults(
         justOpenOne?: boolean
         sort?: boolean
         level?: number
-        dropFn?(status: ENiuTreeStatus, data: INiuTreeData, targetData: INiuTreeData): boolean | Promise<boolean>
+        dropFn?(status: ENiuTreeStatus, data: INiuTreeData, targetDataList: INiuTreeData[]): boolean | Promise<boolean>
     }>(),
     {
         justOpenOne: false,
@@ -101,6 +138,29 @@ async function onDrop(key: INiuTreeKey, status?: ENiuTreeStatus) {
     const sourceKey = dataSourceKey.value;
     dataSourceKey.value = undefined
     switch (status) {
+        case ENiuTreeStatus.DragInner: 
+            const parentData = findByKeyParent(key, props.list)
+            if (
+                data &&
+                targetData &&
+                sourceKey != key &&
+                !isChildOf(key, sourceKey, props.list)
+            ) {
+                const isSuccess = (await props.dropFn?.(status, data, parentData?.children ?? props.list))
+                if (isSuccess == undefined || isSuccess) {
+                    removeByKey(sourceKey, props.list)
+                    if(parentData){
+                        parentData.children.push(data)
+                        if (props.autoExpand) {
+                            parentData.isExpand = true
+                        }
+                    }else{
+                        props.list.push(data)
+                    }
+                    emit("change")
+                }
+            }
+            break
         case ENiuTreeStatus.DragIn:
             if (
                 data &&
@@ -109,7 +169,7 @@ async function onDrop(key: INiuTreeKey, status?: ENiuTreeStatus) {
                 !isChildOf(key, sourceKey, props.list) &&
                 targetData.children
             ) {
-                const isSuccess = (await props.dropFn?.(status, data, targetData))
+                const isSuccess = (await props.dropFn?.(status, data, targetData.children))
                 if (isSuccess == undefined || isSuccess) {
                     removeByKey(sourceKey, props.list)
                     targetData.children.push(data)
@@ -128,7 +188,7 @@ async function onDrop(key: INiuTreeKey, status?: ENiuTreeStatus) {
                 sourceKey != key &&
                 !isChildOf(key, sourceKey, props.list)
             ) {
-                const isSuccess = (await props.dropFn?.(status, data, targetData))
+                const isSuccess = (await props.dropFn?.(status, data, targetData.children))
                 if (isSuccess == undefined || isSuccess) {
                     removeByKey(sourceKey, props.list)
                     insertAfterByKey(key, data, props.list)
@@ -144,7 +204,7 @@ async function onDrop(key: INiuTreeKey, status?: ENiuTreeStatus) {
                 sourceKey != key &&
                 !isChildOf(key, sourceKey, props.list)
             ) {
-                const isSuccess = (await props.dropFn?.(status, data, targetData))
+                const isSuccess = (await props.dropFn?.(status, data, targetData.children))
                 if (isSuccess == undefined || isSuccess) {
                     removeByKey(sourceKey, props.list)
                     insertBeforeByKey(key, data, props.list)
diff --git a/packages/components/tree/type.ts b/packages/components/tree/type.ts
index 2a15d95..4c03079 100644
--- a/packages/components/tree/type.ts
+++ b/packages/components/tree/type.ts
@@ -27,6 +27,7 @@ export interface INiuTreeData<T = any> {
 export enum ENiuTreeStatus {
     DragUp = 'drag-up',
     DragIn = 'drag-in',
+    DragInner = 'drag-inner',
     DragDown = 'drag-down',
     DragIng = 'drag-ing',
 }
\ No newline at end of file
diff --git a/packages/components/tree/util.ts b/packages/components/tree/util.ts
index 2a01a8a..1b682c6 100644
--- a/packages/components/tree/util.ts
+++ b/packages/components/tree/util.ts
@@ -59,7 +59,16 @@ export function isChildOf(
         -1
     )
 }
-
+export function isChild(
+    a_key: INiuTreeKey,
+    treeData: INiuTreeData[]
+) {
+    if (!a_key) return false
+    return (
+        treeData.findIndex((i) => i.key === a_key) >
+        -1
+    )
+}
 export function forEachTree(tree: INiuTreeData[], cb: (node: INiuTreeData)=>void) {
     tree.forEach(v=>{
         cb && cb(v)
diff --git a/packages/playground/src/components/Panel.vue b/packages/playground/src/components/Panel.vue
index 32b771f..b9543d5 100644
--- a/packages/playground/src/components/Panel.vue
+++ b/packages/playground/src/components/Panel.vue
@@ -8,7 +8,7 @@
         {{ desc }}
       </span>
     </div>
-    <div class="flex-1 p-15px">
+    <div class="flex-1 p-15px min-h-150px">
       <slot></slot>
     </div>
   </div>
diff --git a/packages/playground/src/dev/tree.vue b/packages/playground/src/dev/tree.vue
index 34b0a44..59dc00c 100644
--- a/packages/playground/src/dev/tree.vue
+++ b/packages/playground/src/dev/tree.vue
@@ -11,11 +11,34 @@ const list = ref(convertTreeData([
             {
                 key: 5,
                 title: "5文件夹",
-                children: []
+                children: [
+                    {
+        key: 2,
+        title: "ccc"
+    },
+    {
+        key: 3,
+        title: "bbb"
+    },
+                ]
             },
         ]
     },
+     {
+        key: 6,
+        title: "basdbb"
+    },
+]))
+const list2 = ref(convertTreeData([
     {
+        key: 1,
+        title: "aaa",
+        children: [
+            {
+                key: 5,
+                title: "5文件夹",
+                children: [
+                    {
         key: 2,
         title: "ccc"
     },
@@ -23,16 +46,24 @@ const list = ref(convertTreeData([
         key: 3,
         title: "bbb"
     },
+                ]
+            },
+        ]
+    },
+     {
+        key: 6,
+        title: "basdbb"
+    },
 ]))
 function onExpand(node: INiuTreeData) {
     console.log(node);
 
 }
-const dropFn = (status: ENiuTreeStatus, data: INiuTreeData<any>, targetData: INiuTreeData<any>): Promise<boolean> => {
+const dropFn = (status: ENiuTreeStatus, data: INiuTreeData<any>, list: INiuTreeData<any>[]): Promise<boolean> => {
     return new Promise((resolve) => {
-        setTimeout(() => {
+        // setTimeout(() => {
             resolve(true)
-        }, 2000);
+        // }, 2000);
     })
 }
 </script>
@@ -52,7 +83,7 @@ const dropFn = (status: ENiuTreeStatus, data: INiuTreeData<any>, targetData: INi
         </ps-tree>
     </Panel>
     <Panel name="Tree" desc="延迟2000ms执行操作">
-        <ps-tree sort @expand="onExpand" :dropFn="dropFn" :list="list" auto-expand>
+        <ps-tree sort @expand="onExpand" :dropFn="dropFn" :list="list2" auto-expand>
             <template #default="{ data, deep }">
                 <div :style="{
                     marginLeft: deep * 10 + 'px',
diff --git a/packages/theme-chalk/src/tree.scss b/packages/theme-chalk/src/tree.scss
index 0677b45..04beae3 100644
--- a/packages/theme-chalk/src/tree.scss
+++ b/packages/theme-chalk/src/tree.scss
@@ -1,5 +1,11 @@
 @import 'common/var.scss';
-
+.ps-tree.component{
+    height: 100%;
+    position: relative;
+    &.aaa{
+        background-color: $primary-color !important;
+    }
+}
 .ps-tree-node.component {
     position: relative;