[incubator-dolphinscheduler] branch 1.3.2-release updated: [bugFix][ui]cherry pick commit from dev for Default assignment of delete condition judgment node (#3286)

[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 71259db  [bugFix][ui]cherry pick commit from dev for Default 
assignment of delete condition judgment node (#3286)
71259db is described below

commit 71259db56ba2bc4c293f4add7e3e268baccf0ff5
Author: break60 <790061...@qq.com>
AuthorDate: Thu Jul 23 10:19:49 2020 +0800

    [bugFix][ui]cherry pick commit from dev for Default assignment of delete 
condition judgment node (#3286)
    
    * 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
    
    * Default assignment of delete condition judgment node
---
 .../src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
 
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
index 0cd8bc3..b1121c8 100755
--- 
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
+++ 
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
@@ -786,7 +786,7 @@ JSP.prototype.jspBackfill = function ({ connects, 
locations, largeJson }) {
           type: 'basic',
           paintStyle: { strokeWidth: 2, stroke: '#4caf50' },
           HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3},
-          overlays:[["Label", { label: i18n.$t('success'), location:0.5, 
id:"label"} ]]
+          overlays:[["Label", { label: labels} ]]
         })
       } else if($(`#${sourceId}`).attr('data-tasks-type') === 'CONDITIONS' && 
$(`#${sourceId}`).attr('data-failednode') === 
$(`#${targetId}`).find('.name-p').text()) {
         this.JspInstance.connect({
@@ -795,7 +795,7 @@ JSP.prototype.jspBackfill = function ({ connects, 
locations, largeJson }) {
           type: 'basic',
           paintStyle: { strokeWidth: 2, stroke: '#252d39' },
           HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3},
-          overlays:[["Label", { label: i18n.$t('failed'), location:0.5, 
id:"label"} ]]
+          overlays:[["Label", { label: labels} ]]
         })
       } else {
         this.JspInstance.connect({