Merge branch 'dev' into dev_wenjun_cannotDeleteWorkflowVersionWhenExi…

…stRunningInstance
apache · Mar 19, 2024 · ca29e1e · ca29e1e
2 parents 1854968 + a16a15c
commit ca29e1e
Showing 1 changed file with 4 additions and 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
@@ -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`
         })