From aa5530f51b733c6550dba59877a0301763be3d21 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 22 Mar 2026 15:03:02 +0800
Subject: [PATCH] 优化页签功能&支持全屏按钮操作
---
ruoyi-ui/src/layout/components/TagsView/index.vue | 308 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 260 insertions(+), 48 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/TagsView/index.vue b/ruoyi-ui/src/layout/components/TagsView/index.vue
index 19e1912..08a2be5 100644
--- a/ruoyi-ui/src/layout/components/TagsView/index.vue
+++ b/ruoyi-ui/src/layout/components/TagsView/index.vue
@@ -1,26 +1,63 @@
<template>
<div id="tags-view-container" class="tags-view-container">
- <scroll-pane ref="scrollPane" class="tags-view-wrapper">
+ <!-- 左切换箭头 -->
+ <span class="tags-nav-btn tags-nav-btn--left" :class="{ disabled: !canScrollLeft }" @click="scrollLeft">
+ <i class="el-icon-arrow-left" />
+ </span>
+
+ <!-- 标签滚动区 -->
+ <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll" @updateArrows="updateArrowState">
<router-link
v-for="tag in visitedViews"
ref="tag"
:key="tag.path"
- :class="isActive(tag)?'active':''"
+ :class="{ 'active': isActive(tag), 'has-icon': tagsIcon }"
:to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
tag="span"
class="tags-view-item"
- @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
- @contextmenu.prevent.native="openMenu(tag,$event)"
+ :style="activeStyle(tag)"
+ @click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''"
+ @contextmenu.prevent.native="openMenu(tag, $event)"
>
+ <svg-icon v-if="tagsIcon && tag.meta && tag.meta.icon && tag.meta.icon !== '#'" :icon-class="tag.meta.icon" />
{{ tag.title }}
<span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
</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>
+
+ <!-- 右切换箭头 -->
+ <span class="tags-nav-btn tags-nav-btn--right" :class="{ disabled: !canScrollRight }" @click="scrollRight">
+ <i class="el-icon-arrow-right" />
+ </span>
+
+ <!-- 下拉操作菜单 -->
+ <el-dropdown class="tags-action-dropdown" trigger="click" placement="bottom-end" @command="handleDropdownCommand">
+ <span class="tags-action-btn">
+ <i class="el-icon-arrow-down" />
+ </span>
+ <el-dropdown-menu slot="dropdown" class="tags-dropdown-menu">
+ <el-dropdown-item command="refresh" icon="el-icon-refresh-right">刷新页面</el-dropdown-item>
+ <el-dropdown-item v-if="!isAffix(selectedDropdownTag)" command="close" icon="el-icon-close">关闭当前</el-dropdown-item>
+ <el-dropdown-item command="closeOthers" icon="el-icon-circle-close">关闭其他</el-dropdown-item>
+ <el-dropdown-item command="closeLeft" :disabled="isFirstView()" icon="el-icon-back">关闭左侧</el-dropdown-item>
+ <el-dropdown-item command="closeRight" :disabled="isLastView()" icon="el-icon-right">关闭右侧</el-dropdown-item>
+ <el-dropdown-item command="closeAll" icon="el-icon-circle-close" divided>全部关闭</el-dropdown-item>
+ </el-dropdown-menu>
+ </el-dropdown>
+
+ <!-- 全屏按钮 -->
+ <span class="tags-action-btn tags-fullscreen-btn" :title="isFullscreen ? '退出全屏' : '全屏'" @click="toggleFullscreen">
+ <i :class="isFullscreen ? 'el-icon-aim' : 'el-icon-full-screen'" />
+ </span>
+
+ <!-- 右键上下文菜单 -->
+ <ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
+ <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>
@@ -37,7 +74,10 @@
top: 0,
left: 0,
selectedTag: {},
- affixTags: []
+ affixTags: [],
+ canScrollLeft: false,
+ canScrollRight: false,
+ isFullscreen: false
}
},
computed: {
@@ -46,6 +86,15 @@
},
routes() {
return this.$store.state.permission.routes
+ },
+ theme() {
+ return this.$store.state.settings.theme
+ },
+ tagsIcon() {
+ return this.$store.state.settings.tagsIcon
+ },
+ selectedDropdownTag() {
+ return this.visitedViews.find(v => this.isActive(v)) || {}
}
},
watch: {
@@ -59,18 +108,52 @@
} else {
document.body.removeEventListener('click', this.closeMenu)
}
+ },
+ visitedViews() {
+ this.$nextTick(() => {
+ this.updateArrowState()
+ })
}
},
mounted() {
this.initTags()
this.addTags()
+ window.addEventListener('resize', this.updateArrowState)
+ document.addEventListener('fullscreenchange', this.onFullscreenChange)
+ },
+ beforeDestroy() {
+ window.removeEventListener('resize', this.updateArrowState)
+ document.removeEventListener('fullscreenchange', this.onFullscreenChange)
},
methods: {
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
+ return tag && tag.meta && tag.meta.affix
+ },
+ isFirstView() {
+ try {
+ const tag = this.selectedTag && this.selectedTag.fullPath ? this.selectedTag : this.selectedDropdownTag
+ return tag.fullPath === '/index' || tag.fullPath === this.visitedViews[1].fullPath
+ } catch (err) {
+ return false
+ }
+ },
+ isLastView() {
+ try {
+ const tag = this.selectedTag && this.selectedTag.fullPath ? this.selectedTag : this.selectedDropdownTag
+ return tag.fullPath === this.visitedViews[this.visitedViews.length - 1].fullPath
+ } catch (err) {
+ return false
+ }
},
filterAffixTags(routes, basePath = '/') {
let tags = []
@@ -96,7 +179,6 @@
initTags() {
const affixTags = this.affixTags = this.filterAffixTags(this.routes)
for (const tag of affixTags) {
- // Must have tag name
if (tag.name) {
this.$store.dispatch('tagsView/addVisitedView', tag)
}
@@ -107,7 +189,6 @@
if (name) {
this.$store.dispatch('tagsView/addView', this.$route)
}
- return false
},
moveToCurrentTag() {
const tags = this.$refs.tag
@@ -115,7 +196,6 @@
for (const tag of tags) {
if (tag.to.path === this.$route.path) {
this.$refs.scrollPane.moveToTarget(tag)
- // when query is different then update
if (tag.to.fullPath !== this.$route.fullPath) {
this.$store.dispatch('tagsView/updateVisitedView', this.$route)
}
@@ -124,32 +204,96 @@
}
})
},
- refreshSelectedTag(view) {
- this.$store.dispatch('tagsView/delCachedView', view).then(() => {
- const { fullPath } = view
- this.$nextTick(() => {
- this.$router.replace({
- path: '/redirect' + fullPath
- })
- })
+ scrollLeft() {
+ if (!this.canScrollLeft) return
+ this.$refs.scrollPane.scrollToStart()
+ },
+ scrollRight() {
+ if (!this.canScrollRight) return
+ this.$refs.scrollPane.scrollToEnd()
+ },
+ updateArrowState() {
+ this.$nextTick(() => {
+ if (this.$refs.scrollPane) {
+ const state = this.$refs.scrollPane.getScrollState()
+ this.canScrollLeft = state.canLeft
+ this.canScrollRight = state.canRight
+ }
})
},
+ toggleFullscreen() {
+ if (!document.fullscreenElement) {
+ const appMain = document.querySelector('.app-main')
+ if (appMain) {
+ appMain.requestFullscreen()
+ }
+ } else {
+ document.exitFullscreen()
+ }
+ },
+ onFullscreenChange() {
+ this.isFullscreen = !!document.fullscreenElement
+ },
+ handleDropdownCommand(command) {
+ const tag = this.selectedDropdownTag
+ this.selectedTag = tag
+ switch (command) {
+ case 'refresh':
+ this.refreshSelectedTag(tag)
+ break
+ case 'close':
+ this.closeSelectedTag(tag)
+ break
+ case 'closeOthers':
+ this.closeOthersTags()
+ break
+ case 'closeLeft':
+ this.closeLeftTags()
+ break
+ case 'closeRight':
+ this.closeRightTags()
+ break
+ case 'closeAll':
+ this.closeAllTags(tag)
+ break
+ }
+ },
+ refreshSelectedTag(view) {
+ this.$tab.refreshPage(view)
+ if (this.$route.meta.link) {
+ this.$store.dispatch('tagsView/delIframeView', this.$route)
+ }
+ },
closeSelectedTag(view) {
- this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
+ this.$tab.closePage(view).then(({ visitedViews }) => {
if (this.isActive(view)) {
this.toLastView(visitedViews, view)
}
})
},
+ closeRightTags() {
+ this.$tab.closeRightPage(this.selectedTag).then(visitedViews => {
+ if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) {
+ this.toLastView(visitedViews)
+ }
+ })
+ },
+ closeLeftTags() {
+ this.$tab.closeLeftPage(this.selectedTag).then(visitedViews => {
+ if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) {
+ this.toLastView(visitedViews)
+ }
+ })
+ },
closeOthersTags() {
- this.$router.push(this.selectedTag)
- this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => {
+ this.$router.push(this.selectedTag.fullPath).catch(() => {})
+ this.$tab.closeOtherPage(this.selectedTag).then(() => {
this.moveToCurrentTag()
})
},
closeAllTags(view) {
- this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
- if (this.affixTags.some(tag => tag.path === view.path)) {
+ this.$tab.closeAllPage().then(({ visitedViews }) => {
+ if (this.affixTags.some(tag => tag.path === this.$route.path)) {
return
}
this.toLastView(visitedViews, view)
@@ -160,10 +304,7 @@
if (latestView) {
this.$router.push(latestView.fullPath)
} else {
- // now the default is to redirect to the home page if there is no tags-view,
- // you can adjust it according to your needs.
- if (view.name === 'Dashboard') {
- // to reload home page
+ if (view && view.name === 'Dashboard') {
this.$router.replace({ path: '/redirect' + view.fullPath })
} else {
this.$router.push('/')
@@ -171,24 +312,17 @@
}
},
openMenu(tag, e) {
- const menuMinWidth = 105
- const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
- const offsetWidth = this.$el.offsetWidth // container width
- const maxLeft = offsetWidth - menuMinWidth // left boundary
- const left = e.clientX - offsetLeft + 15 // 15: margin right
-
- if (left > maxLeft) {
- this.left = maxLeft
- } else {
- this.left = left
- }
-
+ this.left = e.clientX
this.top = e.clientY
this.visible = true
this.selectedTag = tag
},
closeMenu() {
this.visible = false
+ },
+ handleScroll() {
+ this.closeMenu()
+ this.updateArrowState()
}
}
}
@@ -200,8 +334,52 @@
width: 100%;
background: #fff;
border-bottom: 1px solid #d8dce5;
- box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
+ display: flex;
+ align-items: center;
+
+ $btn-width: 28px;
+ $btn-color: #71717a;
+ $btn-hover-bg: #f0f2f5;
+ $btn-hover-color: #303133;
+ $btn-disabled-color: #c0c4cc;
+ $divider: 1px solid #d8dce5;
+
+ .tags-nav-btn {
+ flex-shrink: 0;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: $btn-width;
+ height: 34px;
+ cursor: pointer;
+ color: $btn-color;
+ font-size: 13px;
+ user-select: none;
+ transition: background 0.15s, color 0.15s;
+
+ &:hover:not(.disabled) {
+ background: $btn-hover-bg;
+ color: $btn-hover-color;
+ }
+
+ &.disabled {
+ color: $btn-disabled-color;
+ cursor: not-allowed;
+ }
+
+ &--left {
+ border-right: $divider;
+ }
+
+ &--right {
+ border-left: $divider;
+ }
+ }
+
.tags-view-wrapper {
+ flex: 1;
+ min-width: 0;
+
.tags-view-item {
display: inline-block;
position: relative;
@@ -214,9 +392,9 @@
padding: 0 8px;
font-size: 12px;
margin-left: 5px;
- margin-top: 4px;
+
&:first-of-type {
- margin-left: 15px;
+ margin-left: 6px;
}
&:last-of-type {
margin-right: 15px;
@@ -238,11 +416,45 @@
}
}
}
+
+ .tags-view-item.active.has-icon::before {
+ content: none !important;
+ }
+
+ .tags-action-dropdown {
+ flex-shrink: 0;
+ display: flex;
+ align-items: center;
+ }
+
+ .tags-action-btn {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: $btn-width;
+ height: 34px;
+ cursor: pointer;
+ color: $btn-color;
+ font-size: 13px;
+ border-left: $divider;
+ user-select: none;
+ transition: background 0.15s, color 0.15s;
+
+ &:hover {
+ background: $btn-hover-bg;
+ color: $btn-hover-color;
+ }
+ }
+
+ .tags-fullscreen-btn {
+ border-left: $divider;
+ }
+
.contextmenu {
margin: 0;
background: #fff;
z-index: 3000;
- position: absolute;
+ position: fixed;
list-style-type: none;
padding: 5px 0;
border-radius: 4px;
@@ -250,6 +462,7 @@
font-weight: 400;
color: #333;
box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
+
li {
margin: 0;
padding: 7px 16px;
@@ -263,7 +476,6 @@
</style>
<style lang="scss">
-//reset element css of el-icon-close
.tags-view-wrapper {
.tags-view-item {
.el-icon-close {
--
Gitblit v1.9.3