[incubator-dolphinscheduler] branch 1.3.2-release updated: [bugFix][ui]cherry pick commit from dev for Fix the problem that the label of DAG creation task is not displayed, the workflow cannot be formatted after saving, and the drawer style is global (#3284)

[jave]

This is an automated email from the ASF dual-hosted git repository.

jave pushed a commit to branch 1.3.2-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/1.3.2-release by this push:
     new a5cc686  [bugFix][ui]cherry pick commit from dev for Fix the problem 
that the label of DAG creation task is not displayed, the workflow cannot be 
formatted after saving, and the drawer style is global (#3284)
a5cc686 is described below

commit a5cc686f4963c63cf99a813788e2835e15acf308
Author: break60 <790061...@qq.com>
AuthorDate: Thu Jul 23 10:04:05 2020 +0800

    [bugFix][ui]cherry pick commit from dev for Fix the problem that the label 
of DAG creation task is not displayed, the workflow cannot be formatted after 
saving, and the drawer style is global (#3284)
    
    * Click Cancel, the node data is restored to the original data
    
    * Delete the pid of the master and worker processes
    
    * When modifying the dag, if the DAG is not saved, it cannot be formatted
    
    * Fix the problem that the label of DAG creation task is not displayed, the 
workflow cannot be formatted after saving, and the drawer style is global
---
 .../src/js/conf/home/pages/dag/_source/dag.scss            |  6 +++---
 .../src/js/conf/home/pages/dag/_source/dag.vue             |  2 ++
 .../home/pages/dag/_source/formModel/formLineModel.vue     | 14 ++++++++------
 dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js  |  1 +
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss 
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
index 886ee69..18925d1 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
@@ -560,9 +560,9 @@ svg path:hover {
   }
 }
 
-.ans-drawer.ans-drawer-right {
-  width: 628px;
-  left: auto;
+.ans-modal-box.ans-drawer.ans-drawer-right.dagMask.mask {
+    width: 628px;
+    left: auto;
 }
 
 
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue 
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
index e7962da..c40bd19 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
@@ -519,6 +519,7 @@
           eventModel.remove()
         }
         eventModel = this.$drawer({
+          className: 'dagMask',
           render (h) {
             return h(mFormLineModel,{
               on: {
@@ -591,6 +592,7 @@
           closable: false,
           direction: 'right',
           escClose: true,
+          className: 'dagMask',
           render: h => h(mFormModel, {
             on: {
               addTaskInfo ({ item, fromThis }) {
diff --git 
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formLineModel.vue
 
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formLineModel.vue
index e3c25b4..2864b3c 100644
--- 
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formLineModel.vue
+++ 
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formLineModel.vue
@@ -77,6 +77,9 @@
             })
         },
         ok() {
+          if($(`#${this.id}`).prev().attr('class')==='jtk-overlay') {
+            $(`#${this.id}`).prev().empty()
+          }
           $(`#${this.id}`).text(this.labelName)
             this.$emit('addLineInfo', {
               item: {
@@ -92,12 +95,11 @@
       
     },
     created () {
-        let connects = this.store.state.dag.connects
-        connects.filter( item => {
-            if(item.endPointSourceId===this.sourceId && 
item.endPointTargetId===this.targetId) {
-                this.labelName =  item.label
-            }
-        });
+      if($(`#${this.id}`).prev().attr('class').indexOf('jtk-overlay')!==-1) {
+        this.labelName = $(`#${this.id}`).prev().text()
+      } else {
+        this.labelName = $(`#${this.id}`).text()
+      }
     },
     mounted () {
       
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js 
b/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
index e2f3f2b..f933eae 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
@@ -255,6 +255,7 @@ export default {
         syncDefine: state.syncDefine
       }, res => {
         resolve(res)
+        state.isEditDag = false
       }).catch(e => {
         reject(e)
       })