mirrors/element
1
0
Fork 0
mirror of https://github.com/ElemeFE/element.git synced 2025-12-16 11:44:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tree: fix allowDrop's type behavior (#10821)

Browse Source
This commit is contained in:
杨奕
2018-04-21 15:02:22 +08:00
committed by GitHub
parent 5c0c5b8eae
commit 1d33bae558
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/tree/src/tree.vue
View File

@@ -354,7 +354,6 @@
const draggingNode = dragState.draggingNode;
if (!draggingNode || !dropNode) return;
let allowDrop = true;
let dropPrev = true;
let dropInner = true;
let dropNext = true;
@@ -362,18 +361,17 @@
dropPrev = this.allowDrop(draggingNode.node, dropNode.node, 'prev');
dropInner = this.allowDrop(draggingNode.node, dropNode.node, 'inner');
dropNext = this.allowDrop(draggingNode.node, dropNode.node, 'next');
allowDrop = dropInner;
}
dragState.allowDrop = allowDrop;
event.dataTransfer.dropEffect = allowDrop ? 'move' : 'none';
if (allowDrop && oldDropNode !== dropNode) {
dragState.allowDrop = dropInner;
event.dataTransfer.dropEffect = dropInner ? 'move' : 'none';
if ((dropPrev || dropInner || dropNext) && oldDropNode !== dropNode) {
if (oldDropNode) {
this.$emit('node-drag-leave', draggingNode.node, oldDropNode.node, event);
}
this.$emit('node-drag-enter', draggingNode.node, dropNode.node, event);
}
if (allowDrop) {
if (dropPrev || dropInner || dropNext) {
dragState.dropNode = dropNode;
}