Browse Source

[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
pull/3/MERGE
break60 4 years ago committed by GitHub
parent
commit
f668563c0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
  2. 1
      dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
  3. 3
      dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
  4. 3
      dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

4
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

1
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)
})

3
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'
}

3
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'
}

Loading…
Cancel
Save