Browse Source

Worker group adds check

pull/3/MERGE
break60 4 years ago
parent
commit
e94b02f279
  1. 17
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
  2. 3
      dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
  3. 3
      dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

17
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue

@ -484,6 +484,16 @@
}
return true
},
_verifWorkGroup() {
let item = this.store.state.security.workerGroupsListAll.find(item => {
return item.id == this.workerGroup;
});
if(item==undefined) {
this.$message.warning(`${i18n.$t('The Worker group no longer exists, please select the correct Worker group!')}`)
return false;
}
return true
},
/**
* Global verification procedure
*/
@ -492,6 +502,10 @@
if (!this._verifName()) {
return
}
// verif workGroup
if(!this._verifWorkGroup()) {
return
}
// Verify task alarm parameters
if (!this.$refs['timeout']._verification()) {
return
@ -619,8 +633,7 @@
break;
}
}
if(!hasMatch){
if(!hasMatch && o.workerGroupId==-1){
this.workerGroup = 'default'
} else {
this.workerGroup = o.workerGroup

3
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js

@ -592,5 +592,6 @@ export default {
'Cannot select the same node for successful branch flow and failed branch flow': 'Cannot select the same node for successful branch flow and failed branch flow',
'Successful branch flow and failed branch flow are required': 'conditions node Successful and failed branch flow are required',
'Unauthorized or deleted resources': 'Unauthorized or deleted resources',
'Please delete all non-existent resources': 'Please delete all non-existent resources'
'Please delete all non-existent resources': 'Please delete all non-existent resources',
'The Worker group no longer exists, please select the correct Worker group!': 'The Worker group no longer exists, please select the correct Worker group!'
}

3
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

@ -592,5 +592,6 @@ export default {
'Cannot select the same node for successful branch flow and failed branch flow': '成功分支流转和失败分支流转不能选择同一个节点',
'Successful branch flow and failed branch flow are required': 'conditions节点成功和失败分支流转必填',
'Unauthorized or deleted resources': '未授权或已删除资源',
'Please delete all non-existent resources': '请删除所有未授权或已删除资源'
'Please delete all non-existent resources': '请删除所有未授权或已删除资源',
'The Worker group no longer exists, please select the correct Worker group!': '该Worker分组已经不存在请选择正确的Worker分组'
}

Loading…
Cancel
Save