From f668563c0c03e52ee405f554840d7de430446229 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Thu, 23 Jul 2020 09:50:35 +0800
Subject: [PATCH] [bugFix][ui] cherry pick commit from dev for When modifying
 the dag, if the DAG is not saved, it cannot be formatted (#3282)

* 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
---
 .../src/js/conf/home/pages/dag/_source/dag.vue                | 4 ++++
 dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js     | 1 +
 dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js        | 3 ++-
 dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js        | 3 ++-
 4 files changed, 9 insertions(+), 2 deletions(-)

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 a5098a010..e7962da7e 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
@@ -170,6 +170,10 @@
 
       // DAG automatic layout
       dagAutomaticLayout() {
+        if(this.store.state.dag.isEditDag) {
+          this.$message.warning(`${i18n.$t('Please save the DAG before formatting')}`)
+          return false
+        }
         $('#canvas').html('')
 
       // Destroy round robin
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 09d51b91d..e2f3f2b9d 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
@@ -230,6 +230,7 @@ export default {
         id: payload
       }, res => {
         resolve(res)
+        state.isEditDag = false
       }).catch(e => {
         reject(e)
       })
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index 657dcef0b..504534eb3 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -599,5 +599,6 @@ export default {
   zkDirectory: 'zkDirectory',
   'Directory detail': 'Directory detail',
   'Connection name': 'Connection name',
-  'Current connection settings': 'Current connection settings'
+  'Current connection settings': 'Current connection settings',
+  'Please save the DAG before formatting': 'Please save the DAG before formatting'
 }
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index 8f38f3435..f84f41b02 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -604,5 +604,6 @@ export default {
   zkDirectory: 'zk注册目录',
   'Directory detail': '查看目录详情',
   'Connection name': '连线名',
-  'Current connection settings': '当前连线设置'
+  'Current connection settings': '当前连线设置',
+  'Please save the DAG before formatting': '格式化前请先保存DAG'
 }
-- 
GitLab