From cc4fe8f7cb80bdc7bdf264271e68777324f89f40 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 03 Apr 2026 15:40:56 +0800
Subject: [PATCH] 数据权限注解支持自定义字段名
---
ruoyi-ui/src/layout/components/TagsView/index.vue | 116 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 96 insertions(+), 20 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/TagsView/index.vue b/ruoyi-ui/src/layout/components/TagsView/index.vue
index 08a2be5..3392999 100644
--- a/ruoyi-ui/src/layout/components/TagsView/index.vue
+++ b/ruoyi-ui/src/layout/components/TagsView/index.vue
@@ -36,18 +36,21 @@
<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-item command="closeAll" icon="el-icon-circle-close">全部关闭</el-dropdown-item>
+ <el-dropdown-item command="fullscreen" divided>
+ <template v-if="!isFullscreen"><i class="el-icon-full-screen"></i>全屏显示</template>
+ <template v-else><i class="el-icon-close"></i>退出全屏</template>
+ </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 class="tags-action-btn tags-refresh-btn" title="刷新页面" @click="refreshSelectedTag(selectedDropdownTag)">
+ <i class="el-icon-refresh-right" /> 刷新
</span>
<!-- 右键上下文菜单 -->
@@ -77,7 +80,8 @@
affixTags: [],
canScrollLeft: false,
canScrollRight: false,
- isFullscreen: false
+ isFullscreen: false,
+ hiddenElements: []
}
},
computed: {
@@ -119,13 +123,19 @@
this.initTags()
this.addTags()
window.addEventListener('resize', this.updateArrowState)
- document.addEventListener('fullscreenchange', this.onFullscreenChange)
+ window.addEventListener('keydown', this.handleKeyDown)
},
beforeDestroy() {
window.removeEventListener('resize', this.updateArrowState)
- document.removeEventListener('fullscreenchange', this.onFullscreenChange)
+ window.removeEventListener('keydown', this.handleKeyDown)
},
methods: {
+ handleKeyDown(event) {
+ // 当按下Esc键且处于全屏状态时，退出全屏
+ if (event.key === 'Escape' && this.isFullscreen) {
+ this.toggleFullscreen()
+ }
+ },
isActive(route) {
return route.path === this.$route.path
},
@@ -177,10 +187,13 @@
return tags
},
initTags() {
+ if (this.$store.state.settings.tagsViewPersist) {
+ this.$store.dispatch('tagsView/loadPersistedViews')
+ }
const affixTags = this.affixTags = this.filterAffixTags(this.routes)
for (const tag of affixTags) {
if (tag.name) {
- this.$store.dispatch('tagsView/addVisitedView', tag)
+ this.$store.dispatch('tagsView/addAffixView', tag)
}
}
},
@@ -222,17 +235,39 @@
})
},
toggleFullscreen() {
- if (!document.fullscreenElement) {
- const appMain = document.querySelector('.app-main')
- if (appMain) {
- appMain.requestFullscreen()
- }
+ const mainContainer = document.querySelector('.main-container')
+ const navbar = document.querySelector('.navbar')
+ const sidebar = document.querySelector('.sidebar-container')
+ if (!mainContainer) return
+
+ if (!this.isFullscreen) {
+ mainContainer.classList.add('fullscreen-mode')
+ document.body.style.overflow = 'hidden'
+ const elementsToHide = [
+ { el: navbar, originalDisplay: (navbar && navbar.style.display) || '' },
+ { el: sidebar, originalDisplay: (sidebar && sidebar.style.display) || '' }
+ ]
+ elementsToHide.forEach(item => {
+ if (item.el && item.el.style.display !== 'none') {
+ item.originalDisplay = item.el.style.display
+ item.el.style.display = 'none'
+ this.hiddenElements.push(item)
+ }
+ })
+ this.isFullscreen = true
} else {
- document.exitFullscreen()
+ mainContainer.classList.remove('fullscreen-mode')
+ document.body.style.overflow = ''
+ this.hiddenElements.forEach(item => {
+ if (item.el) {
+ item.el.style.display = item.originalDisplay
+ }
+ })
+ this.hiddenElements = []
+ const btn = document.querySelector('.tags-action-btn')
+ if (btn) btn.blur()
+ this.isFullscreen = false
}
- },
- onFullscreenChange() {
- this.isFullscreen = !!document.fullscreenElement
},
handleDropdownCommand(command) {
const tag = this.selectedDropdownTag
@@ -240,6 +275,9 @@
switch (command) {
case 'refresh':
this.refreshSelectedTag(tag)
+ break
+ case 'fullscreen':
+ this.toggleFullscreen()
break
case 'close':
this.closeSelectedTag(tag)
@@ -392,6 +430,7 @@
padding: 0 8px;
font-size: 12px;
margin-left: 5px;
+ border-radius: 3px;
&:first-of-type {
margin-left: 6px;
@@ -446,8 +485,8 @@
}
}
- .tags-fullscreen-btn {
- border-left: $divider;
+ .tags-refresh-btn {
+ width: 60px;
}
.contextmenu {
@@ -498,4 +537,41 @@
}
}
}
+
+/* 页签全屏模式样式 */
+.main-container.fullscreen-mode {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100vw;
+ height: 100vh;
+ overflow: hidden;
+}
+
+.main-container.fullscreen-mode .fixed-header {
+ display: block !important;
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ width: 100% !important;
+ z-index: 1000;
+}
+
+.main-container.fullscreen-mode .fixed-header .navbar {
+ display: none !important;
+}
+
+.main-container.fullscreen-mode .app-main {
+ position: fixed;
+ top: 34px;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ margin: 0 !important;
+ padding: 0 !important;
+ height: calc(100vh - 34px) !important;
+ min-height: calc(100vh - 34px) !important;
+ overflow: auto;
+}
</style>
--
Gitblit v1.9.3