From 437d16018823413f7dd3b0076c09046620175230 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Fri, 11 Feb 2022 23:46:19 +0800
Subject: [PATCH] fix(console): fix url breaking when switch page

---
 plugins/frontend/console/client/client.ts              |  7 -------
 .../frontend/console/client/layout/sidebar-item.vue    |  8 ++++++--
 plugins/frontend/console/client/layout/utils.ts        | 10 ++++++++++
 plugins/frontend/manager/client/settings/index.vue     |  2 +-
 4 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 plugins/frontend/console/client/layout/utils.ts

diff --git a/plugins/frontend/console/client/client.ts b/plugins/frontend/console/client/client.ts
index 2c3be3dbed..0d652d3aa6 100644
--- a/plugins/frontend/console/client/client.ts
+++ b/plugins/frontend/console/client/client.ts
@@ -90,13 +90,6 @@ export const extensions = reactive<Record<string, Context>>({})
 
 export const routes: Ref<RouteRecordNormalized[]> = ref([])
 
-export const queries = reactive({})
-
-router.afterEach(() => {
-  const { path, query } = router.currentRoute.value
-  queries[path] = query
-})
-
 interface DisposableExtension extends PageExtension {
   ctx: Context
 }
diff --git a/plugins/frontend/console/client/layout/sidebar-item.vue b/plugins/frontend/console/client/layout/sidebar-item.vue
index ba68087f3a..ebf0a2587a 100644
--- a/plugins/frontend/console/client/layout/sidebar-item.vue
+++ b/plugins/frontend/console/client/layout/sidebar-item.vue
@@ -1,5 +1,5 @@
 <template>
-  <router-link class="k-menu-item" :to="{ path: route.path, query: queries[route.path] }">
+  <router-link class="k-menu-item" :to="target">
     <k-icon :name="route.meta.icon || 'application'"/>
     {{ route.name }}
     <span class="badge" v-if="badge">{{ badge }}</span>
@@ -10,12 +10,16 @@
 
 import { computed, PropType } from 'vue'
 import { RouteRecordNormalized } from 'vue-router'
-import { queries } from '../client'
+import { routeCache } from './utils'
 
 const props = defineProps({
   route: {} as PropType<RouteRecordNormalized>,
 })
 
+const target = computed(() => {
+  return routeCache[props.route.name] || props.route.path.replace(/:.+/, '')
+})
+
 const badge = computed(() => {
   return props.route.meta.badge.reduce((prev, curr) => prev + curr(), 0)
 })
diff --git a/plugins/frontend/console/client/layout/utils.ts b/plugins/frontend/console/client/layout/utils.ts
new file mode 100644
index 0000000000..9aff42f55e
--- /dev/null
+++ b/plugins/frontend/console/client/layout/utils.ts
@@ -0,0 +1,10 @@
+import { reactive } from 'vue'
+import { RouteRecordName } from 'vue-router'
+import { router } from '../client'
+
+export const routeCache = reactive<Record<RouteRecordName, string>>({})
+
+router.afterEach(() => {
+  const { name, fullPath } = router.currentRoute.value
+  routeCache[name] = fullPath
+})
diff --git a/plugins/frontend/manager/client/settings/index.vue b/plugins/frontend/manager/client/settings/index.vue
index 12819c22b6..90d579d26d 100644
--- a/plugins/frontend/manager/client/settings/index.vue
+++ b/plugins/frontend/manager/client/settings/index.vue
@@ -15,7 +15,7 @@ import PluginSelect from './select.vue'
 import PluginSettings from './settings.vue'
 
 function join(source: string | string[]) {
-  return Array.isArray(source) ? source.join('/') : source
+  return Array.isArray(source) ? source.join('/') : source || ''
 }
 
 const route = useRoute()