From c1c4fb2ca4a2ab1f560362b484e23ce19a8b073a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 21 十月 2021 18:10:45 +0800
Subject: [PATCH] update hutool 5.7.13 => 5.7.14 update qcloud.cos 5.6.55 => 5.6.58 update minio 8.3.0 => 8.3.1
---
ruoyi-ui/src/layout/components/TagsView/index.vue | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/TagsView/index.vue b/ruoyi-ui/src/layout/components/TagsView/index.vue
index 8747c89..99bb289 100644
--- a/ruoyi-ui/src/layout/components/TagsView/index.vue
+++ b/ruoyi-ui/src/layout/components/TagsView/index.vue
@@ -1,6 +1,6 @@
<template>
<div id="tags-view-container" class="tags-view-container">
- <scroll-pane ref="scrollPane" class="tags-view-wrapper">
+ <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
<router-link
v-for="tag in visitedViews"
ref="tag"
@@ -9,6 +9,7 @@
:to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
tag="span"
class="tags-view-item"
+ :style="activeStyle(tag)"
@click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
@contextmenu.prevent.native="openMenu(tag,$event)"
>
@@ -17,10 +18,12 @@
</router-link>
</scroll-pane>
<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>
+ <li @click="refreshSelectedTag(selectedTag)"><i class="el-icon-refresh-right"></i> 鍒锋柊椤甸潰</li>
+ <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)"><i class="el-icon-close"></i> 鍏抽棴褰撳墠</li>
+ <li @click="closeOthersTags"><i class="el-icon-circle-close"></i> 鍏抽棴鍏朵粬</li>
+ <li v-if="!isFirstView()" @click="closeLeftTags"><i class="el-icon-back"></i> 鍏抽棴宸︿晶</li>
+ <li v-if="!isLastView()" @click="closeRightTags"><i class="el-icon-right"></i> 鍏抽棴鍙充晶</li>
+ <li @click="closeAllTags(selectedTag)"><i class="el-icon-circle-close"></i> 鍏ㄩ儴鍏抽棴</li>
</ul>
</div>
</template>
@@ -46,6 +49,9 @@
},
routes() {
return this.$store.state.permission.routes
+ },
+ theme() {
+ return this.$store.state.settings.theme;
}
},
watch: {
@@ -69,8 +75,29 @@
isActive(route) {
return route.path === this.$route.path
},
+ activeStyle(tag) {
+ if (!this.isActive(tag)) return {};
+ return {
+ "background-color": this.theme,
+ "border-color": this.theme
+ };
+ },
isAffix(tag) {
return tag.meta && tag.meta.affix
+ },
+ isFirstView() {
+ try {
+ return this.selectedTag.fullPath === this.visitedViews[1].fullPath || this.selectedTag.fullPath === '/index'
+ } catch (err) {
+ return false
+ }
+ },
+ isLastView() {
+ try {
+ return this.selectedTag.fullPath === this.visitedViews[this.visitedViews.length - 1].fullPath
+ } catch (err) {
+ return false
+ }
},
filterAffixTags(routes, basePath = '/') {
let tags = []
@@ -141,15 +168,29 @@
}
})
},
+ closeRightTags() {
+ this.$store.dispatch('tagsView/delRightTags', this.selectedTag).then(visitedViews => {
+ if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) {
+ this.toLastView(visitedViews)
+ }
+ })
+ },
+ closeLeftTags() {
+ this.$store.dispatch('tagsView/delLeftTags', 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()
})
},
closeAllTags(view) {
this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
- if (this.affixTags.some(tag => tag.path === view.path)) {
+ if (this.affixTags.some(tag => tag.path === this.$route.path)) {
return
}
this.toLastView(visitedViews, view)
@@ -189,6 +230,9 @@
},
closeMenu() {
this.visible = false
+ },
+ handleScroll() {
+ this.closeMenu()
}
}
}
--
Gitblit v1.9.3