From 73fa7620522a45d067a66166eb23529b89e08e6a Mon Sep 17 00:00:00 2001
From: pany <939630029@qq.com>
Date: Wed, 19 Feb 2025 11:31:57 +0800
Subject: [PATCH] types: update vue-router type

---
 src/common/components/SearchMenu/Modal.vue  | 4 ++--
 src/common/components/SearchMenu/Result.vue | 4 ++--
 src/common/composables/useRouteListener.ts  | 8 ++++----
 src/layouts/components/TagsView/index.vue   | 4 ++--
 src/pinia/stores/tags-view.ts               | 4 ++--
 src/router/whitelist.ts                     | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/common/components/SearchMenu/Modal.vue b/src/common/components/SearchMenu/Modal.vue
index 1fa0f35..f2aab0e 100644
--- a/src/common/components/SearchMenu/Modal.vue
+++ b/src/common/components/SearchMenu/Modal.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { ElScrollbar } from "element-plus"
-import type { RouteRecordName, RouteRecordRaw } from "vue-router"
+import type { RouteRecordNameGeneric, RouteRecordRaw } from "vue-router"
 import { usePermissionStore } from "@/pinia/stores/permission"
 import { useDevice } from "@@/composables/useDevice"
 import { isExternal } from "@@/utils/validate"
@@ -20,7 +20,7 @@ const resultRef = ref<InstanceType<typeof Result> | null>(null)
 
 const keyword = ref<string>("")
 const result = shallowRef<RouteRecordRaw[]>([])
-const activeRouteName = ref<RouteRecordName | undefined>(undefined)
+const activeRouteName = ref<RouteRecordNameGeneric | undefined>(undefined)
 /** 是否按下了上键或下键（用于解决和 mouseenter 事件的冲突） */
 const isPressUpOrDown = ref<boolean>(false)
 
diff --git a/src/common/components/SearchMenu/Result.vue b/src/common/components/SearchMenu/Result.vue
index f3d2b95..ba769c4 100644
--- a/src/common/components/SearchMenu/Result.vue
+++ b/src/common/components/SearchMenu/Result.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { RouteRecordName, RouteRecordRaw } from "vue-router"
+import type { RouteRecordNameGeneric, RouteRecordRaw } from "vue-router"
 
 interface Props {
   data: RouteRecordRaw[]
@@ -9,7 +9,7 @@ interface Props {
 const props = defineProps<Props>()
 
 /** 选中的菜单 */
-const modelValue = defineModel<RouteRecordName | undefined>({ required: true })
+const modelValue = defineModel<RouteRecordNameGeneric | undefined>({ required: true })
 
 const instance = getCurrentInstance()
 
diff --git a/src/common/composables/useRouteListener.ts b/src/common/composables/useRouteListener.ts
index b510389..82b5ac3 100644
--- a/src/common/composables/useRouteListener.ts
+++ b/src/common/composables/useRouteListener.ts
@@ -1,18 +1,18 @@
 import type { Handler } from "mitt"
-import type { RouteLocationNormalized } from "vue-router"
+import type { RouteLocationNormalizedGeneric } from "vue-router"
 import mitt from "mitt"
 
 /** 回调函数的类型 */
-type Callback = (route: RouteLocationNormalized) => void
+type Callback = (route: RouteLocationNormalizedGeneric) => void
 
 const emitter = mitt()
 
 const key = Symbol("ROUTE_CHANGE")
 
-let latestRoute: RouteLocationNormalized
+let latestRoute: RouteLocationNormalizedGeneric
 
 /** 设置最新的路由信息，触发路由变化事件 */
-export function setRouteChange(to: RouteLocationNormalized) {
+export function setRouteChange(to: RouteLocationNormalizedGeneric) {
   // 触发事件
   emitter.emit(key, to)
   // 缓存最新的路由信息
diff --git a/src/layouts/components/TagsView/index.vue b/src/layouts/components/TagsView/index.vue
index b7d7f36..899bda7 100644
--- a/src/layouts/components/TagsView/index.vue
+++ b/src/layouts/components/TagsView/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { TagView } from "@/pinia/stores/tags-view"
-import type { RouteLocationNormalizedLoaded, RouteRecordRaw, RouterLink } from "vue-router"
+import type { RouteLocationNormalizedGeneric, RouteRecordRaw, RouterLink } from "vue-router"
 import { usePermissionStore } from "@/pinia/stores/permission"
 import { useTagsViewStore } from "@/pinia/stores/tags-view"
 import { useRouteListener } from "@@/composables/useRouteListener"
@@ -77,7 +77,7 @@ function initTags() {
 }
 
 /** 添加标签页 */
-function addTags(route: RouteLocationNormalizedLoaded) {
+function addTags(route: RouteLocationNormalizedGeneric) {
   if (route.name) {
     tagsViewStore.addVisitedView(route)
     tagsViewStore.addCachedView(route)
diff --git a/src/pinia/stores/tags-view.ts b/src/pinia/stores/tags-view.ts
index 6e51d24..468e3ff 100644
--- a/src/pinia/stores/tags-view.ts
+++ b/src/pinia/stores/tags-view.ts
@@ -1,9 +1,9 @@
-import type { RouteLocationNormalized } from "vue-router"
+import type { RouteLocationNormalizedGeneric } from "vue-router"
 import { pinia } from "@/pinia"
 import { getCachedViews, getVisitedViews, setCachedViews, setVisitedViews } from "@@/utils/cache/local-storage"
 import { useSettingsStore } from "./settings"
 
-export type TagView = Partial<RouteLocationNormalized>
+export type TagView = Partial<RouteLocationNormalizedGeneric>
 
 export const useTagsViewStore = defineStore("tags-view", () => {
   const { cacheTagsView } = useSettingsStore()
diff --git a/src/router/whitelist.ts b/src/router/whitelist.ts
index cc43381..7811e19 100644
--- a/src/router/whitelist.ts
+++ b/src/router/whitelist.ts
@@ -1,4 +1,4 @@
-import type { RouteLocationNormalized, RouteRecordNameGeneric } from "vue-router"
+import type { RouteLocationNormalizedGeneric, RouteRecordNameGeneric } from "vue-router"
 
 /** 免登录白名单（匹配路由 path） */
 const whiteListByPath: string[] = ["/login"]
@@ -7,7 +7,7 @@ const whiteListByPath: string[] = ["/login"]
 const whiteListByName: RouteRecordNameGeneric[] = []
 
 /** 判断是否在白名单 */
-export function isWhiteList(to: RouteLocationNormalized) {
+export function isWhiteList(to: RouteLocationNormalizedGeneric) {
   // path 和 name 任意一个匹配上即可
   return whiteListByPath.includes(to.path) || whiteListByName.includes(to.name)
 }