This is an automated email from the ASF dual-hosted git repository.
chenxingchun pushed a commit to branch 1.3.6-prepare
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/1.3.6-prepare by this push:
new 485ae46 Update the column name of the duration field on the instance
UI page.
new 1d47137 Merge pull request #5027 from
zhuangchong/1.3.6-imp-ui-duration-1
485ae46 is described below
commit 485ae46dbe446573e772172c7be45fa21c8c5ada
Author: zhuangchong <[email protected]>
AuthorDate: Wed Mar 10 12:36:16 2021 +0800
Update the column name of the duration field on the instance UI page.
---
.../home/pages/projects/pages/_source/taskRecordList/_source/list.vue | 4 ++--
.../home/pages/projects/pages/instance/pages/list/_source/list.vue | 2 +-
.../js/conf/home/pages/projects/pages/taskInstance/_source/list.vue | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/list.vue
index a1649a3..3162d64 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/list.vue
@@ -35,7 +35,7 @@
<span>{{$t('End Time')}}</span>
</th>
<th width="134">
- <span>{{$t('Duration')}}(s)</span>
+ <span>{{$t('Duration')}}</span>
</th>
<th>
<span>{{$t('Source Table')}}</span>
@@ -116,4 +116,4 @@
},
components: { }
}
-</script>
\ No newline at end of file
+</script>
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 8b9d3b2..0e4af86 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
@@ -44,7 +44,7 @@
<span>{{$t('End Time')}}</span>
</th>
<th scope="col" style="min-width: 60px">
- <span>{{$t('Duration')}}s</span>
+ <span>{{$t('Duration')}}</span>
</th>
<th scope="col" style="min-width: 60px">
<span>{{$t('Run Times')}}</span>
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 d5b19d6..5ba1ae9 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
@@ -50,7 +50,7 @@
<span>{{$t('host')}}</span>
</th>
<th scope="col" style="min-width: 70px">
- <span>{{$t('Duration')}}(s)</span>
+ <span>{{$t('Duration')}}</span>
</th>
<th scope="col" style="min-width: 60px">
<div style="width: 50px">
@@ -88,7 +88,7 @@
<span v-else>-</span>
</td>
<td style="max-width: 600px"><span style="padding-right:
5px">{{item.host || '-'}}</span></td>
- <td><span>{{item.duration}}</span></td>
+ <td><span>{{item.duration || '-'}}</span></td>
<td><span>{{item.retryTimes}}</span></td>
<td>
<x-button
