You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ch...@apache.org on 2020/05/29 12:53:02 UTC
[incubator-dolphinscheduler] branch dev-1.3.0 updated: Fix abnormal
display of regular worker parameters
This is an automated email from the ASF dual-hosted git repository.
chenxingchun pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
new a1576d1 Fix abnormal display of regular worker parameters
new c2fbd6a Merge pull request #2843 from break60/dev-1.3.0
a1576d1 is described below
commit a1576d1fa2492f9ef7576be137f2ab07c0929e4b
Author: break60 <79...@qq.com>
AuthorDate: Fri May 29 17:07:01 2020 +0800
Fix abnormal display of regular worker parameters
---
.../pages/definition/pages/list/_source/timing.vue | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
index 0616357..82a82de 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
@@ -186,7 +186,7 @@
receiversCc: [],
i18n: i18n.globalScope.LOCALE,
processInstancePriority: 'MEDIUM',
- workerGroup: 'default',
+ workerGroup: '',
previewTimes: []
}
},
@@ -309,6 +309,20 @@
watch: {
},
created () {
+ if(this.item.workerGroup===undefined) {
+ let stateWorkerGroupsList = this.store.state.security.workerGroupsListAll || []
+ if (stateWorkerGroupsList.length) {
+ this.workerGroup = stateWorkerGroupsList[0].id
+ } else {
+ this.store.dispatch('security/getWorkerGroupsAll').then(res => {
+ this.$nextTick(() => {
+ this.workerGroup = res[0].id
+ })
+ })
+ }
+ } else {
+ this.workerGroup = this.item.workerGroup
+ }
if(this.item.crontab !== null){
this.crontab = this.item.crontab
}
@@ -336,7 +350,6 @@
},
mounted () {
let item = this.item
-
// Determine whether to echo
if (this.item.crontab) {
this.crontab = item.crontab
@@ -344,7 +357,6 @@
this.failureStrategy = item.failureStrategy
this.warningType = item.warningType
this.processInstancePriority = item.processInstancePriority
- this.workerGroup = item.workerGroup || 'default'
this._getNotifyGroupList().then(() => {
this.$nextTick(() => {
// let list = _.filter(this.notifyGroupList, v => v.id === item.warningGroupId)