From baae56f715caedab2905ad372405bfac6a35b3dd Mon Sep 17 00:00:00 2001
From: chenghongxing <1126263215@qq.com>
Date: Mon, 10 Apr 2023 23:27:16 +0800
Subject: [PATCH] =?UTF-8?q?add:=20support=20parameterized=20route=20multi-?=
 =?UTF-8?q?tab=20title=20setting;=20#339=20:bug:=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=EF=BC=9A=E6=94=AF=E6=8C=81=E5=B8=A6=E5=8F=82=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E5=A4=9A=E9=A1=B5=E7=AD=BE=E6=A0=87=E9=A2=98=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/tabs/TabsHead.vue   |  3 +--
 src/layouts/tabs/TabsView.vue   | 16 ++++++++--------
 src/plugins/tabs-page-plugin.js |  9 +++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/layouts/tabs/TabsHead.vue b/src/layouts/tabs/TabsHead.vue
index 499b0e9..4868a6a 100644
--- a/src/layouts/tabs/TabsHead.vue
+++ b/src/layouts/tabs/TabsHead.vue
@@ -95,8 +95,7 @@
         this.$emit('contextmenu', pageKey, e)
       },
       pageName(page) {
-        const pagePath = page.fullPath.split('?')[0]
-        const custom = this.customTitles.find(item => item.path === pagePath)
+        const custom = this.customTitles.find(item => item.path === page.path)
         return (custom && custom.title) || page.title || this.$t(getI18nKey(page.keyPath))
       }
     }
diff --git a/src/layouts/tabs/TabsView.vue b/src/layouts/tabs/TabsView.vue
index 979e71f..bfafac2 100644
--- a/src/layouts/tabs/TabsView.vue
+++ b/src/layouts/tabs/TabsView.vue
@@ -13,7 +13,7 @@
     <div :class="['tabs-view-content', layout, pageWidth]" :style="`margin-top: ${multiPage ? -24 : 0}px`">
       <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
         <a-keep-alive :exclude-keys="excludeKeys" v-if="multiPage && cachePage" v-model="clearCaches">
-          <router-view v-if="!refreshing" ref="tabContent" :key="$route.path" />
+          <router-view v-if="!refreshing" ref="tabContent" :key="$route.fullPath" />
         </a-keep-alive>
         <router-view ref="tabContent" v-else-if="!refreshing" />
       </page-toggle-transition>
@@ -62,10 +62,10 @@ export default {
     this.loadCacheConfig(this.$router?.options?.routes)
     this.loadCachedTabs()
     const route = this.$route
-    if (this.pageList.findIndex(item => item.path === route.path) === -1) {
+    if (this.pageList.findIndex(item => item.path === route.fullPath) === -1) {
       this.pageList.push(this.createPage(route))
     }
-    this.activePage = route.path
+    this.activePage = route.fullPath
     if (this.multiPage) {
       this.$nextTick(() => {
         this.setCachedKey(route)
@@ -86,8 +86,8 @@ export default {
       this.loadCacheConfig(val)
     },
     '$route': function (newRoute) {
-      this.activePage = newRoute.path
-      const page = this.pageList.find(item => item.path === newRoute.path)
+      this.activePage = newRoute.fullPath
+      const page = this.pageList.find(item => item.path === newRoute.fullPath)
       if (!this.multiPage) {
         this.pageList = [this.createPage(newRoute)]
       } else if (page) {
@@ -261,7 +261,7 @@ export default {
       return {
         keyPath: route.matched[route.matched.length - 1].path,
         fullPath: route.fullPath, loading: false,
-        path: route.path,
+        path: route.fullPath,
         title: route.meta && route.meta.page && route.meta.page.title,
         unclose: route.meta && route.meta.page && (route.meta.page.closable === false),
       }
@@ -271,7 +271,7 @@ export default {
      * @param route 页面对应的路由
      */
     setCachedKey(route) {
-      const page = this.pageList.find(item => item.path === route.path)
+      const page = this.pageList.find(item => item.path === route.fullPath)
       page.unclose = route.meta && route.meta.page && (route.meta.page.closable === false)
       if (!page._init_) {
         const vnode = this.$refs.tabContent.$vnode
@@ -301,7 +301,7 @@ export default {
       routes.forEach(item => {
         const cacheAble = item.meta?.page?.cacheAble ?? pCache ?? true
         if (!cacheAble) {
-          this.excludeKeys.push(new RegExp(`${item.path.replace(/:[^/]*/g, '[^/]*')}\\d*$`))
+          this.excludeKeys.push(new RegExp(`${item.path.replace(/:[^/]*/g, '[^/]*')}(\\?.*)?\\d*$`))
         }
         if (item.children) {
           this.loadCacheConfig(item.children, cacheAble)
diff --git a/src/plugins/tabs-page-plugin.js b/src/plugins/tabs-page-plugin.js
index ddf382e..ea9efc9 100644
--- a/src/plugins/tabs-page-plugin.js
+++ b/src/plugins/tabs-page-plugin.js
@@ -17,8 +17,9 @@ const TabsPagePlugin = {
         },
         $setPageTitle(route, title) {
           if (title) {
-            let path = typeof route === 'object' ? route.path : route
-            path = path && path.split('?')[0]
+            // let path = typeof route === 'object' ? route.path : route
+            // path = path && path.split('?')[0]
+            let path = typeof route === 'object' ? this.$router.resolve(route).route.fullPath : route
             this.$store.commit('setting/setCustomTitle', {path, title})
           }
         }
@@ -26,8 +27,8 @@ const TabsPagePlugin = {
       computed: {
         customTitle() {
           const customTitles = this.$store.state.setting.customTitles
-          const path = this.$route.path.split('?')[0]
-          const custom = customTitles.find(item => item.path === path)
+          // const path = this.$route.path.split('?')[0]
+          const custom = customTitles.find(item => item.path === this.$route.fullPath)
           return custom && custom.title
         }
       }