From 3e359e4550d018035406a97c190b98f83839ba7f Mon Sep 17 00:00:00 2001 From: houzhongjian <houzhongyi@126.com> Date: 星期五, 13 十二月 2024 10:41:05 +0800 Subject: [PATCH] 1、工作流重做更新 2、@import修改为@use以应对sass升级弃用@import 3、进入系统后自动redirect到home页 --- src/store/modules/tagsView.ts | 38 ++++++++++++++++++++++++++------------ 1 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/store/modules/tagsView.ts b/src/store/modules/tagsView.ts index 25a3a1f..4368efe 100644 --- a/src/store/modules/tagsView.ts +++ b/src/store/modules/tagsView.ts @@ -31,13 +31,27 @@ }, // 新增tag addVisitedView(view: RouteLocationNormalizedLoaded) { - if (this.visitedViews.some((v) => v.path === view.path)) return + if (this.visitedViews.some((v) => v.fullPath === view.fullPath)) return if (view.meta?.noTagsView) return - this.visitedViews.push( - Object.assign({}, view, { - title: view.meta?.title || 'no-name' + const visitedView = Object.assign({}, view, { title: view.meta?.title || 'no-name' }) + + if (visitedView.meta) { + const titleSuffixList: string[] = [] + this.visitedViews.forEach((v) => { + if (v.path === visitedView.path && v.meta?.title === visitedView.meta?.title) { + titleSuffixList.push(v.meta?.titleSuffix || '1') + } }) - ) + if (titleSuffixList.length) { + let titleSuffix = 1 + while (titleSuffixList.includes(`${titleSuffix}`)) { + titleSuffix += 1 + } + visitedView.meta.titleSuffix = titleSuffix === 1 ? undefined : `${titleSuffix}` + } + } + + this.visitedViews.push(visitedView) }, // 新增缓存 addCachedView() { @@ -63,7 +77,7 @@ // 删除tag delVisitedView(view: RouteLocationNormalizedLoaded) { for (const [i, v] of this.visitedViews.entries()) { - if (v.path === view.path) { + if (v.fullPath === view.fullPath) { this.visitedViews.splice(i, 1) break } @@ -95,18 +109,18 @@ // 删除其他tag delOthersVisitedViews(view: RouteLocationNormalizedLoaded) { this.visitedViews = this.visitedViews.filter((v) => { - return v?.meta?.affix || v.path === view.path + return v?.meta?.affix || v.fullPath === view.fullPath }) }, // 删除左侧 delLeftViews(view: RouteLocationNormalizedLoaded) { const index = findIndex<RouteLocationNormalizedLoaded>( this.visitedViews, - (v) => v.path === view.path + (v) => v.fullPath === view.fullPath ) if (index > -1) { this.visitedViews = this.visitedViews.filter((v, i) => { - return v?.meta?.affix || v.path === view.path || i > index + return v?.meta?.affix || v.fullPath === view.fullPath || i > index }) this.addCachedView() } @@ -115,18 +129,18 @@ delRightViews(view: RouteLocationNormalizedLoaded) { const index = findIndex<RouteLocationNormalizedLoaded>( this.visitedViews, - (v) => v.path === view.path + (v) => v.fullPath === view.fullPath ) if (index > -1) { this.visitedViews = this.visitedViews.filter((v, i) => { - return v?.meta?.affix || v.path === view.path || i < index + return v?.meta?.affix || v.fullPath === view.fullPath || i < index }) this.addCachedView() } }, updateVisitedView(view: RouteLocationNormalizedLoaded) { for (let v of this.visitedViews) { - if (v.path === view.path) { + if (v.fullPath === view.fullPath) { v = Object.assign(v, view) break } -- Gitblit v1.9.3