From e53367bdccade47316d2dd6aa3c030dfb17864e8 Mon Sep 17 00:00:00 2001
From: wen-hemin <39549317+wen-hemin@users.noreply.github.com>
Date: Wed, 24 Mar 2021 15:05:54 +0800
Subject: [PATCH] [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>
---
 .../service/process/ProcessService.java        |  2 +-
 .../pages/dag/_source/formModel/formModel.vue  | 18 +++++++++---------
 .../pages/instance/pages/gantt/index.vue       |  2 +-
 .../resource/pages/file/pages/edit/index.vue   |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
index 2c826dc592..4dbb60ae0a 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
@@ -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,
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 582c6a43f4..3f60abaab0 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
@@ -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,
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/index.vue
index 252fedc971..bcd2ab6996 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/index.vue
@@ -29,7 +29,7 @@
             </a>
           </div>
         </div>
-        <template v-show="!isNodata">
+        <template v-if="!isNodata">
           <div class="gantt"></div>
         </template>
         <template v-if="isNodata">
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue
index e4c7586419..b267ae7122 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue
@@ -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>