[dolphinscheduler] branch 2.0.1-prepare updated: [2.0.1-cherrypick][Feature][Workflow relationship] The page displays null as -. (#7105)

[ki...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kirs pushed a commit to branch 2.0.1-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/2.0.1-prepare by this push:
     new b7bd813  [2.0.1-cherrypick][Feature][Workflow relationship] The page displays null as -. (#7105)
b7bd813 is described below

commit b7bd813e35db2a1d37ca04df6f3fa5f600d1bbbd
Author: songjianet <17...@qq.com>
AuthorDate: Wed Dec 1 17:20:43 2021 +0800

    [2.0.1-cherrypick][Feature][Workflow relationship] The page displays null as -. (#7105)
    
    * [Feature][Workflow relationship] The page displays `null` as `-`.
    
    * [Feature][Workflow relationship] The page displays `null` as `-`.
---
 .../pages/projects/pages/kinship/_source/graphGrid.vue    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGrid.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGrid.vue
index 073d733..d674b1d 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGrid.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGrid.vue
@@ -38,7 +38,20 @@
     },
     mounted () {
       const graphGrid = echarts.init(this.$refs['graph-grid'])
-      graphGrid.setOption(graphGridOption(this.locations, this.connects, this.sourceWorkFlowCode, this.isShowLabel), true)
+      graphGrid.setOption(
+        graphGridOption(
+          this.locations.map(item => {
+            item.crontab = item.crontab !== null ? item.crontab : '-'
+            item.scheduleEndTime = item.scheduleEndTime !== null ? item.scheduleEndTime : '-'
+            item.scheduleStartTime = item.scheduleStartTime !== null ? item.scheduleStartTime : '-'
+            return item
+          }),
+          this.connects,
+          this.sourceWorkFlowCode,
+          this.isShowLabel
+        ),
+        true
+      )
       graphGrid.on('click', (params) => {
         // Jump to the definition page
         this.$router.push({ path: `/projects/${this.projectCode}/definition/list/${params.data.code}` })