You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ca...@apache.org on 2022/03/06 13:00:10 UTC
[dolphinscheduler] branch dev updated: [Fix][UI Next][V1.0.0-Alpha] Fix the is no tooltip for timing management table editing and up and down buttons. (#8716)
This is an automated email from the ASF dual-hosted git repository.
caishunfeng 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 698c795 [Fix][UI Next][V1.0.0-Alpha] Fix the is no tooltip for timing management table editing and up and down buttons. (#8716)
698c795 is described below
commit 698c795d4f3412e175fb28e569bf34c6d8085f0b
Author: songjianet <17...@qq.com>
AuthorDate: Sun Mar 6 20:59:20 2022 +0800
[Fix][UI Next][V1.0.0-Alpha] Fix the is no tooltip for timing management table editing and up and down buttons. (#8716)
---
.../definition/components/table-action.tsx | 6 +-
.../workflow/definition/timing/use-table.ts | 78 ++++++++++++++--------
2 files changed, 56 insertions(+), 28 deletions(-)
diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/table-action.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/table-action.tsx
index 06cf490..ab503bb 100644
--- a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/table-action.tsx
+++ b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/table-action.tsx
@@ -56,7 +56,6 @@ export default defineComponent({
'gotoWorkflowTree'
],
setup(props, ctx) {
-
const handleEditWorkflow = () => {
ctx.emit('editWorkflow')
}
@@ -178,7 +177,10 @@ export default defineComponent({
</NTooltip>
<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: () => (
<NButton
size='small'
diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/timing/use-table.ts b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/timing/use-table.ts
index 5f452de..691150c 100644
--- a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/timing/use-table.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/timing/use-table.ts
@@ -18,7 +18,14 @@
import { h, ref, reactive } from 'vue'
import { useI18n } from 'vue-i18n'
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 {
deleteScheduleById,
offline,
@@ -101,37 +108,56 @@ export function useTable() {
return h(NSpace, null, {
default: () => [
h(
- NButton,
+ NTooltip,
+ {},
{
- circle: true,
- type: 'info',
- size: 'small',
- disabled: row.releaseState === 'ONLINE',
- onClick: () => {
- handleEdit(row)
- }
- },
- {
- icon: () => h(EditOutlined)
+ trigger: () =>
+ h(
+ NButton,
+ {
+ circle: true,
+ type: 'info',
+ size: 'small',
+ disabled: row.releaseState === 'ONLINE',
+ onClick: () => {
+ handleEdit(row)
+ }
+ },
+ {
+ icon: () => h(EditOutlined)
+ }
+ ),
+ default: () => t('project.workflow.edit')
}
),
h(
- NButton,
+ NTooltip,
+ {},
{
- circle: true,
- type: row.releaseState === 'ONLINE' ? 'error' : 'warning',
- size: 'small',
- onClick: () => {
- handleReleaseState(row)
- }
- },
- {
- icon: () =>
+ trigger: () =>
h(
- row.releaseState === 'ONLINE'
- ? ArrowDownOutlined
- : ArrowUpOutlined
- )
+ NButton,
+ {
+ 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(