From f093da99ecb963d19d62dc0f242f00b20bc8895c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 14 四月 2021 13:22:31 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-ui/src/layout/components/TagsView/index.vue | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/TagsView/index.vue b/ruoyi-ui/src/layout/components/TagsView/index.vue
index 81c2007..6caf350 100644
--- a/ruoyi-ui/src/layout/components/TagsView/index.vue
+++ b/ruoyi-ui/src/layout/components/TagsView/index.vue
@@ -21,6 +21,7 @@
<li @click="refreshSelectedTag(selectedTag)">鍒锋柊椤甸潰</li>
<li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">鍏抽棴褰撳墠</li>
<li @click="closeOthersTags">鍏抽棴鍏朵粬</li>
+ <li v-if="!isLastView()" @click="closeRightTags">鍏抽棴鍙充晶</li>
<li @click="closeAllTags(selectedTag)">鍏抽棴鎵�鏈�</li>
</ul>
</div>
@@ -29,7 +30,6 @@
<script>
import ScrollPane from './ScrollPane'
import path from 'path'
-import Global from "@/layout/components/global.js";
export default {
components: { ScrollPane },
@@ -83,6 +83,13 @@
},
isAffix(tag) {
return tag.meta && tag.meta.affix
+ },
+ isLastView() {
+ try {
+ return this.selectedTag.fullPath === this.visitedViews[this.visitedViews.length - 1].fullPath
+ } catch (err) {
+ return false
+ }
},
filterAffixTags(routes, basePath = '/') {
let tags = []
@@ -145,7 +152,6 @@
})
})
})
- Global.$emit("removeCache", "refreshSelectedTag", this.selectedTag);
},
closeSelectedTag(view) {
this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
@@ -153,14 +159,19 @@
this.toLastView(visitedViews, view)
}
})
- Global.$emit("removeCache", "closeSelectedTag", view);
+ },
+ closeRightTags() {
+ this.$store.dispatch('tagsView/delRightTags', this.selectedTag).then(visitedViews => {
+ if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) {
+ this.toLastView(visitedViews)
+ }
+ })
},
closeOthersTags() {
- this.$router.push(this.selectedTag)
+ this.$router.push(this.selectedTag).catch(()=>{});
this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => {
this.moveToCurrentTag()
})
- Global.$emit("removeCache", "closeOthersTags", this.selectedTag);
},
closeAllTags(view) {
this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
@@ -169,7 +180,6 @@
}
this.toLastView(visitedViews, view)
})
- Global.$emit("removeCache", "closeAllTags");
},
toLastView(visitedViews, view) {
const latestView = visitedViews.slice(-1)[0]
--
Gitblit v1.9.3