github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/10822/head
杨奕 2018-04-21 15:02:22 +08:00 committed by GitHub
parent 5c0c5b8eae
commit 1d33bae558
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats 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; const draggingNode = dragState.draggingNode;
if (!draggingNode || !dropNode) return; if (!draggingNode || !dropNode) return;
let allowDrop = true;
let dropPrev = true; let dropPrev = true;
let dropInner = true; let dropInner = true;
let dropNext = true; let dropNext = true;
@ -362,18 +361,17 @@
dropPrev = this.allowDrop(draggingNode.node, dropNode.node, 'prev'); dropPrev = this.allowDrop(draggingNode.node, dropNode.node, 'prev');
dropInner = this.allowDrop(draggingNode.node, dropNode.node, 'inner'); dropInner = this.allowDrop(draggingNode.node, dropNode.node, 'inner');
dropNext = this.allowDrop(draggingNode.node, dropNode.node, 'next'); dropNext = this.allowDrop(draggingNode.node, dropNode.node, 'next');
allowDrop = dropInner;
} }
dragState.allowDrop = allowDrop; dragState.allowDrop = dropInner;
event.dataTransfer.dropEffect = allowDrop ? 'move' : 'none'; event.dataTransfer.dropEffect = dropInner ? 'move' : 'none';
if (allowDrop && oldDropNode !== dropNode) { if ((dropPrev || dropInner || dropNext) && oldDropNode !== dropNode) {
if (oldDropNode) { if (oldDropNode) {
this.$emit('node-drag-leave', draggingNode.node, oldDropNode.node, event); this.$emit('node-drag-leave', draggingNode.node, oldDropNode.node, event);
} }
this.$emit('node-drag-enter', draggingNode.node, dropNode.node, event); this.$emit('node-drag-enter', draggingNode.node, dropNode.node, event);
} }
if (allowDrop) { if (dropPrev || dropInner || dropNext) {
dragState.dropNode = dropNode; dragState.dropNode = dropNode;
} }