You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by wa...@apache.org on 2022/07/08 02:38:15 UTC

[dolphinscheduler] branch dev updated: [Feature-10594][ui] Data Quality Result Display Optimize (#10835)

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

wanggenhua pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 4d07efd3f2 [Feature-10594][ui] Data Quality Result Display Optimize (#10835)
4d07efd3f2 is described below

commit 4d07efd3f27288ace85081f61a00dbdbbad9ae1b
Author: Assert <42...@users.noreply.github.com>
AuthorDate: Fri Jul 8 10:38:07 2022 +0800

    [Feature-10594][ui] Data Quality Result Display Optimize (#10835)
---
 .../views/data-quality/task-result/use-table.ts    | 67 +++++++++++++++++++---
 1 file changed, 60 insertions(+), 7 deletions(-)

diff --git a/dolphinscheduler-ui/src/views/data-quality/task-result/use-table.ts b/dolphinscheduler-ui/src/views/data-quality/task-result/use-table.ts
index 5919d74eed..80cfadc5e0 100644
--- a/dolphinscheduler-ui/src/views/data-quality/task-result/use-table.ts
+++ b/dolphinscheduler-ui/src/views/data-quality/task-result/use-table.ts
@@ -16,7 +16,7 @@
  */
 
 import { useI18n } from 'vue-i18n'
-import { reactive, ref } from 'vue'
+import { h, reactive, ref } from 'vue'
 import { useAsyncState } from '@vueuse/core'
 import { queryExecuteResultListPaging } from '@/service/modules/data-quality'
 import { format } from 'date-fns'
@@ -30,9 +30,13 @@ import type {
   ResultListRes
 } from '@/service/modules/data-quality/types'
 import { parseTime } from '@/common/common'
+import ButtonLink from "@/components/button-link";
+import { NEllipsis, NTag } from "naive-ui";
+import { useRouter } from "vue-router";
 
 export function useTable() {
   const { t } = useI18n()
+  const router = useRouter()
 
   const variables = reactive({
     columns: [],
@@ -58,13 +62,33 @@ export function useTable() {
       },
       {
         title: t('data_quality.task_result.task_name'),
-        key: 'userName',
+        key: 'taskName',
         ...COLUMN_WIDTH_CONFIG['userName']
       },
       {
         title: t('data_quality.task_result.workflow_instance'),
         key: 'processInstanceName',
-        ...COLUMN_WIDTH_CONFIG['name']
+        ...COLUMN_WIDTH_CONFIG['name'],
+        render: (row: ResultItem) =>
+          h(
+            ButtonLink,
+            {
+              onClick: () =>
+                void router.push({
+                  name: 'workflow-instance-detail',
+                  params: { projectCode: row.projectCode, id: row.processInstanceId },
+                  query: { code: row.processDefinitionCode }
+                })
+            },
+            {
+              default: () =>
+                h(
+                  NEllipsis,
+                  COLUMN_WIDTH_CONFIG['linkEllipsis'],
+                  () => row.processInstanceName
+                )
+            }
+          )
       },
       {
         title: t('data_quality.task_result.rule_type'),
@@ -92,11 +116,31 @@ export function useTable() {
         key: 'state',
         render: (row: ResultItem) => {
           if (row.state === 0) {
-            return t('data_quality.task_result.undone')
+            return h(
+                NTag,
+                { type: 'info', size: 'small' },
+                {
+                  default: () => t('data_quality.task_result.undone')
+                }
+            )
           } else if (row.state === 1) {
-            return t('data_quality.task_result.success')
+            return h(
+                NTag,
+                { type: 'success', size: 'small' },
+                {
+                  default: () => t('data_quality.task_result.success')
+                }
+            )
           } else if (row.state === 2) {
-            return t('data_quality.task_result.failure')
+            return h(
+                NTag,
+                { type: 'error', size: 'small' },
+                {
+                  default: () => t('data_quality.task_result.failure')
+                }
+            )
+          } else {
+            return '-'
           }
         },
         ...COLUMN_WIDTH_CONFIG['state']
@@ -155,7 +199,16 @@ export function useTable() {
       {
         title: t('data_quality.task_result.failure_strategy'),
         key: 'failureStrategy',
-        width: 150
+        width: 150,
+        render: (row: ResultItem) => {
+          if (row.failureStrategy === 0) {
+            return 'Alert'
+          }
+          if (row.failureStrategy === 1) {
+            return 'Block'
+          }
+          return ''
+        }
       },
       {
         title: t('data_quality.task_result.excepted_value_type'),