feat: cancel add when drag

yhanwen · Jun 13, 2019 · 255a568 · 255a568
1 parent f63acda
commit 255a568
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/renderer/components/Dialogs/NodeEditor.vue b/src/renderer/components/Dialogs/NodeEditor.vue
@@ -142,7 +142,7 @@ export default {
     editNode(node, callback) {
       this.dialogVisible = true;
       this.callback = callback;
-      this.labels = node.labels.slice(0);
+      this.labels = node.labels ? node.labels.slice(0) : [];
       this.$set(this, 'form', Object.assign({
         labels: [],
         label: '',

diff --git a/src/renderer/components/Vis.vue b/src/renderer/components/Vis.vue
@@ -32,7 +32,7 @@
   </div>
   <div class="graph-wrapper">
     <div class="vis-container" ref="container"></div>
-    <div class="tool-box" :class="{show: true}" v-if="toolbox"><tool-box :value="toolBoxAction" @change="toolBoxAction=$event" @action="handleToolBoxAction" :selected="selected" /></div>
+    <div class="tool-box" :class="{show: true}" v-if="toolbox"><tool-box ref="toolbox" :value="toolBoxAction" @change="toolBoxAction=$event" @action="handleToolBoxAction" :selected="selected" /></div>
     <div class="add-ons-pop-tip" :class="{show: hoverNodeItem}">
       <div class="wrapper" v-if="hoverNodeItem">
         <div class="name">
@@ -385,6 +385,10 @@ export default {
           });
         });
         this.dragging = true;
+        if (this.$refs.toolbox) {
+          this.networkInst.disableEditMode();
+          this.$refs.toolbox.cancelAdd();
+        }
       });
       this.networkInst.on('dragEnd', (event) => {
         const {

diff --git a/src/renderer/components/Vis/ToolBox.vue b/src/renderer/components/Vis/ToolBox.vue
@@ -80,6 +80,9 @@ export default {
     },
   },
   methods: {
+    cancelAdd() {
+      this.$emit('change', '');
+    },
     handleClick(item) {
       const { action, disabled } = item;
       if (disabled) {