|
|
@ -383,6 +383,7 @@ |
|
|
|
@on-switch-result="_onSwitchResult" |
|
|
|
@on-switch-result="_onSwitchResult" |
|
|
|
:backfill-item="backfillItem" |
|
|
|
:backfill-item="backfillItem" |
|
|
|
:nodeData="nodeData" |
|
|
|
:nodeData="nodeData" |
|
|
|
|
|
|
|
:postTasks="postTasks" |
|
|
|
></m-switch> |
|
|
|
></m-switch> |
|
|
|
<!-- waterdrop node --> |
|
|
|
<!-- waterdrop node --> |
|
|
|
<m-waterdrop |
|
|
|
<m-waterdrop |
|
|
@ -517,7 +518,7 @@ |
|
|
|
label: `${i18n.$t('Failed')}` |
|
|
|
label: `${i18n.$t('Failed')}` |
|
|
|
} |
|
|
|
} |
|
|
|
], |
|
|
|
], |
|
|
|
// for CONDITIONS |
|
|
|
// for CONDITIONS and SWITCH |
|
|
|
postTasks: [], |
|
|
|
postTasks: [], |
|
|
|
prevTasks: [], |
|
|
|
prevTasks: [], |
|
|
|
// refresh part of the formModel, after set backfillItem outside |
|
|
|
// refresh part of the formModel, after set backfillItem outside |
|
|
@ -550,6 +551,7 @@ |
|
|
|
return { |
|
|
|
return { |
|
|
|
code: task.code, |
|
|
|
code: task.code, |
|
|
|
conditionResult: task.taskParams.conditionResult, |
|
|
|
conditionResult: task.taskParams.conditionResult, |
|
|
|
|
|
|
|
switchResult: task.taskParams.switchResult, |
|
|
|
delayTime: task.delayTime, |
|
|
|
delayTime: task.delayTime, |
|
|
|
dependence: task.taskParams.dependence, |
|
|
|
dependence: task.taskParams.dependence, |
|
|
|
desc: task.description, |
|
|
|
desc: task.description, |
|
|
@ -559,7 +561,8 @@ |
|
|
|
params: _.omit(task.taskParams, [ |
|
|
|
params: _.omit(task.taskParams, [ |
|
|
|
'conditionResult', |
|
|
|
'conditionResult', |
|
|
|
'dependence', |
|
|
|
'dependence', |
|
|
|
'waitStartTimeout' |
|
|
|
'waitStartTimeout', |
|
|
|
|
|
|
|
'switchResult' |
|
|
|
]), |
|
|
|
]), |
|
|
|
retryInterval: task.failRetryInterval, |
|
|
|
retryInterval: task.failRetryInterval, |
|
|
|
runFlag: task.flag, |
|
|
|
runFlag: task.flag, |
|
|
@ -763,7 +766,8 @@ |
|
|
|
...this.params, |
|
|
|
...this.params, |
|
|
|
dependence: this.cacheDependence, |
|
|
|
dependence: this.cacheDependence, |
|
|
|
conditionResult: this.conditionResult, |
|
|
|
conditionResult: this.conditionResult, |
|
|
|
waitStartTimeout: this.waitStartTimeout |
|
|
|
waitStartTimeout: this.waitStartTimeout, |
|
|
|
|
|
|
|
switchResult: this.switchResult |
|
|
|
}, |
|
|
|
}, |
|
|
|
flag: this.runFlag, |
|
|
|
flag: this.runFlag, |
|
|
|
taskPriority: this.taskInstancePriority, |
|
|
|
taskPriority: this.taskInstancePriority, |
|
|
@ -861,6 +865,9 @@ |
|
|
|
this.successBranch = o.conditionResult.successNode[0] |
|
|
|
this.successBranch = o.conditionResult.successNode[0] |
|
|
|
this.failedBranch = o.conditionResult.failedNode[0] |
|
|
|
this.failedBranch = o.conditionResult.failedNode[0] |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (o.switchResult) { |
|
|
|
|
|
|
|
this.switchResult = o.switchResult |
|
|
|
|
|
|
|
} |
|
|
|
// If the workergroup has been deleted, set the default workergroup |
|
|
|
// If the workergroup has been deleted, set the default workergroup |
|
|
|
for ( |
|
|
|
for ( |
|
|
|
let i = 0; |
|
|
|
let i = 0; |
|
|
|