diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue index ae15e20f74548a876d52edeeb7a2601b5f9198eb..6d244958821211adb6bd2bf5ce18efec6e00ea3a 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue @@ -77,7 +77,7 @@ icon="ans-icon-triangle-solid-right" size="xsmall" data-container="body" - v-if="type === 'instance'" + v-if="(type === 'instance' || 'definition') && urlParam.id !=undefined" style="vertical-align: middle;" @click="dagAutomaticLayout"> @@ -155,6 +155,7 @@ isLoading: false, taskId: null, arg: false, + } }, mixins: [disabledState], diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue index dd4530786db4f520b9b82015103fc29e72412400..1a090dc5e43e77c3b68463d864705bea5bbe8064 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue @@ -25,7 +25,7 @@ {{$t('#')}} - + {{$t('Process Name')}} @@ -57,9 +57,9 @@ {{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}} - + - + {{item.name}} 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 2996f7d7314633e298afd9aaa29f7bc336343e86..4484e80ed8e8c2ddaf01484174c17936867f5136 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 @@ -25,7 +25,7 @@ {{$t('#')}} - + {{$t('Process Name')}} @@ -69,7 +69,7 @@ {{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}} - + {{item.name}} 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 97d7364901475d6d55aa7fb6c8361cc4bd630d8c..1acc2576282646b8ec1f21d55636b76267edeb9b 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 @@ -22,10 +22,10 @@ {{$t('#')}} - + {{$t('Name')}} - + {{$t('Process Instance')}} @@ -65,10 +65,10 @@ {{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}} - + {{item.name}} - {{item.processInstanceName}} + {{item.processInstanceName}} {{item.executorName}} - diff --git a/dolphinscheduler-ui/src/sass/common/_table.scss b/dolphinscheduler-ui/src/sass/common/_table.scss index 5b5bf34f91f74f9a8eb0512a2bfa232b3a0cc1d8..688f8e32693ff2a06957a29765df14b88687171e 100644 --- a/dolphinscheduler-ui/src/sass/common/_table.scss +++ b/dolphinscheduler-ui/src/sass/common/_table.scss @@ -95,7 +95,7 @@ font-size: 12px; border-bottom: 1px solid #ecf3ff; &:hover { - background: #f6faff; + background: #ddecff; } th,td{ &:nth-child(1) { @@ -165,7 +165,7 @@ } &:hover { td { - background: #f6faff; + background: #ddecff; } } }