From c29a51a8c71fd015cb459daa1ae77d1cc3255e28 Mon Sep 17 00:00:00 2001 From: Amy0104 <97265214+Amy0104@users.noreply.github.com> Date: Fri, 18 Mar 2022 14:32:22 +0800 Subject: [PATCH] [Fix][UI Next][V1.0.0-Alpha] Add the hover tips for the alarm instance manage table action buttons. (#8978) --- .../src/locales/modules/en_US.ts | 1 + .../src/locales/modules/zh_CN.ts | 1 + .../alarm-instance-manage/use-columns.ts | 86 +++++++++++-------- 3 files changed, 51 insertions(+), 37 deletions(-) diff --git a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts index 649dae0c4b..3f5f1d6839 100644 --- a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts +++ b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts @@ -1070,6 +1070,7 @@ const security = { operation: 'Operation', edit: 'Edit', delete: 'Delete', + delete_confirm: 'Delete?', confirm: 'Confirm', cancel: 'Cancel', submit: 'Submit', diff --git a/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts b/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts index 5dd3ec3cf5..09d166a38a 100644 --- a/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts +++ b/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts @@ -1057,6 +1057,7 @@ const security = { operation: '操作', edit: '编辑', delete: '删除', + delete_confirm: '删除?', confirm: '确定', cancel: '取消', submit: '提交', diff --git a/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/use-columns.ts b/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/use-columns.ts index b3803a0dd0..86121592a8 100644 --- a/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/use-columns.ts +++ b/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/use-columns.ts @@ -17,7 +17,7 @@ import { h } from 'vue' import { useI18n } from 'vue-i18n' -import { NButton, NIcon, NPopconfirm, NSpace } from 'naive-ui' +import { NButton, NIcon, NPopconfirm, NSpace, NTooltip } from 'naive-ui' import { EditOutlined, DeleteOutlined } from '@vicons/antd' import type { TableColumns } from './types' @@ -51,44 +51,56 @@ export function useColumns(onCallback: Function) { title: t('security.alarm_instance.operation'), key: 'operation', width: 150, - render: (rowData, unused) => { + render: (rowData) => { return h(NSpace, null, { default: () => [ - h( - NButton, - { - circle: true, - type: 'info', - onClick: () => void onCallback(rowData, 'edit') - }, - { - default: () => - h(NIcon, null, { default: () => h(EditOutlined) }) - } - ), - h( - NPopconfirm, - { - onPositiveClick: () => void onCallback(rowData, 'delete'), - negativeText: t('security.alarm_instance.cancel'), - positiveText: t('security.alarm_instance.confirm') - }, - { - trigger: () => - h( - NButton, - { - circle: true, - type: 'error' - }, - { - default: () => - h(NIcon, null, { default: () => h(DeleteOutlined) }) - } - ), - default: () => t('security.alarm_instance.delete') - } - ) + h(NTooltip, null, { + trigger: () => + h( + NButton, + { + circle: true, + type: 'info', + size: 'small', + onClick: () => void onCallback(rowData, 'edit') + }, + { + default: () => + h(NIcon, null, { default: () => h(EditOutlined) }) + } + ), + default: () => t('security.alarm_instance.edit') + }), + h(NTooltip, null, { + trigger: () => + h( + NPopconfirm, + { + onPositiveClick: () => void onCallback(rowData, 'delete'), + negativeText: t('security.alarm_instance.cancel'), + positiveText: t('security.alarm_instance.confirm') + }, + { + trigger: () => + h( + NButton, + { + circle: true, + type: 'error', + size: 'small' + }, + { + default: () => + h(NIcon, null, { + default: () => h(DeleteOutlined) + }) + } + ), + default: () => t('security.alarm_instance.delete_confirm') + } + ), + default: () => t('security.alarm_instance.delete') + }) ] }) }