You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ji...@apache.org on 2021/11/07 02:35:37 UTC
[dolphinscheduler] branch dev updated: Replace taskName with
taskCode (#6719)
This is an automated email from the ASF dual-hosted git repository.
jinyleechina pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new b226253 Replace taskName with taskCode (#6719)
b226253 is described below
commit b226253eec219bc0152ed5a3c5939e13385bcedc
Author: wangyizhi <wa...@cmss.chinamobile.com>
AuthorDate: Sun Nov 7 10:35:29 2021 +0800
Replace taskName with taskCode (#6719)
---
.../home/pages/dag/_source/formModel/formModel.vue | 11 +++---
.../formModel/tasks/_source/dependItemList.vue | 44 ++++++++++++++--------
.../_source/formModel/tasks/_source/nodeStatus.vue | 8 ++--
.../dag/_source/formModel/tasks/conditions.vue | 2 +-
.../dag/_source/formModel/tasks/dependent.vue | 2 +-
.../pages/dag/_source/formModel/tasks/switch.vue | 4 +-
6 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
index ceeed13..2995da1 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
@@ -193,7 +193,7 @@
<el-option
v-for="item in postTasks"
:key="item.code"
- :value="item.name"
+ :value="item.code"
:label="item.name"
></el-option>
</el-select>
@@ -230,7 +230,7 @@
<el-option
v-for="item in postTasks"
:key="item.code"
- :value="item.name"
+ :value="item.code"
:label="item.name"
></el-option>
</el-select>
@@ -694,8 +694,7 @@
return false
}
if (
- this.successBranch !== '' &&
- this.successBranch !== null &&
+ this.successBranch &&
this.successBranch === this.failedBranch
) {
this.$message.warning(
@@ -754,8 +753,8 @@
if (this.$refs.preTasks) {
this.$refs.preTasks.setPreNodes()
}
- this.conditionResult.successNode[0] = this.successBranch
- this.conditionResult.failedNode[0] = this.failedBranch
+ this.successBranch && (this.conditionResult.successNode[0] = this.successBranch)
+ this.failedBranch && (this.conditionResult.failedNode[0] = this.failedBranch)
this.$emit('addTaskInfo', {
item: {
code: this.nodeData.id,
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
index 82822ab..883b13a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
@@ -23,8 +23,8 @@
<el-select filterable :disabled="isDetails" style="width: 450px" v-model="el.definitionCode" @change="v => _onChangeDefinitionCode(v, $index)" size="small">
<el-option v-for="item in el.definitionList" :key="item.value" :value="item.value" :label="item.label"></el-option>
</el-select>
- <el-select filterable :disabled="isDetails" style="width: 450px" v-model="el.depTasks" size="small">
- <el-option v-for="item in el.depTasksList || []" :key="item" :value="item" :label="item"></el-option>
+ <el-select filterable :disabled="isDetails" style="width: 450px" v-model="el.depTaskCode" size="small">
+ <el-option v-for="item in el.depTasksList || []" :key="item.code" :value="item.code" :label="item.name"></el-option>
</el-select>
<el-select v-model="el.cycle" :disabled="isDetails" @change="v => _onChangeCycle(v, $index)" size="small">
<el-option v-for="item in cycleList" :key="item.value" :value="item.value" :label="item.label"></el-option>
@@ -55,6 +55,13 @@
import _ from 'lodash'
import { cycleList, dateValueList } from './commcon'
import disabledState from '@/module/mixin/disabledState'
+
+ // Depend on all tasks
+ const DEP_ALL_TASK = {
+ code: 0,
+ name: 'ALL'
+ }
+
export default {
name: 'dep-list',
data () {
@@ -87,7 +94,7 @@
let projectCode = this.projectList[0].value
this._getProcessByProjectCode(projectCode).then(definitionList => {
if (!definitionList || definitionList.length === 0) {
- this.$emit('dependItemListEvent', _.concat(this.dependItemList, this._rtNewParams('', [], ['ALL'], projectCode)))
+ this.$emit('dependItemListEvent', _.concat(this.dependItemList, this._rtNewParams('', [], [_.cloneDeep(DEP_ALL_TASK)], projectCode)))
return
}
// dependItemList index
@@ -148,7 +155,12 @@
return new Promise((resolve, reject) => {
if (is) {
this.store.dispatch('dag/getProcessTasksList', { code: codes }).then(res => {
- resolve(['ALL'].concat(_.map(res, v => v.name)))
+ resolve([{ ...DEP_ALL_TASK }].concat(_.map(res, v => {
+ return {
+ code: v.code,
+ name: v.name
+ }
+ })))
})
} else {
this.store.dispatch('dag/getTaskListDefIdAll', { codes: codes }).then(res => {
@@ -163,11 +175,11 @@
_onChangeProjectCode (value, itemIndex) {
this._getProcessByProjectCode(value).then(definitionList => {
if (!definitionList || definitionList.length === 0) {
- this.$set(this.dependItemList, itemIndex, this._cpOldParams(value, '', [], ['ALL'], {
+ this.$set(this.dependItemList, itemIndex, this._cpOldParams(value, '', [], [_.cloneDeep(DEP_ALL_TASK)], {
cycle: 'day',
dateValue: 'today',
state: '',
- depTasks: 'ALL'
+ depTaskCode: DEP_ALL_TASK.code
}))
return
}
@@ -175,8 +187,8 @@
let definitionCode = definitionList[0].value
this._getDependItemList(definitionCode).then(depTasksList => {
let item = this.dependItemList[itemIndex]
- // init set depTasks All
- item.depTasks = 'ALL'
+ // init set depTaskCode All
+ item.depTaskCode = DEP_ALL_TASK.code
// set dependItemList item data
this.$set(this.dependItemList, itemIndex, this._cpOldParams(value, definitionCode, definitionList, depTasksList, item))
})
@@ -186,8 +198,8 @@
// get depItem list data
this._getDependItemList(value).then(depTasksList => {
let item = this.dependItemList[itemIndex]
- // init set depTasks All
- item.depTasks = 'ALL'
+ // init set depTaskCode All
+ item.depTaskCode = DEP_ALL_TASK.code
// set dependItemList item data
this.$set(this.dependItemList, itemIndex, this._rtOldParams(value, item.definitionList, depTasksList, item))
})
@@ -203,7 +215,7 @@
definitionCode: value,
// dependItem need private definitionList
definitionList: definitionList,
- depTasks: 'ALL',
+ depTaskCode: DEP_ALL_TASK.code,
depTasksList: depTasksList,
cycle: 'day',
dateValue: 'today',
@@ -217,7 +229,7 @@
definitionCode: value,
// dependItem need private definitionList
definitionList: definitionList,
- depTasks: item.depTasks || 'ALL',
+ depTaskCode: item.depTaskCode || DEP_ALL_TASK.code,
depTasksList: depTasksList,
cycle: item.cycle,
dateValue: item.dateValue,
@@ -231,7 +243,7 @@
projectCode: value,
definitionList: definitionList,
definitionCode: definitionCode,
- depTasks: item.depTasks || 'ALL',
+ depTaskCode: item.depTaskCode || DEP_ALL_TASK.code,
depTasksList: depTasksList,
cycle: item.cycle,
dateValue: item.dateValue,
@@ -262,10 +274,10 @@
if (definitionList && definitionList.length > 0) {
let definitionCode = definitionList[0].value
this._getDependItemList(definitionCode).then(depTasksList => {
- this.$emit('dependItemListEvent', _.concat(this.dependItemList, this._rtNewParams(definitionCode, definitionList, depTasksList || ['ALL'], projectCode)))
+ this.$emit('dependItemListEvent', _.concat(this.dependItemList, this._rtNewParams(definitionCode, definitionList, depTasksList || [_.cloneDeep(DEP_ALL_TASK)], projectCode)))
})
} else {
- this.$emit('dependItemListEvent', _.concat(this.dependItemList, this._rtNewParams('', [], ['ALL'], projectCode)))
+ this.$emit('dependItemListEvent', _.concat(this.dependItemList, this._rtNewParams('', [], [_.cloneDeep(DEP_ALL_TASK)], projectCode)))
}
})
} else {
@@ -275,7 +287,7 @@
this._getDependItemList(codes, false).then(res => {
_.map(this.dependItemList, (v, i) => {
this._getProcessByProjectCode(v.projectCode).then(definitionList => {
- this.$set(this.dependItemList, i, this._rtOldParams(v.definitionCode, definitionList, ['ALL'].concat(_.map(res[v.definitionCode] || [], v => v.name)), v))
+ this.$set(this.dependItemList, i, this._rtOldParams(v.definitionCode, definitionList, [_.cloneDeep(DEP_ALL_TASK)].concat(_.map(res[v.definitionCode] || [], v => ({ code: v.code, name: v.name }))), v))
})
})
})
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
index 7ff4acf..3e2889b 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
@@ -17,8 +17,8 @@
<template>
<div class="dep-list-model">
<div v-for="(el,$index) in dependItemList" :key='$index' class="list" @click="itemIndex = $index">
- <el-select style="width: 150px;" size="small" v-model="el.depTasks" :disabled="isDetails">
- <el-option v-for="item in prevTasks" :key="item.code" :value="item.name" :label="item.name">
+ <el-select style="width: 150px;" size="small" :value="el.depTaskCode || ''" @change="(val) => { el.depTaskCode = val }" :disabled="isDetails">
+ <el-option v-for="item in prevTasks" :key="item.code" :value="item.code" :label="item.name">
</el-option>
</el-select>
<el-select style="width: 116px;" size="small" v-model="el.status" :disabled="isDetails">
@@ -134,13 +134,13 @@
},
_rtNewParams () {
return {
- depTasks: '',
+ depTaskCode: 0,
status: ''
}
},
_rtOldParams (value, depTasksList, item) {
return {
- depTasks: '',
+ depTaskCode: 0,
status: ''
}
},
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/conditions.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/conditions.vue
index 62970c6..3399d72 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/conditions.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/conditions.vue
@@ -147,7 +147,7 @@
// Process instance return status display matches by key
_.map(this.dependTaskList, v => _.map(v.dependItemList, v1 => {
$(`#${o.id}`).siblings().each(function () {
- if (v1.depTasks === $(this).text()) {
+ if (v1.depTaskCode === $(this).text()) {
v1.state = $(this).attr('data-dependent-depstate')
}
})
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
index 7a6ca02..b69568b 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
@@ -148,7 +148,7 @@
let defaultState = this.isDetails ? 'WAITING' : ''
// Process instance return status display matches by key
_.map(this.dependTaskList, v => _.map(v.dependItemList, v1 => {
- v1.state = dependentResult[`${v1.definitionId}-${v1.depTasks}-${v1.cycle}-${v1.dateValue}`] || defaultState
+ v1.state = dependentResult[`${v1.definitionId}-${v1.depTaskCode}-${v1.cycle}-${v1.dateValue}`] || defaultState
}))
}
},
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/switch.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/switch.vue
index d003405..5e2e90d 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/switch.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/switch.vue
@@ -35,7 +35,7 @@
</label>
<span class="text-b" style="padding-left: 0">{{$t('Branch flow')}}</span>
<el-select style="width: 157px;" size="small" v-model="el.nextNode" clearable :disabled="isDetails">
- <el-option v-for="item in postTasks" :key="item.code" :value="item.name" :label="item.name"></el-option>
+ <el-option v-for="item in postTasks" :key="item.code" :value="item.code" :label="item.name"></el-option>
</el-select>
<span class="operation">
<a href="javascript:" class="delete" @click="!isDetails && _removeDep(index)" v-if="index === (dependItemList.length - 1)">
@@ -53,7 +53,7 @@
<div slot="text">{{$t('Branch flow')}}</div>
<div slot="content">
<el-select style="width: 157px;" size="small" v-model="nextNode" clearable :disabled="isDetails">
- <el-option v-for="item in postTasks" :key="item.code" :value="item.name" :label="item.name"></el-option>
+ <el-option v-for="item in postTasks" :key="item.code" :value="item.code" :label="item.name"></el-option>
</el-select>
</div>
</m-list-box>