From 5782824055be7de394318da8bebc9581f5a0f96b Mon Sep 17 00:00:00 2001
From: gongzijian <gongzijian@analysys.com.cn>
Date: Mon, 29 Apr 2019 10:50:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E6=9C=AA=E5=88=A0=E9=99=A4locations=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js  | 9 ++++++++-
 .../pages/definition/pages/list/_source/timing.vue       | 4 ++--
 escheduler-ui/src/js/conf/home/store/dag/mutations.js    | 4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js b/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
index 72404897c2..e2c0c677a9 100644
--- a/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
+++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
@@ -489,6 +489,9 @@ JSP.prototype.removeNodes = function ($id) {
   })
   // delete node
   this.JspInstance.remove($id)
+
+  // delete dom
+  $(`#${$id}`).remove()
 }
 
 /**
@@ -557,7 +560,7 @@ JSP.prototype.copyNodes = function ($id) {
   // Add new node
   store.commit('dag/addTasks', newNodeInfo)
   // Add node location information
-  store.commit('dag/setLocations', {
+  store.commit('dag/addLocations', {
     [newId]: {
       name: newName,
       targetarr: '',
@@ -642,6 +645,8 @@ JSP.prototype.saveStore = function () {
       })
     })
 
+    console.log(tasksAll())
+
     _.map(tasksAll(), v => {
       locations[v.id] = {
         name: v.name,
@@ -651,6 +656,8 @@ JSP.prototype.saveStore = function () {
       }
     })
 
+    console.log(locations)
+
     // Storage node
     store.commit('dag/setTasks', tasks)
     // Store coordinate information
diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
index 6b6893acf9..ba67536ea2 100644
--- a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
+++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
@@ -9,7 +9,7 @@
       </div>
       <div class="cont">
         <x-datepicker
-                style="width: 300px;"
+                style="width: 360px;"
                 :panel-num="2"
                 placement="bottom-start"
                 @on-change="_datepicker"
@@ -32,7 +32,7 @@
             </div>
             <template slot="reference">
               <x-input
-                      style="width: 300px;"
+                      style="width: 360px;"
                       type="text"
                       readonly
                       :value="crontab"
diff --git a/escheduler-ui/src/js/conf/home/store/dag/mutations.js b/escheduler-ui/src/js/conf/home/store/dag/mutations.js
index f15f773327..15f87fab30 100644
--- a/escheduler-ui/src/js/conf/home/store/dag/mutations.js
+++ b/escheduler-ui/src/js/conf/home/store/dag/mutations.js
@@ -32,13 +32,13 @@ export default {
    * set locations
    * */
   setLocations (state, payload) {
-    state.locations = Object.assign(state.locations, {}, payload)
+    state.locations = payload
   },
   /**
    * add locations
    * */
   addLocations (state, payload) {
-    state.locations = payload
+    state.locations = Object.assign(state.locations, {}, payload)
   },
   /**
    * set connects