From 70ddb116366595b4ace5778d75cd9fe4f957d0ee Mon Sep 17 00:00:00 2001 From: Kerwin <37063904+zhuangchong@users.noreply.github.com> Date: Mon, 19 Sep 2022 01:11:16 +0800 Subject: [PATCH] [Fix][UI] Fix workflow name overlaps bug (#11862) (#12019) Co-authored-by: Devosend --- .../src/common/column-width-config.ts | 3 ++ .../projects/workflow/definition/use-table.ts | 41 ++++++++++++------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/dolphinscheduler-ui/src/common/column-width-config.ts b/dolphinscheduler-ui/src/common/column-width-config.ts index 663195162..7df8dbc32 100644 --- a/dolphinscheduler-ui/src/common/column-width-config.ts +++ b/dolphinscheduler-ui/src/common/column-width-config.ts @@ -94,6 +94,9 @@ export const COLUMN_WIDTH_CONFIG = { }, tag: { width: 160 + }, + copy: { + width: 50 } } diff --git a/dolphinscheduler-ui/src/views/projects/workflow/definition/use-table.ts b/dolphinscheduler-ui/src/views/projects/workflow/definition/use-table.ts index 9510427b5..4328bb717 100644 --- a/dolphinscheduler-ui/src/views/projects/workflow/definition/use-table.ts +++ b/dolphinscheduler-ui/src/views/projects/workflow/definition/use-table.ts @@ -83,7 +83,8 @@ export function useTable() { title: t('project.workflow.workflow_name'), key: 'name', className: 'workflow-name', - width: 200, + ...COLUMN_WIDTH_CONFIG['name'], + titleColSpan: 2, render: (row) => h( NSpace, @@ -93,7 +94,7 @@ export function useTable() { class: styles['workflow-name'] }, { - default: () => [ + default: () => h( ButtonLink, { @@ -104,24 +105,34 @@ export function useTable() { }) }, { - default: () => h(NEllipsis, null, () => row.name) + default: () => + h( + NEllipsis, + COLUMN_WIDTH_CONFIG['linkEllipsis'], + () => row.name + ) } - ), - h( - NButton, - { - quaternary: true, - circle: true, - type: 'info', - size: 'tiny', - onClick: () => void copy(row.name) - }, - { icon: () => h(NIcon, { size: 16 }, () => h(CopyOutlined)) } ) - ] } ) }, + { + title: 'Copy', + key: 'copy', + ...COLUMN_WIDTH_CONFIG['copy'], + render: (row) => + h( + NButton, + { + quaternary: true, + circle: true, + type: 'info', + size: 'tiny', + onClick: () => void copy(row.name) + }, + { icon: () => h(NIcon, { size: 16 }, () => h(CopyOutlined)) } + ) + }, { title: t('project.workflow.status'), key: 'releaseState', -- GitLab