[incubator-dolphinscheduler] branch dev updated: When modifying the dag, if the DAG is not saved, it cannot be formatted

[chenxingchun]

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

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


The following commit(s) were added to refs/heads/dev by this push:
     new 1c16c4f  When modifying the dag, if the DAG is not saved, it cannot be 
formatted
     new 252abbd  Merge pull request #3261 from break60/dev
1c16c4f is described below

commit 1c16c4f968ca15f786fc7c3afed3ba3006cefffe
Author: break60 <790061...@qq.com>
AuthorDate: Tue Jul 21 17:42:58 2020 +0800

    When modifying the dag, if the DAG is not saved, it cannot be formatted
---
 dolphinscheduler-ui/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 51ec231..7565ebe 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
@@ -181,6 +181,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 09d51b9..e2f3f2b 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 6de5d94..2cca526 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -620,5 +620,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 9fcbb8e..425f46a 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -619,5 +619,6 @@ export default {
   zkDirectory: 'zk注册目录',
   'Directory detail': '查看目录详情',
   'Connection name': '连线名',
-  'Current connection settings': '当前连线设置'
+  'Current connection settings': '当前连线设置',
+  'Please save the DAG before formatting': '格式化前请先保存DAG'
 }