fix(console): fix edge case for home page with redirects, fix #272

koishijs · Dec 19, 2023 · 6b88267 · 6b88267
1 parent f328a68
commit 6b88267
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/packages/client/app/layout/menu-item.vue b/packages/client/app/layout/menu-item.vue
@@ -12,7 +12,7 @@ import { LegacyMenuItem, MaybeGetter, useContext } from '@koishijs/client'
 import { computed } from 'vue'
 
 const props = defineProps<{
-  item: LegacyMenuItem
+  item: any
   menuKey?: string
   menuData?: any
 }>()

diff --git a/packages/client/client/activity.ts b/packages/client/client/activity.ts
@@ -1,6 +1,6 @@
-import { Component, reactive } from 'vue'
+import { Component, reactive, ref } from 'vue'
 import { MaybeRefOrGetter, toValue } from '@vueuse/core'
-import { Context, Dict, Disposable, Field, omit, root, router, store } from '.'
+import { Context, Dict, Disposable, omit, root, routeCache, router, store, Store } from '.'
 
 declare module 'vue-router' {
   interface RouteMeta {
@@ -20,7 +20,7 @@ export namespace Activity {
     order?: number
     authority?: number
     position?: 'top' | 'bottom'
-    fields?: Field[]
+    fields?: (keyof Store)[]
     /** @deprecated */
     when?: () => boolean
     disabled?: () => boolean
@@ -35,6 +35,8 @@ function getActivityId(path: string) {
   return path.split('/').find(Boolean) ?? ''
 }
 
+export const redirectTo = ref<string>()
+
 export class Activity {
   id: string
   _disposables: Disposable[] = []
@@ -53,10 +55,10 @@ export class Activity {
   }
 
   handleUpdate() {
-    const { redirect } = router.currentRoute.value.query
-    if (typeof redirect === 'string') {
-      const location = router.resolve(redirect)
+    if (redirectTo.value) {
+      const location = router.resolve(redirectTo.value)
       if (location.matched.length) {
+        redirectTo.value = null
         router.replace(location)
       }
     }
@@ -85,10 +87,8 @@ export class Activity {
     this._disposables.forEach(dispose => dispose())
     const current = router.currentRoute.value
     if (current?.meta?.activity === this) {
-      router.push({
-        path: '/',
-        query: { redirect: current.fullPath },
-      })
+      redirectTo.value = current.fullPath
+      router.push(routeCache['home'] || '/')
     }
     return delete activities[this.id]
   }

diff --git a/packages/client/client/index.ts b/packages/client/client/index.ts
@@ -2,6 +2,7 @@ import { createRouter, createWebHistory, START_LOCATION } from 'vue-router'
 import { global } from './data'
 import install, { Dict } from './components'
 import Overlay from './components/chat/overlay.vue'
+import { redirectTo } from './activity'
 import { config } from './config'
 import { initTask } from './loader'
 import { Context, routeCache } from './context'
@@ -78,16 +79,19 @@ root.slot({
 root.on('activity', data => !data)
 
 router.beforeEach(async (to, from) => {
-  if (to.matched.length) return
+  if (to.matched.length) {
+    if (to.matched[0].path !== '/') {
+      redirectTo.value = null
+    }
+    return
+  }
 
   if (from === START_LOCATION) {
     await initTask
     to = router.resolve(to)
     if (to.matched.length) return to
   }
 
-  return {
-    path: '/',
-    query: { redirect: to.fullPath },
-  }
+  redirectTo.value = to.fullPath
+  return routeCache['home'] || '/'
 })