Browse Source

[Fix][UI Next][V1.0.0-Alpha] Fix the is no tooltip for timing management table editing and up and down buttons. (#8716)

3.0.0/version-upgrade
songjianet 3 years ago committed by GitHub
parent
commit
698c795d4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/table-action.tsx
  2. 78
      dolphinscheduler-ui-next/src/views/projects/workflow/definition/timing/use-table.ts

6
dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/table-action.tsx

@ -56,7 +56,6 @@ export default defineComponent({
'gotoWorkflowTree' 'gotoWorkflowTree'
], ],
setup(props, ctx) { setup(props, ctx) {
const handleEditWorkflow = () => { const handleEditWorkflow = () => {
ctx.emit('editWorkflow') ctx.emit('editWorkflow')
} }
@ -178,7 +177,10 @@ export default defineComponent({
</NTooltip> </NTooltip>
<NTooltip trigger={'hover'}> <NTooltip trigger={'hover'}>
{{ {{
default: () => releaseState === 'ONLINE'? t('project.workflow.down_line'):t('project.workflow.up_line'), default: () =>
releaseState === 'ONLINE'
? t('project.workflow.down_line')
: t('project.workflow.up_line'),
trigger: () => ( trigger: () => (
<NButton <NButton
size='small' size='small'

78
dolphinscheduler-ui-next/src/views/projects/workflow/definition/timing/use-table.ts

@ -18,7 +18,14 @@
import { h, ref, reactive } from 'vue' import { h, ref, reactive } from 'vue'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { NSpace, NTooltip, NButton, NPopconfirm, NEllipsis } from 'naive-ui' import {
NSpace,
NTooltip,
NButton,
NPopconfirm,
NEllipsis,
NIcon
} from 'naive-ui'
import { import {
deleteScheduleById, deleteScheduleById,
offline, offline,
@ -101,37 +108,56 @@ export function useTable() {
return h(NSpace, null, { return h(NSpace, null, {
default: () => [ default: () => [
h( h(
NButton, NTooltip,
{},
{ {
circle: true, trigger: () =>
type: 'info', h(
size: 'small', NButton,
disabled: row.releaseState === 'ONLINE', {
onClick: () => { circle: true,
handleEdit(row) type: 'info',
} size: 'small',
}, disabled: row.releaseState === 'ONLINE',
{ onClick: () => {
icon: () => h(EditOutlined) handleEdit(row)
}
},
{
icon: () => h(EditOutlined)
}
),
default: () => t('project.workflow.edit')
} }
), ),
h( h(
NButton, NTooltip,
{},
{ {
circle: true, trigger: () =>
type: row.releaseState === 'ONLINE' ? 'error' : 'warning',
size: 'small',
onClick: () => {
handleReleaseState(row)
}
},
{
icon: () =>
h( h(
row.releaseState === 'ONLINE' NButton,
? ArrowDownOutlined {
: ArrowUpOutlined circle: true,
) type: row.releaseState === 'ONLINE' ? 'error' : 'warning',
size: 'small',
onClick: () => {
handleReleaseState(row)
}
},
{
icon: () =>
h(
row.releaseState === 'ONLINE'
? ArrowDownOutlined
: ArrowUpOutlined
)
}
),
default: () =>
row.releaseState === 'ONLINE'
? t('project.workflow.down_line')
: t('project.workflow.up_line')
} }
), ),
h( h(

Loading…
Cancel
Save