seg_yinzy
/
DolphinScheduler
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Fix][UI Next][V1.0.0-Alpha] Add the hover tips for the datasource ta… (#8977) 

* [Fix][UI Next][V1.0.0-Alpha] Add the hover tips for the datasource table action buttons.

* [Fix][UI Next][V1.0.0-Alpha] Remove the unused paramter for the datasource table operation column render function.
slim
Amy0104 2022-03-18 14:29:51 +08:00 committed by GitHub
parent 045ef753d1
commit a485771a73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 58 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dolphinscheduler-ui-next/src/locales/modules/en_US.ts
View File

@ -1157,6 +1157,7 @@ const datasource = {
click_to_view: 'Click to view',
delete: 'Delete',
confirm: 'Confirm',
delete_confirm: 'Delete?',
cancel: 'Cancel',
create: 'Create',
edit: 'Edit',

1
dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
View File

@ -1144,6 +1144,7 @@ const datasource = {
click_to_view: '点击查看',
delete: '删除',
confirm: '确定',
delete_confirm: '删除？',
cancel: '取消',
create: '创建',
edit: '编辑',

94
dolphinscheduler-ui-next/src/views/datasource/list/use-columns.ts
View File

@ -17,7 +17,14 @@
import { h } from 'vue'
import { useI18n } from 'vue-i18n'
import { NPopover, NButton, NIcon, NPopconfirm, NSpace } from 'naive-ui'
import {
NPopover,
NButton,
NIcon,
NPopconfirm,
NSpace,
NTooltip
} from 'naive-ui'
import { EditOutlined, DeleteOutlined } from '@vicons/antd'
import JsonHighlight from './json-highlight'
import ButtonLink from '@/components/button-link'
@ -78,45 +85,56 @@ export function useColumns(onCallback: Function) {
title: t('datasource.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.id, 'edit')
},
{
default: () =>
h(NIcon, null, { default: () => h(EditOutlined) })
}
),
h(
NPopconfirm,
{
onPositiveClick: () => void onCallback(rowData.id, 'delete'),
negativeText: t('datasource.cancel'),
positiveText: t('datasource.confirm')
},
{
trigger: () =>
h(
NButton,
{
circle: true,
type: 'error',
class: 'btn-delete'
},
{
default: () =>
h(NIcon, null, { default: () => h(DeleteOutlined) })
}
),
default: () => t('datasource.delete')
}
)
h(NTooltip, null, {
trigger: () =>
h(
NButton,
{
circle: true,
type: 'info',
onClick: () => void onCallback(rowData.id, 'edit')
},
{
default: () =>
h(NIcon, null, { default: () => h(EditOutlined) })
}
),
default: () => t('datasource.edit')
}),
h(NTooltip, null, {
trigger: () =>
h(
NPopconfirm,
{
onPositiveClick: () =>
void onCallback(rowData.id, 'delete'),
negativeText: t('datasource.cancel'),
positiveText: t('datasource.confirm')
},
{
trigger: () =>
h(
NButton,
{
circle: true,
type: 'error',
class: 'btn-delete'
},
{
default: () =>
h(NIcon, null, {
default: () => h(DeleteOutlined)
})
}
),
default: () => t('datasource.delete_confirm')
}
),
default: () => t('datasource.delete')
})
]
})
}