Browse Source

[Feature-#6268][UI]Serial execte proces (#6267)

* serial

* del ip
3.0.0/version-upgrade
myangle1120 3 years ago committed by GitHub
parent
commit
b8d0f06ad8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
  2. 30
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
  3. 2
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
  4. 7
      dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
  5. 7
      dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js
  6. 2
      dolphinscheduler-ui/src/js/conf/home/store/dag/state.js
  7. 6
      dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
  8. 6
      dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

11
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js

@ -133,6 +133,10 @@ const runningType = [
{ {
desc: `${i18n.$t('Recovery waiting thread')}`, desc: `${i18n.$t('Recovery waiting thread')}`,
code: 'RECOVER_WAITING_THREAD' code: 'RECOVER_WAITING_THREAD'
},
{
desc: `${i18n.$t('Recover serial wait')}`,
code: 'RECOVER_SERIAL_WAIT'
} }
] ]
@ -243,6 +247,13 @@ const tasksState = {
color: '#5102ce', color: '#5102ce',
icoUnicode: 'el-icon-success', icoUnicode: 'el-icon-success',
isSpin: false isSpin: false
},
SERIAL_WAIT: {
id: 14,
desc: `${i18n.$t('Serial wait')}`,
color: '#5102ce',
icoUnicode: 'el-icon-loading',
isSpin: false
} }
} }

30
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue

@ -57,7 +57,23 @@
</el-input> </el-input>
</span> </span>
</div> </div>
<div class="title" style="padding-top: 6px;">
<span class="text-b">{{$t('Process execute type')}}</span>
<span >
<el-select
:disabled="isDetails"
v-model="executionType"
size="small"
style="width: 180px">
<el-option
v-for="item in itemsList"
:key="item.key"
:value="item.key"
:label="$t(item.val)">
</el-option>
</el-select>
</span>
</div>
<div class="title" style="padding-top: 6px;"> <div class="title" style="padding-top: 6px;">
<span>{{$t('Set global')}}</span> <span>{{$t('Set global')}}</span>
</div> </div>
@ -120,7 +136,15 @@
// tenant code // tenant code
tenantCode: 'default', tenantCode: 'default',
// checked Timeout alarm // checked Timeout alarm
checkedTimeout: true checkedTimeout: true,
// process execute type
executionType: 'PARALLEL',
itemsList: [
{ key: 'PARALLEL', val: 'parallel' },
{ key: 'SERIAL_WAIT', val: 'Serial wait' },
{ key: 'SERIAL_DISCARD', val: 'Serial discard' },
{ key: 'SERIAL_PRIORITY', val: 'Serial priority' }
]
} }
}, },
mixins: [disabledState], mixins: [disabledState],
@ -151,6 +175,7 @@
this.store.commit('dag/setName', _.cloneDeep(this.name)) this.store.commit('dag/setName', _.cloneDeep(this.name))
this.store.commit('dag/setTimeout', _.cloneDeep(this.timeout)) this.store.commit('dag/setTimeout', _.cloneDeep(this.timeout))
this.store.commit('dag/setTenantCode', _.cloneDeep(this.tenantCode)) this.store.commit('dag/setTenantCode', _.cloneDeep(this.tenantCode))
this.store.commit('dag/setExecutionType', _.cloneDeep(this.executionType))
this.store.commit('dag/setDesc', _.cloneDeep(this.description)) this.store.commit('dag/setDesc', _.cloneDeep(this.description))
this.store.commit('dag/setSyncDefine', this.syncDefine) this.store.commit('dag/setSyncDefine', this.syncDefine)
this.store.commit('dag/setReleaseState', this.releaseState) this.store.commit('dag/setReleaseState', this.releaseState)
@ -263,6 +288,7 @@
this.tenantCode = this.store.state.user.userInfo.tenantCode || 'default' this.tenantCode = this.store.state.user.userInfo.tenantCode || 'default'
} }
}) })
this.executionType = dag.executionType
}, },
mounted () {}, mounted () {},
components: { FormTenant, mLocalParams } components: { FormTenant, mLocalParams }

2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue

@ -266,7 +266,7 @@
* Return run type * Return run type
*/ */
_rtRunningType (code) { _rtRunningType (code) {
return _.filter(runningType, v => v.code === code)[0].desc return (_.filter(runningType, v => v.code === code)[0] || {}).desc
}, },
/** /**
* Return status * Return status

7
dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js

@ -143,6 +143,9 @@ export default {
state.globalParams = res.data.processDefinition.globalParamList state.globalParams = res.data.processDefinition.globalParamList
// timeout // timeout
state.timeout = res.data.processDefinition.timeout state.timeout = res.data.processDefinition.timeout
// executionType
state.executionType = res.data.processDefinition.executionType
// tenantId
// tenantCode // tenantCode
state.tenantCode = res.data.processDefinition.tenantCode || 'default' state.tenantCode = res.data.processDefinition.tenantCode || 'default'
// tasks info // tasks info
@ -240,6 +243,8 @@ export default {
state.globalParams = processDefinition.globalParamList state.globalParams = processDefinition.globalParamList
// timeout // timeout
state.timeout = processDefinition.timeout state.timeout = processDefinition.timeout
// executionType
state.executionType = processDefinition.executionType
// tenantCode // tenantCode
state.tenantCode = res.data.tenantCode || 'default' state.tenantCode = res.data.tenantCode || 'default'
// tasks info // tasks info
@ -282,6 +287,7 @@ export default {
taskDefinitionJson: JSON.stringify(state.tasks), taskDefinitionJson: JSON.stringify(state.tasks),
taskRelationJson: JSON.stringify(state.connects), taskRelationJson: JSON.stringify(state.connects),
tenantCode: state.tenantCode, tenantCode: state.tenantCode,
executionType: state.executionType,
description: _.trim(state.description), description: _.trim(state.description),
globalParams: JSON.stringify(state.globalParams), globalParams: JSON.stringify(state.globalParams),
timeout: state.timeout timeout: state.timeout
@ -303,6 +309,7 @@ export default {
taskDefinitionJson: JSON.stringify(state.tasks), taskDefinitionJson: JSON.stringify(state.tasks),
taskRelationJson: JSON.stringify(state.connects), taskRelationJson: JSON.stringify(state.connects),
tenantCode: state.tenantCode, tenantCode: state.tenantCode,
executionType: state.executionType,
description: _.trim(state.description), description: _.trim(state.description),
globalParams: JSON.stringify(state.globalParams), globalParams: JSON.stringify(state.globalParams),
timeout: state.timeout, timeout: state.timeout,

7
dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js

@ -63,6 +63,12 @@ export default {
setTimeout (state, payload) { setTimeout (state, payload) {
state.timeout = payload state.timeout = payload
}, },
/**
* set executionType
*/
setExecutionType (state, payload) {
state.executionType = payload
},
/** /**
* set tenantCode * set tenantCode
*/ */
@ -113,6 +119,7 @@ export default {
state.name = (payload && payload.name) || '' state.name = (payload && payload.name) || ''
state.description = (payload && payload.description) || '' state.description = (payload && payload.description) || ''
state.timeout = (payload && payload.timeout) || 0 state.timeout = (payload && payload.timeout) || 0
state.executionType = (payload && payload.executionType) || 'PARALLEL'
state.tenantCode = (payload && payload.tenantCode) || 'default' state.tenantCode = (payload && payload.tenantCode) || 'default'
state.processListS = (payload && payload.processListS) || [] state.processListS = (payload && payload.processListS) || []
state.resourcesListS = (payload && payload.resourcesListS) || [] state.resourcesListS = (payload && payload.resourcesListS) || []

2
dolphinscheduler-ui/src/js/conf/home/store/dag/state.js

@ -37,6 +37,8 @@ export default {
tasks: [], tasks: [],
// Timeout alarm // Timeout alarm
timeout: 0, timeout: 0,
// process execute type
executionType: 'PARALLEL',
// tenant code // tenant code
tenantCode: 'default', tenantCode: 'default',
// Node location information // Node location information

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

@ -711,6 +711,12 @@ export default {
'The condition content cannot be empty': 'The condition content cannot be empty', 'The condition content cannot be empty': 'The condition content cannot be empty',
'Reference from': 'Reference from', 'Reference from': 'Reference from',
'No more...': 'No more...', 'No more...': 'No more...',
'Process execute type': 'Process execute type',
parallel: 'parallel',
'Serial wait': 'Serial wait',
'Serial discard': 'Serial discard',
'Serial priority': 'Serial priority',
'Recover serial wait': 'Recover serial wait',
IsEnableProxy: 'Enable Proxy', IsEnableProxy: 'Enable Proxy',
WebHook: 'WebHook', WebHook: 'WebHook',
Keyword: 'Keyword', Keyword: 'Keyword',

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

@ -711,6 +711,12 @@ export default {
'The condition content cannot be empty': '条件内容不能为空', 'The condition content cannot be empty': '条件内容不能为空',
'Reference from': '使用已有任务', 'Reference from': '使用已有任务',
'No more...': '没有更多了...', 'No more...': '没有更多了...',
'Process execute type': '执行策略',
parallel: '并行',
'Serial wait': '串行等待',
'Serial discard': '串行抛弃',
'Serial priority': '串行优先',
'Recover serial wait': '串行恢复',
IsEnableProxy: '启用代理', IsEnableProxy: '启用代理',
WebHook: 'Web钩子', WebHook: 'Web钩子',
Keyword: '密钥', Keyword: '密钥',

Loading…
Cancel
Save