Merge branch 'main' into release/v1

CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog
 
 
+## v1.5.2
+
+[compare changes](https://github.com/yisibell/vue3-admin-starter/compare/v1.5.1...v1.5.2)
+
+### 🩹 Fixes
+
+- Tags view moveToCurrentTag fullPath error ([9b5241b](https://github.com/yisibell/vue3-admin-starter/commit/9b5241b))
+
+### ❤️ Contributors
+
+- Wenqing <wenqing@kerrylan.com>
+
 ## v1.5.1
 
 [compare changes](https://github.com/yisibell/vue3-admin-starter/compare/v1.5.0...v1.5.1)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue3-admin-starter",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "A vue admin template powered by vite + typescript + vue3 + vue-router + pinia + element-plus + axios.",
   "author": {
     "name": "elenh",

src/layouts/default/TagsView/index.vue

@@ -10,7 +10,7 @@
         :ref="getTagVNodes"
         :key="tag.fullPath"
         :class="tag.path === route.path ? 'active' : ''"
-        :to="{ path: `${tag.path}`, query: tag.query, fullPath: `${tag.fullPath}` }"
+        :to="{ path: `${tag.path}`, query: tag.query }"
         class="tags-view-item"
         @click.middle="closeSelectedTag(tag)"
         @contextmenu.prevent="openMenu(tag, $event)"
@@ -165,14 +165,15 @@ const moveToCurrentTag = () => {
 
   nextTick(() => {
     for (const tag of tags) {
-      const to = tag.to as ITagView
+      const to = tag.to as Pick<ITagView, 'path' | 'query'>
       const targetEl = tag.$el as HTMLAnchorElement
+      const tagFullPath = router.resolve({ path: to.path, query: to.query }).fullPath
 
       if (to.path === route.path) {
         scrollPane.value?.moveToTarget(targetEl)
 
         // when query is different then update
-        if (tag.fullPath !== route.fullPath) {
+        if (tagFullPath !== route.fullPath) {
           TagsViewStore.updateVisitedView(route)
         }