(amoro) branch master updated: [AMORO-2992] Use router.push provided by vue router to replace windo… (#3000)

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jinsongzhou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git


The following commit(s) were added to refs/heads/master by this push:
     new 75e0d4ea4 [AMORO-2992] Use router.push provided by vue router to replace windo… (#3000)
75e0d4ea4 is described below

commit 75e0d4ea432966f3e625c37a76a703bd621783cd
Author: chouchouji <70...@users.noreply.github.com>
AuthorDate: Thu Jul 4 12:00:50 2024 +0800

    [AMORO-2992] Use router.push provided by vue router to replace windo… (#3000)
    
    [AMORO-2992] Use router.push provided by vue router to replace window.location.href
---
 amoro-ams/amoro-ams-dashboard/src/components/Topbar.vue | 13 +++++++++----
 amoro-ams/amoro-ams-dashboard/src/language/en.ts        |  1 +
 amoro-ams/amoro-ams-dashboard/src/language/zh.ts        |  1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/amoro-ams/amoro-ams-dashboard/src/components/Topbar.vue b/amoro-ams/amoro-ams-dashboard/src/components/Topbar.vue
index 9e9726246..aea7ca84a 100644
--- a/amoro-ams/amoro-ams-dashboard/src/components/Topbar.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/components/Topbar.vue
@@ -20,6 +20,7 @@
 import { defineComponent, onMounted, reactive } from 'vue'
 import { Modal } from 'ant-design-vue'
 import { useI18n } from 'vue-i18n'
+import { useRouter } from 'vue-router'
 
 import useStore from '@/store'
 import { getVersionInfo } from '@/services/global.service'
@@ -39,6 +40,7 @@ export default defineComponent ({
     })
 
     const { t, locale } = useI18n()
+    const router = useRouter()
 
     const getVersion = async () => {
       const res = await getVersionInfo()
@@ -48,12 +50,15 @@ export default defineComponent ({
       }
     }
 
+    const goLoginPage = () => {
+      router.push({ path: '/login' })
+    }
+
     const handleLogout = async () => {
       Modal.confirm({
         title: t('logoutModalTitle'),
-        content: '',
-        okText: '',
-        cancelText: '',
+        okText: t('confirm'),
+        cancelText: t('cancel'),
         onOk: async () => {
           try {
             await loginService.logout()
@@ -65,7 +70,7 @@ export default defineComponent ({
             store.updateUserInfo({
               userName: '',
             })
-            window.location.href = '/login'
+            goLoginPage()
           }
         },
       })
diff --git a/amoro-ams/amoro-ams-dashboard/src/language/en.ts b/amoro-ams/amoro-ams-dashboard/src/language/en.ts
index 068f5ff97..a9b887582 100644
--- a/amoro-ams/amoro-ams-dashboard/src/language/en.ts
+++ b/amoro-ams/amoro-ams-dashboard/src/language/en.ts
@@ -134,6 +134,7 @@ export default {
   ready: 'Ready',
   running: 'Running',
   cancel: 'Cancel',
+  confirm: 'Confirm',
   cancelProcess: 'Cancel Process',
   finish: 'Finish',
   fail: 'Fail',
diff --git a/amoro-ams/amoro-ams-dashboard/src/language/zh.ts b/amoro-ams/amoro-ams-dashboard/src/language/zh.ts
index b6fa3c308..242fb5a2c 100644
--- a/amoro-ams/amoro-ams-dashboard/src/language/zh.ts
+++ b/amoro-ams/amoro-ams-dashboard/src/language/zh.ts
@@ -134,6 +134,7 @@ export default {
   ready: '就绪',
   running: '运行中',
   cancel: '取消',
+  confirm: '确认',
   cancelProcess: '取消进程',
   finish: '完成',
   fail: '失败',