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

Tree: drag events should return if not draggable (#11095)

pull/11097/head
杨奕 2018-05-10 11:56:49 +08:00 committed by GitHub
parent a318c5701e
commit e51e9fe8ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/tree/src/tree-node.vue
View File

@ -208,10 +208,12 @@
}, },
handleDragStart(event) { handleDragStart(event) {
if (!this.tree.draggable) return;
this.tree.$emit('tree-node-drag-start', event, this); this.tree.$emit('tree-node-drag-start', event, this);
}, },
handleDragOver(event) { handleDragOver(event) {
if (!this.tree.draggable) return;
this.tree.$emit('tree-node-drag-over', event, this); this.tree.$emit('tree-node-drag-over', event, this);
event.preventDefault(); event.preventDefault();
}, },
@ -221,6 +223,7 @@
}, },
handleDragEnd(event) { handleDragEnd(event) {
if (!this.tree.draggable) return;
this.tree.$emit('tree-node-drag-end', event, this); this.tree.$emit('tree-node-drag-end', event, this);
} }
}, },

1
test/unit/specs/menu.spec.js
View File

@ -372,7 +372,6 @@ describe('Menu', () => {
template: ` template: `
<el-menu :default-active="active"> <el-menu :default-active="active">
<el-menu-item <el-menu-item
v-ref="menus"
v-for="menu in menus" v-for="menu in menus"
:index="menu.name" :index="menu.name"
:key="menu.name"> :key="menu.name">