diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index ed7af6b..c34b122 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, getCurrentInstance, nextTick, onBeforeMount, reactive, watch } from "vue"
+import { getCurrentInstance, onMounted, ref, watch } from "vue"
 import { useRoute, useRouter } from "vue-router"
 import type { RouteRecordRaw } from "vue-router"
 import { useTagsViewStore } from "@/store/modules/tags-view"
@@ -15,97 +15,24 @@ const route = useRoute()
 const tagsViewStore = useTagsViewStore()
 const permissionStore = usePermissionStore()
 
-const toLastView = (visitedViews: ITagView[], view: ITagView) => {
-  const latestView = visitedViews.slice(-1)[0]
-  if (latestView !== undefined && latestView.fullPath !== undefined) {
-    router.push(latestView.fullPath).catch((err) => {
-      console.warn(err)
-    })
-  } else {
-    // 如果没有 TagsView，请默认重定向到主页，如果你需要，可以自行调整它
-    if (view.name === "Dashboard") {
-      // 重新加载主页
-      router.push({ path: "/redirect" + view.fullPath }).catch((err) => {
-        console.warn(err)
-      })
-    } else {
-      router.push("/").catch((err) => {
-        console.warn(err)
-      })
-    }
-  }
+const visible = ref(false)
+const top = ref(0)
+const left = ref(0)
+const selectedTag = ref<ITagView>({})
+let affixTags: ITagView[] = []
+
+const isActive = (tag: ITagView) => {
+  return tag.path === route.path
 }
 
-const state = reactive({
-  visible: false,
-  top: 0,
-  left: 0,
-  selectedTag: {} as ITagView,
-  affixTags: [] as ITagView[],
-  isActive: (tagView: ITagView) => {
-    return tagView.path === route.path
-  },
-  isAffix: (tag: ITagView) => {
-    return tag.meta && tag.meta.affix
-  },
-  refreshSelectedTag: (view: ITagView) => {
-    const { fullPath } = view
-    nextTick(() => {
-      router.replace({ path: "/redirect" + fullPath }).catch((err) => {
-        console.warn(err)
-      })
-    })
-  },
-  closeSelectedTag: (view: ITagView) => {
-    tagsViewStore.delVisitedView(view)
-    if (state.isActive(view)) {
-      toLastView(tagsViewStore.visitedViews, view)
-    }
-  },
-  closeOthersTags: () => {
-    if (state.selectedTag.fullPath !== route.path && state.selectedTag.fullPath !== undefined) {
-      router.push(state.selectedTag.fullPath).catch((err) => {
-        console.warn(err)
-      })
-    }
-    tagsViewStore.delOthersVisitedViews(state.selectedTag as ITagView)
-  },
-  closeAllTags: (view: ITagView) => {
-    tagsViewStore.delAllVisitedViews()
-    if (state.affixTags.some((tag) => tag.path === route.path)) {
-      return
-    }
-    toLastView(tagsViewStore.visitedViews, view)
-  },
-  openMenu: (tag: ITagView, e: MouseEvent) => {
-    const menuMinWidth = 105
-    const offsetLeft = instance!.proxy!.$el.getBoundingClientRect().left // container margin left
-    const offsetWidth = instance!.proxy!.$el.offsetWidth // container width
-    const maxLeft = offsetWidth - menuMinWidth // left boundary
-    const left = e.clientX - offsetLeft + 15 // 15: margin right
-    if (left > maxLeft) {
-      state.left = maxLeft
-    } else {
-      state.left = left
-    }
-    state.top = e.clientY
-    state.visible = true
-    state.selectedTag = tag
-  },
-  closeMenu: () => {
-    state.visible = false
-  }
-})
-
-const visitedViews = computed(() => {
-  return tagsViewStore.visitedViews
-})
-const routes = computed(() => permissionStore.routes)
+const isAffix = (tag: ITagView) => {
+  return tag.meta?.affix
+}
 
 const filterAffixTags = (routes: RouteRecordRaw[], basePath = "/") => {
   let tags: ITagView[] = []
   routes.forEach((route) => {
-    if (route.meta && route.meta.affix) {
+    if (route.meta?.affix) {
       const tagPath = path.resolve(basePath, route.path)
       tags.push({
         fullPath: tagPath,
@@ -125,11 +52,11 @@ const filterAffixTags = (routes: RouteRecordRaw[], basePath = "/") => {
 }
 
 const initTags = () => {
-  state.affixTags = filterAffixTags(routes.value)
-  for (const tag of state.affixTags) {
+  affixTags = filterAffixTags(permissionStore.routes)
+  for (const tag of affixTags) {
     // 必须含有 name 属性
     if (tag.name) {
-      tagsViewStore.addVisitedView(tag as ITagView)
+      tagsViewStore.addVisitedView(tag)
     }
   }
 }
@@ -138,45 +65,89 @@ const addTags = () => {
   if (route.name) {
     tagsViewStore.addVisitedView(route)
   }
-  return false
 }
 
-const moveToCurrentTag = () => {
-  const tags = instance?.refs.tag as any[]
-  if (tags === null || tags === undefined || !Array.isArray(tags)) {
+const refreshSelectedTag = (view: ITagView) => {
+  router.replace({ path: "/redirect" + view.fullPath })
+}
+
+const closeSelectedTag = (view: ITagView) => {
+  tagsViewStore.delVisitedView(view)
+  if (isActive(view)) {
+    toLastView(tagsViewStore.visitedViews, view)
+  }
+}
+
+const closeOthersTags = () => {
+  if (selectedTag.value.fullPath !== route.path && selectedTag.value.fullPath !== undefined) {
+    router.push(selectedTag.value.fullPath)
+  }
+  tagsViewStore.delOthersVisitedViews(selectedTag.value)
+}
+
+const closeAllTags = (view: ITagView) => {
+  tagsViewStore.delAllVisitedViews()
+  if (affixTags.some((tag) => tag.path === route.path)) {
     return
   }
-  for (const tag of tags) {
-    if ((tag.to as ITagView).path === route.path) {
-      // When query is different then update
-      if ((tag.to as ITagView).fullPath !== route.fullPath) {
-        tagsViewStore.updateVisitedView(route)
-      }
+  toLastView(tagsViewStore.visitedViews, view)
+}
+
+const toLastView = (visitedViews: ITagView[], view: ITagView) => {
+  const latestView = visitedViews.slice(-1)[0]
+  if (latestView !== undefined && latestView.fullPath !== undefined) {
+    router.push(latestView.fullPath)
+  } else {
+    // 如果 TagsView 全部被关闭了，则默认重定向到主页
+    if (view.name === "Dashboard") {
+      // 重新加载主页
+      router.push({ path: "/redirect" + view.fullPath })
+    } else {
+      router.push("/")
     }
   }
 }
 
+const openMenu = (tag: ITagView, e: MouseEvent) => {
+  const menuMinWidth = 105
+  // container margin left
+  const offsetLeft = instance!.proxy!.$el.getBoundingClientRect().left
+  // container width
+  const offsetWidth = instance!.proxy!.$el.offsetWidth
+  // left boundary
+  const maxLeft = offsetWidth - menuMinWidth
+  // 15: margin right
+  const left15 = e.clientX - offsetLeft + 15
+  if (left15 > maxLeft) {
+    left.value = maxLeft
+  } else {
+    left.value = left15
+  }
+  top.value = e.clientY
+  visible.value = true
+  selectedTag.value = tag
+}
+
+const closeMenu = () => {
+  visible.value = false
+}
+
 watch(
   () => route.name,
   () => {
     addTags()
-    moveToCurrentTag()
   }
 )
 
-watch(
-  () => state.visible,
-  (value) => {
-    if (value) {
-      document.body.addEventListener("click", state.closeMenu)
-    } else {
-      document.body.removeEventListener("click", state.closeMenu)
-    }
+watch(visible, (value) => {
+  if (value) {
+    document.body.addEventListener("click", closeMenu)
+  } else {
+    document.body.removeEventListener("click", closeMenu)
   }
-)
+})
 
-// life cricle
-onBeforeMount(() => {
+onMounted(() => {
   initTags()
   addTags()
 })
@@ -186,26 +157,25 @@ onBeforeMount(() => {
   <div class="tags-view-container">
     <ScrollPane class="tags-view-wrapper">
       <router-link
-        v-for="tag in visitedViews"
-        ref="tag"
+        v-for="tag in tagsViewStore.visitedViews"
         :key="tag.path"
-        :class="state.isActive(tag) ? 'active' : ''"
+        :class="isActive(tag) ? 'active' : ''"
         :to="{ path: tag.path, query: tag.query }"
         class="tags-view-item"
-        @click.middle="!state.isAffix(tag) ? state.closeSelectedTag(tag) : ''"
-        @contextmenu.prevent="state.openMenu(tag, $event)"
+        @click.middle="!isAffix(tag) ? closeSelectedTag(tag) : ''"
+        @contextmenu.prevent="openMenu(tag, $event)"
       >
         {{ tag.meta?.title }}
-        <el-icon v-if="!state.isAffix(tag)" :size="12" @click.prevent.stop="state.closeSelectedTag(tag)">
+        <el-icon v-if="!isAffix(tag)" :size="12" @click.prevent.stop="closeSelectedTag(tag)">
           <Close />
         </el-icon>
       </router-link>
     </ScrollPane>
-    <ul v-show="state.visible" :style="{ left: state.left + 'px', top: state.top + 'px' }" class="contextmenu">
-      <li @click="state.refreshSelectedTag(state.selectedTag)">刷新</li>
-      <li v-if="!state.isAffix(state.selectedTag)" @click="state.closeSelectedTag(state.selectedTag)">关闭</li>
-      <li @click="state.closeOthersTags">关闭其它</li>
-      <li @click="state.closeAllTags(state.selectedTag)">关闭所有</li>
+    <ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
+      <li @click="refreshSelectedTag(selectedTag)">刷新</li>
+      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">关闭</li>
+      <li @click="closeOthersTags">关闭其它</li>
+      <li @click="closeAllTags(selectedTag)">关闭所有</li>
     </ul>
   </div>
 </template>
diff --git a/src/store/modules/tags-view.ts b/src/store/modules/tags-view.ts
index e6d822d..c8d5363 100644
--- a/src/store/modules/tags-view.ts
+++ b/src/store/modules/tags-view.ts
@@ -1,22 +1,15 @@
 import { ref } from "vue"
 import { defineStore } from "pinia"
-import type { _RouteLocationBase, RouteLocationNormalized } from "vue-router"
+import type { RouteLocationNormalized } from "vue-router"
 
-export interface ITagView extends Partial<RouteLocationNormalized> {
-  title?: string
-  to?: _RouteLocationBase
-}
+export type ITagView = Partial<RouteLocationNormalized>
 
 export const useTagsViewStore = defineStore("tags-view", () => {
   const visitedViews = ref<ITagView[]>([])
 
   const addVisitedView = (view: ITagView) => {
     if (visitedViews.value.some((v) => v.path === view.path)) return
-    visitedViews.value.push(
-      Object.assign({}, view, {
-        title: view.meta?.title || "no-name"
-      })
-    )
+    visitedViews.value.push(Object.assign({}, view))
   }
   const delVisitedView = (view: ITagView) => {
     for (const [i, v] of visitedViews.value.entries()) {
@@ -36,14 +29,6 @@ export const useTagsViewStore = defineStore("tags-view", () => {
     const affixTags = visitedViews.value.filter((tag) => tag.meta?.affix)
     visitedViews.value = affixTags
   }
-  const updateVisitedView = (view: ITagView) => {
-    for (let v of visitedViews.value) {
-      if (v.path === view.path) {
-        v = Object.assign(v, view)
-        break
-      }
-    }
-  }
 
-  return { visitedViews, addVisitedView, delVisitedView, delOthersVisitedViews, delAllVisitedViews, updateVisitedView }
+  return { visitedViews, addVisitedView, delVisitedView, delOthersVisitedViews, delAllVisitedViews }
 })