You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ki...@apache.org on 2021/03/03 12:38:21 UTC
[incubator-dolphinscheduler] branch dev updated: the instance page
duration field content added empty filter processing. (#4938)
This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new e5fb79b the instance page duration field content added empty filter processing. (#4938)
e5fb79b is described below
commit e5fb79b433d01b97b99ffb7b9d40c9d78bf4fb76
Author: zhuangchong <37...@users.noreply.github.com>
AuthorDate: Wed Mar 3 20:38:14 2021 +0800
the instance page duration field content added empty filter processing. (#4938)
---
.../projects/pages/instance/pages/list/_source/list.vue | 6 +++++-
.../home/pages/projects/pages/taskInstance/_source/list.vue | 12 ++++++++++--
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
index cc0e513..554654e 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
@@ -56,7 +56,11 @@
<span>{{scope.row.endTime | formatDate}}</span>
</template>
</el-table-column>
- <el-table-column prop="duration" :label="$t('Duration')"></el-table-column>
+ <el-table-column :label="$t('Duration')">
+ <template slot-scope="scope">
+ <span>{{scope.row.duration | filterNull}}</span>
+ </template>
+ </el-table-column>
<el-table-column prop="runTimes" :label="$t('Run Times')"></el-table-column>
<el-table-column prop="recovery" :label="$t('fault-tolerant sign')"></el-table-column>
<el-table-column prop="executorName" :label="$t('Executor')"></el-table-column>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
index b5bb553..d8d1b6c 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
@@ -53,9 +53,17 @@
<span>{{scope.row.endTime | formatDate}}</span>
</template>
</el-table-column>
- <el-table-column prop="host" :label="$t('host')" width="150"></el-table-column>
- <el-table-column prop="duration" :label="$t('Duration')"></el-table-column>
+ <el-table-column :label="$t('Duration')">
+ <template slot-scope="scope">
+ <span>{{scope.row.duration | filterNull}}</span>
+ </template>
+ </el-table-column>
<el-table-column prop="retryTimes" :label="$t('Retry Count')"></el-table-column>
+ <el-table-column :label="$t('host')">
+ <template slot-scope="scope">
+ <span>{{scope.row.host | filterNull}}</span>
+ </template>
+ </el-table-column>
<el-table-column :label="$t('Operation')" width="80" fixed="right">
<template slot-scope="scope">
<div>