[Feature][JsonSplit] task page, rename field "description" to "desc" (#5137)
* fix: task page, rename "description" to "desc" * fix: The default value of field dependence is null. * fix: frontend compile check Co-authored-by: wen-hemin <wenhemin@apache.com>
This commit is contained in:
parent
21b7b77d50
commit
e53367bdcc
|
|
@ -2510,7 +2510,7 @@ public class ProcessService {
|
|||
v.setMaxRetryTimes(taskDefinitionLog.getFailRetryTimes());
|
||||
v.setRetryInterval(taskDefinitionLog.getFailRetryInterval());
|
||||
v.setParams(taskDefinitionLog.getTaskType() == TaskType.DEPENDENT ? "" : taskDefinitionLog.getTaskParams());
|
||||
v.setDependence(taskDefinitionLog.getTaskType() == TaskType.DEPENDENT ? taskDefinitionLog.getTaskParams() : "");
|
||||
v.setDependence(taskDefinitionLog.getTaskType() == TaskType.DEPENDENT ? taskDefinitionLog.getTaskParams() : null);
|
||||
v.setTaskInstancePriority(taskDefinitionLog.getTaskPriority());
|
||||
v.setWorkerGroup(taskDefinitionLog.getWorkerGroup());
|
||||
v.setTimeout(JSONUtils.toJsonString(new TaskTimeoutParameter(taskDefinitionLog.getTimeoutFlag() == TimeoutFlag.OPEN,
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
:rows="2"
|
||||
type="textarea"
|
||||
:disabled="isDetails"
|
||||
v-model="description"
|
||||
v-model="desc"
|
||||
:placeholder="$t('Please enter description')">
|
||||
</el-input>
|
||||
</div>
|
||||
|
|
@ -314,7 +314,7 @@
|
|||
// node name
|
||||
name: '',
|
||||
// description
|
||||
description: '',
|
||||
desc: '',
|
||||
// Node echo data
|
||||
backfillItem: {},
|
||||
cacheBackfillItem: {},
|
||||
|
|
@ -332,8 +332,8 @@
|
|||
dependence: {},
|
||||
// cache dependence
|
||||
cacheDependence: {},
|
||||
//task code
|
||||
code:'',
|
||||
// task code
|
||||
code: '',
|
||||
// Current node params data
|
||||
params: {},
|
||||
// Running sign
|
||||
|
|
@ -475,9 +475,9 @@
|
|||
type: this.nodeData.taskType,
|
||||
id: this.nodeData.id,
|
||||
name: this.name,
|
||||
code:this.code,
|
||||
code: this.code,
|
||||
params: this.params,
|
||||
description: this.description,
|
||||
desc: this.desc,
|
||||
runFlag: this.runFlag,
|
||||
conditionResult: this.conditionResult,
|
||||
dependence: this.cacheDependence,
|
||||
|
|
@ -601,7 +601,7 @@
|
|||
name: this.name,
|
||||
code: this.code,
|
||||
params: this.params,
|
||||
description: this.description,
|
||||
desc: this.desc,
|
||||
runFlag: this.runFlag,
|
||||
conditionResult: this.conditionResult,
|
||||
dependence: this.dependence,
|
||||
|
|
@ -696,7 +696,7 @@
|
|||
this.name = o.name
|
||||
this.taskInstancePriority = o.taskInstancePriority
|
||||
this.runFlag = o.runFlag || 'NORMAL'
|
||||
this.description = o.description
|
||||
this.desc = o.desc
|
||||
this.maxRetryTimes = o.maxRetryTimes
|
||||
this.retryInterval = o.retryInterval
|
||||
this.delayTime = o.delayTime
|
||||
|
|
@ -767,7 +767,7 @@
|
|||
type: this.nodeData.taskType,
|
||||
id: this.nodeData.id,
|
||||
name: this.name,
|
||||
description: this.description,
|
||||
desc: this.desc,
|
||||
runFlag: this.runFlag,
|
||||
dependence: this.cacheDependence,
|
||||
maxRetryTimes: this.maxRetryTimes,
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<template v-show="!isNodata">
|
||||
<template v-if="!isNodata">
|
||||
<div class="gantt"></div>
|
||||
</template>
|
||||
<template v-if="isNodata">
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<h2>
|
||||
<span>{{name}}</span>
|
||||
</h2>
|
||||
<template v-show="isViewType">
|
||||
<template v-if="isViewType">
|
||||
<template v-if="!msg">
|
||||
<div class="code-mirror-model">
|
||||
<textarea id="code-edit-mirror" name="code-edit-mirror"></textarea>
|
||||
|
|
|
|||
Loading…
Reference in New Issue