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/ScrollPane.vue | 79 +++++++++++--
ruoyi-ui/src/layout/components/AppMain.vue | 10 +
ruoyi-ui/src/assets/styles/element-variables.scss | 2
ruoyi-ui/src/layout/components/TagsView/index.vue | 228 ++++++++++++++++++++++++++++++++-----
ruoyi-ui/src/assets/styles/element-ui.scss | 8 +
ruoyi-ui/src/assets/styles/ruoyi.scss | 4
6 files changed, 285 insertions(+), 46 deletions(-)
diff --git a/ruoyi-ui/src/assets/styles/element-ui.scss b/ruoyi-ui/src/assets/styles/element-ui.scss
index 558eea4..9ff2c87 100644
--- a/ruoyi-ui/src/assets/styles/element-ui.scss
+++ b/ruoyi-ui/src/assets/styles/element-ui.scss
@@ -82,3 +82,11 @@
.el-range-separator {
box-sizing: content-box;
}
+
+.el-menu--collapse
+ > div
+ > .el-submenu
+ > .el-submenu__title
+ .el-submenu__icon-arrow {
+ display: none;
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/styles/element-variables.scss b/ruoyi-ui/src/assets/styles/element-variables.scss
index 039d1e4..5bf2fbb 100644
--- a/ruoyi-ui/src/assets/styles/element-variables.scss
+++ b/ruoyi-ui/src/assets/styles/element-variables.scss
@@ -17,7 +17,7 @@
$--border-color-light: #dfe4ed;
$--border-color-lighter: #e6ebf5;
-$--table-border:1px solid#dfe6ec;
+$--table-border: 1px solid #dfe6ec;
/* icon font path, required */
$--font-path: '~element-ui/lib/theme-chalk/fonts';
diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss
index 26334b5..b822c55 100644
--- a/ruoyi-ui/src/assets/styles/ruoyi.scss
+++ b/ruoyi-ui/src/assets/styles/ruoyi.scss
@@ -81,6 +81,10 @@
margin-top: 6vh !important;
}
+.el-dialog__body {
+ padding: 8px 20px !important;
+}
+
.el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body {
overflow: auto;
overflow-x: hidden;
diff --git a/ruoyi-ui/src/layout/components/AppMain.vue b/ruoyi-ui/src/layout/components/AppMain.vue
index 2b9987e..e8dfc93 100644
--- a/ruoyi-ui/src/layout/components/AppMain.vue
+++ b/ruoyi-ui/src/layout/components/AppMain.vue
@@ -51,6 +51,14 @@
width: 100%;
position: relative;
overflow: hidden;
+
+ &:fullscreen,
+ &:-webkit-full-screen,
+ &:-moz-full-screen,
+ &:-ms-fullscreen {
+ background: #fff;
+ overflow-y: auto;
+ }
}
.fixed-header + .app-main {
@@ -129,4 +137,4 @@
background-color: #c0c0c0;
border-radius: 3px;
}
-</style>
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue b/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
index c110bf1..3dbd9ae 100644
--- a/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
+++ b/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
@@ -5,7 +5,7 @@
</template>
<script>
-const tagAndTagSpacing = 4 // tagAndTagSpacing
+const tagAndTagSpacing = 4
export default {
name: 'ScrollPane',
@@ -26,13 +26,44 @@
this.scrollWrapper.removeEventListener('scroll', this.emitScroll)
},
methods: {
+ smoothScrollTo(target) {
+ const $scrollWrapper = this.scrollWrapper
+ const start = $scrollWrapper.scrollLeft
+ const distance = target - start
+ const duration = 300
+ let startTime = null
+
+ function ease(t, b, c, d) {
+ t /= d / 2
+ if (t < 1) return c / 2 * t * t + b
+ t--
+ return -c / 2 * (t * (t - 2) - 1) + b
+ }
+
+ const emit = this.$emit.bind(this)
+ function step(timestamp) {
+ if (!startTime) startTime = timestamp
+ const elapsed = timestamp - startTime
+ $scrollWrapper.scrollLeft = ease(elapsed, start, distance, duration)
+ if (elapsed < duration) {
+ requestAnimationFrame(step)
+ } else {
+ $scrollWrapper.scrollLeft = target
+ emit('updateArrows')
+ }
+ }
+
+ requestAnimationFrame(step)
+ },
handleScroll(e) {
const eventDelta = e.wheelDelta || -e.deltaY * 40
const $scrollWrapper = this.scrollWrapper
$scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4
+ this.$emit('updateArrows')
},
emitScroll() {
this.$emit('scroll')
+ this.$emit('updateArrows')
},
moveToTarget(currentTag) {
const $container = this.$refs.scrollContainer.$el
@@ -43,33 +74,55 @@
let firstTag = null
let lastTag = null
- // find first tag and last tag
if (tagList.length > 0) {
firstTag = tagList[0]
lastTag = tagList[tagList.length - 1]
}
if (firstTag === currentTag) {
- $scrollWrapper.scrollLeft = 0
+ this.smoothScrollTo(0)
} else if (lastTag === currentTag) {
- $scrollWrapper.scrollLeft = $scrollWrapper.scrollWidth - $containerWidth
+ this.smoothScrollTo($scrollWrapper.scrollWidth - $containerWidth)
} else {
- // find preTag and nextTag
const currentIndex = tagList.findIndex(item => item === currentTag)
const prevTag = tagList[currentIndex - 1]
const nextTag = tagList[currentIndex + 1]
-
- // the tag's offsetLeft after of nextTag
const afterNextTagOffsetLeft = nextTag.$el.offsetLeft + nextTag.$el.offsetWidth + tagAndTagSpacing
-
- // the tag's offsetLeft before of prevTag
const beforePrevTagOffsetLeft = prevTag.$el.offsetLeft - tagAndTagSpacing
if (afterNextTagOffsetLeft > $scrollWrapper.scrollLeft + $containerWidth) {
- $scrollWrapper.scrollLeft = afterNextTagOffsetLeft - $containerWidth
+ this.smoothScrollTo(afterNextTagOffsetLeft - $containerWidth)
} else if (beforePrevTagOffsetLeft < $scrollWrapper.scrollLeft) {
- $scrollWrapper.scrollLeft = beforePrevTagOffsetLeft
+ this.smoothScrollTo(beforePrevTagOffsetLeft)
}
+ }
+ },
+ // 向左滚动固定距离
+ scrollLeft() {
+ const $scrollWrapper = this.scrollWrapper
+ this.smoothScrollTo(Math.max(0, $scrollWrapper.scrollLeft - 200))
+ },
+ // 向右滚动固定距离
+ scrollRight() {
+ const $scrollWrapper = this.scrollWrapper
+ const maxScroll = $scrollWrapper.scrollWidth - $scrollWrapper.clientWidth
+ this.smoothScrollTo(Math.min(maxScroll, $scrollWrapper.scrollLeft + 200))
+ },
+ // 直接平滑滚动到最左端
+ scrollToStart() {
+ this.smoothScrollTo(0)
+ },
+ // 直接平滑滚动到最右端
+ scrollToEnd() {
+ const $scrollWrapper = this.scrollWrapper
+ this.smoothScrollTo($scrollWrapper.scrollWidth - $scrollWrapper.clientWidth)
+ },
+ // 获取是否可以继续向左/右滚动
+ getScrollState() {
+ const $scrollWrapper = this.scrollWrapper
+ return {
+ canLeft: $scrollWrapper.scrollLeft > 0,
+ canRight: $scrollWrapper.scrollLeft < $scrollWrapper.scrollWidth - $scrollWrapper.clientWidth - 1
}
}
}
@@ -87,7 +140,9 @@
bottom: 0px;
}
.el-scrollbar__wrap {
- height: 49px;
+ height: 34px;
+ display: flex;
+ align-items: center;
}
}
}
diff --git a/ruoyi-ui/src/layout/components/TagsView/index.vue b/ruoyi-ui/src/layout/components/TagsView/index.vue
index fa837fc..08a2be5 100644
--- a/ruoyi-ui/src/layout/components/TagsView/index.vue
+++ b/ruoyi-ui/src/layout/components/TagsView/index.vue
@@ -1,6 +1,12 @@
<template>
<div id="tags-view-container" class="tags-view-container">
- <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
+ <!-- 左切换箭头 -->
+ <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"
@@ -10,15 +16,42 @@
tag="span"
class="tags-view-item"
:style="activeStyle(tag)"
- @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
- @contextmenu.prevent.native="openMenu(tag,$event)"
+ @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">
+
+ <!-- 右切换箭头 -->
+ <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>
@@ -41,7 +74,10 @@
top: 0,
left: 0,
selectedTag: {},
- affixTags: []
+ affixTags: [],
+ canScrollLeft: false,
+ canScrollRight: false,
+ isFullscreen: false
}
},
computed: {
@@ -56,6 +92,9 @@
},
tagsIcon() {
return this.$store.state.settings.tagsIcon
+ },
+ selectedDropdownTag() {
+ return this.visitedViews.find(v => this.isActive(v)) || {}
}
},
watch: {
@@ -69,11 +108,22 @@
} 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) {
@@ -87,18 +137,20 @@
}
},
isAffix(tag) {
- return tag.meta && tag.meta.affix
+ return tag && tag.meta && tag.meta.affix
},
isFirstView() {
try {
- return this.selectedTag.fullPath === '/index' || this.selectedTag.fullPath === this.visitedViews[1].fullPath
+ 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 {
- return this.selectedTag.fullPath === this.visitedViews[this.visitedViews.length - 1].fullPath
+ 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
}
@@ -127,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)
}
@@ -145,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)
}
@@ -153,6 +203,60 @@
}
}
})
+ },
+ 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)
@@ -182,7 +286,7 @@
})
},
closeOthersTags() {
- this.$router.push(this.selectedTag.fullPath).catch(()=>{})
+ this.$router.push(this.selectedTag.fullPath).catch(() => {})
this.$tab.closeOtherPage(this.selectedTag).then(() => {
this.moveToCurrentTag()
})
@@ -200,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('/')
@@ -211,18 +312,7 @@
}
},
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
@@ -232,6 +322,7 @@
},
handleScroll() {
this.closeMenu()
+ this.updateArrowState()
}
}
}
@@ -243,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;
@@ -257,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;
@@ -286,11 +421,40 @@
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;
@@ -298,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;
@@ -311,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