Browse Source

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

杨奕 7 years ago
parent
commit
e51e9fe8ba
2 changed files with 3 additions and 1 deletions
  1. 3 0
      packages/tree/src/tree-node.vue
  2. 0 1
      test/unit/specs/menu.spec.js

+ 3 - 0
packages/tree/src/tree-node.vue

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

+ 0 - 1
test/unit/specs/menu.spec.js

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