From d8fa088d6659bd94617af32ced8f3b4409e82a81 Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Mon, 8 Apr 2024 15:02:32 +0800 Subject: [PATCH] chore: update --- src/layout/components/tag/index.vue | 2 +- src/store/modules/multiTags.ts | 6 ++++-- src/store/modules/permission.ts | 7 +++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/layout/components/tag/index.vue b/src/layout/components/tag/index.vue index 18394fd43..15a45477f 100644 --- a/src/layout/components/tag/index.vue +++ b/src/layout/components/tag/index.vue @@ -62,7 +62,7 @@ const topPath = getTopMenu()?.path; const { VITE_HIDE_HOME } = import.meta.env; const fixedTags = [ ...routerArrays, - ...usePermissionStoreHook().tagLists.filter(v => v?.meta?.fixedTag) + ...usePermissionStoreHook().flatteningRoutes.filter(v => v?.meta?.fixedTag) ]; const dynamicTagView = async () => { diff --git a/src/store/modules/multiTags.ts b/src/store/modules/multiTags.ts index 7feaafe01..1081f9340 100644 --- a/src/store/modules/multiTags.ts +++ b/src/store/modules/multiTags.ts @@ -1,7 +1,7 @@ import { defineStore } from "pinia"; import { store } from "@/store"; -import { usePermissionStoreHook } from "./permission"; import { routerArrays } from "@/layout/types"; +import { usePermissionStoreHook } from "./permission"; import { responsiveStorageNameSpace } from "@/config"; import type { multiType, positionType } from "./types"; import { isEqual, isBoolean, isUrl, storageLocal } from "@pureadmin/utils"; @@ -18,7 +18,9 @@ export const useMultiTagsStore = defineStore({ ) : [ ...routerArrays, - ...usePermissionStoreHook().tagLists.filter(v => v?.meta?.fixedTag) + ...usePermissionStoreHook().flatteningRoutes.filter( + v => v?.meta?.fixedTag + ) ], multiTagsCache: storageLocal().getItem( `${responsiveStorageNameSpace()}configure` diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts index 4ed8d6e9c..76551ca14 100644 --- a/src/store/modules/permission.ts +++ b/src/store/modules/permission.ts @@ -18,7 +18,8 @@ export const usePermissionStore = defineStore({ constantMenus, // 整体路由生成的菜单(静态、动态) wholeMenus: [], - tagLists: [], + // 整体路由(一维数组格式) + flatteningRoutes: [], // 缓存页面keepAlive cachePageList: [] }), @@ -28,7 +29,9 @@ export const usePermissionStore = defineStore({ this.wholeMenus = filterNoPermissionTree( filterTree(ascending(this.constantMenus.concat(routes))) ); - this.tagLists = formatFlatteningRoutes(this.constantMenus.concat(routes)); + this.flatteningRoutes = formatFlatteningRoutes( + this.constantMenus.concat(routes) + ); }, cacheOperate({ mode, name }: cacheType) { const delIndex = this.cachePageList.findIndex(v => v === name);