Browse Source

[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>
pull/3/MERGE
wen-hemin 4 years ago committed by GitHub
parent
commit
e53367bdcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
  2. 12
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
  3. 2
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/index.vue
  4. 2
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue

2
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java

@ -2510,7 +2510,7 @@ public class ProcessService {
v.setMaxRetryTimes(taskDefinitionLog.getFailRetryTimes()); v.setMaxRetryTimes(taskDefinitionLog.getFailRetryTimes());
v.setRetryInterval(taskDefinitionLog.getFailRetryInterval()); v.setRetryInterval(taskDefinitionLog.getFailRetryInterval());
v.setParams(taskDefinitionLog.getTaskType() == TaskType.DEPENDENT ? "" : taskDefinitionLog.getTaskParams()); 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.setTaskInstancePriority(taskDefinitionLog.getTaskPriority());
v.setWorkerGroup(taskDefinitionLog.getWorkerGroup()); v.setWorkerGroup(taskDefinitionLog.getWorkerGroup());
v.setTimeout(JSONUtils.toJsonString(new TaskTimeoutParameter(taskDefinitionLog.getTimeoutFlag() == TimeoutFlag.OPEN, v.setTimeout(JSONUtils.toJsonString(new TaskTimeoutParameter(taskDefinitionLog.getTimeoutFlag() == TimeoutFlag.OPEN,

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

@ -64,7 +64,7 @@
:rows="2" :rows="2"
type="textarea" type="textarea"
:disabled="isDetails" :disabled="isDetails"
v-model="description" v-model="desc"
:placeholder="$t('Please enter description')"> :placeholder="$t('Please enter description')">
</el-input> </el-input>
</div> </div>
@ -314,7 +314,7 @@
// node name // node name
name: '', name: '',
// description // description
description: '', desc: '',
// Node echo data // Node echo data
backfillItem: {}, backfillItem: {},
cacheBackfillItem: {}, cacheBackfillItem: {},
@ -477,7 +477,7 @@
name: this.name, name: this.name,
code: this.code, code: this.code,
params: this.params, params: this.params,
description: this.description, desc: this.desc,
runFlag: this.runFlag, runFlag: this.runFlag,
conditionResult: this.conditionResult, conditionResult: this.conditionResult,
dependence: this.cacheDependence, dependence: this.cacheDependence,
@ -601,7 +601,7 @@
name: this.name, name: this.name,
code: this.code, code: this.code,
params: this.params, params: this.params,
description: this.description, desc: this.desc,
runFlag: this.runFlag, runFlag: this.runFlag,
conditionResult: this.conditionResult, conditionResult: this.conditionResult,
dependence: this.dependence, dependence: this.dependence,
@ -696,7 +696,7 @@
this.name = o.name this.name = o.name
this.taskInstancePriority = o.taskInstancePriority this.taskInstancePriority = o.taskInstancePriority
this.runFlag = o.runFlag || 'NORMAL' this.runFlag = o.runFlag || 'NORMAL'
this.description = o.description this.desc = o.desc
this.maxRetryTimes = o.maxRetryTimes this.maxRetryTimes = o.maxRetryTimes
this.retryInterval = o.retryInterval this.retryInterval = o.retryInterval
this.delayTime = o.delayTime this.delayTime = o.delayTime
@ -767,7 +767,7 @@
type: this.nodeData.taskType, type: this.nodeData.taskType,
id: this.nodeData.id, id: this.nodeData.id,
name: this.name, name: this.name,
description: this.description, desc: this.desc,
runFlag: this.runFlag, runFlag: this.runFlag,
dependence: this.cacheDependence, dependence: this.cacheDependence,
maxRetryTimes: this.maxRetryTimes, maxRetryTimes: this.maxRetryTimes,

2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/index.vue

@ -29,7 +29,7 @@
</a> </a>
</div> </div>
</div> </div>
<template v-show="!isNodata"> <template v-if="!isNodata">
<div class="gantt"></div> <div class="gantt"></div>
</template> </template>
<template v-if="isNodata"> <template v-if="isNodata">

2
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue

@ -21,7 +21,7 @@
<h2> <h2>
<span>{{name}}</span> <span>{{name}}</span>
</h2> </h2>
<template v-show="isViewType"> <template v-if="isViewType">
<template v-if="!msg"> <template v-if="!msg">
<div class="code-mirror-model"> <div class="code-mirror-model">
<textarea id="code-edit-mirror" name="code-edit-mirror"></textarea> <textarea id="code-edit-mirror" name="code-edit-mirror"></textarea>

Loading…
Cancel
Save