Tree: add type as allow-drop's 3rd param (#10792)

This commit is contained in:
杨奕
2018-04-19 19:25:59 +08:00
committed by GitHub
parent 0c475a98c0
commit e8e2fc425b
5 changed files with 76 additions and 21 deletions

View File

@@ -355,8 +355,14 @@
if (!draggingNode || !dropNode) return;
let allowDrop = true;
if (typeof this.allowDrop === 'function' && !this.allowDrop(draggingNode.node, dropNode.node)) {
allowDrop = false;
let dropPrev = true;
let dropInner = true;
let dropNext = true;
if (typeof this.allowDrop === 'function') {
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';
@@ -371,10 +377,6 @@
dragState.dropNode = dropNode;
}
let dropPrev = allowDrop;
let dropInner = allowDrop;
let dropNext = allowDrop;
if (dropNode.node.nextSibling === draggingNode.node) {
dropNext = false;
}