From a16a15c84e9d211a285cd1494c8c266c7ac2d602 Mon Sep 17 00:00:00 2001 From: arlendp <2012dupeng@gmail.com> Date: Tue, 19 Mar 2024 14:03:26 +0800 Subject: [PATCH] [Fix-15698][UI] close the definition when opened in the new tab (#15736) Co-authored-by: xiangzihao <460888207@qq.com> --- .../views/projects/workflow/components/dag/dag-toolbar.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dolphinscheduler-ui/src/views/projects/workflow/components/dag/dag-toolbar.tsx b/dolphinscheduler-ui/src/views/projects/workflow/components/dag/dag-toolbar.tsx index ae538924d1b4..02c62b9bd63a 100644 --- a/dolphinscheduler-ui/src/views/projects/workflow/components/dag/dag-toolbar.tsx +++ b/dolphinscheduler-ui/src/views/projects/workflow/components/dag/dag-toolbar.tsx @@ -148,17 +148,18 @@ export default defineComponent({ * Back to the entrance */ const onClose = () => { - if (history.state.back !== '/login') { + const { back, current } = history.state + if (back && back !== '/login') { router.go(-1) return } - if (history.state.current.includes('workflow/definitions')) { + if (!back || current.includes('workflow/definitions')) { router.push({ path: `/projects/${route.params.projectCode}/workflow-definition` }) return } - if (history.state.current.includes('workflow/instances')) { + if (current.includes('workflow/instances')) { router.push({ path: `/projects/${route.params.projectCode}/workflow/instances` })