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

Tree: optimize not-allowed dropping cursor (#11631)

pull/11633/head
杨奕 2018-06-14 18:14:39 +08:00 committed by GitHub
parent 7bee91a517
commit 48c7bcc933
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/docs/zh-CN/tree.md
View File

@ -263,7 +263,7 @@
} }
}, },
allowDrag(draggingNode) { allowDrag(draggingNode) {
return draggingNode.data.label.indexOf('三级 3-1-1') === -1; return draggingNode.data.label.indexOf('三级 3-2-2') === -1;
}, },
loadNode(node, resolve) { loadNode(node, resolve) {
if (node.level === 0) { if (node.level === 0) {
@ -1173,7 +1173,7 @@
} }
}, },
allowDrag(draggingNode) { allowDrag(draggingNode) {
return draggingNode.data.label.indexOf('三级 3-1-1') === -1; return draggingNode.data.label.indexOf('三级 3-2-2') === -1;
} }
} }
}; };

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

@ -362,12 +362,12 @@
let dropPrev = true; let dropPrev = true;
let dropInner = true; let dropInner = true;
let dropNext = true; let dropNext = true;
let userAllowDropInner = true;
if (typeof this.allowDrop === 'function') { if (typeof this.allowDrop === 'function') {
dropPrev = this.allowDrop(draggingNode.node, dropNode.node, 'prev'); dropPrev = this.allowDrop(draggingNode.node, dropNode.node, 'prev');
dropInner = this.allowDrop(draggingNode.node, dropNode.node, 'inner'); userAllowDropInner = dropInner = this.allowDrop(draggingNode.node, dropNode.node, 'inner');
dropNext = this.allowDrop(draggingNode.node, dropNode.node, 'next'); dropNext = this.allowDrop(draggingNode.node, dropNode.node, 'next');
} }
dragState.allowDrop = dropInner;
event.dataTransfer.dropEffect = dropInner ? 'move' : 'none'; event.dataTransfer.dropEffect = dropInner ? 'move' : 'none';
if ((dropPrev || dropInner || dropNext) && oldDropNode !== dropNode) { if ((dropPrev || dropInner || dropNext) && oldDropNode !== dropNode) {
if (oldDropNode) { if (oldDropNode) {
@ -399,8 +399,8 @@
const treePosition = this.$el.getBoundingClientRect(); const treePosition = this.$el.getBoundingClientRect();
let dropType; let dropType;
const prevPercent = dropPrev ? (dropInner ? 0.25 : (dropNext ? 0.5 : 1)) : -1; const prevPercent = dropPrev ? (dropInner ? 0.25 : (dropNext ? 0.45 : 1)) : -1;
const nextPercent = dropNext ? (dropInner ? 0.75 : (dropPrev ? 0.5 : 0)) : 1; const nextPercent = dropNext ? (dropInner ? 0.75 : (dropPrev ? 0.55 : 0)) : 1;
let indicatorTop = -9999; let indicatorTop = -9999;
const distance = event.clientY - targetPosition.top; const distance = event.clientY - targetPosition.top;
@ -430,6 +430,7 @@
} }
dragState.showDropIndicator = dropType === 'before' || dropType === 'after'; dragState.showDropIndicator = dropType === 'before' || dropType === 'after';
dragState.allowDrop = dragState.showDropIndicator || userAllowDropInner;
dragState.dropType = dropType; dragState.dropType = dropType;
this.$emit('node-drag-over', draggingNode.node, dropNode.node, event); this.$emit('node-drag-over', draggingNode.node, dropNode.node, event);
}); });