Compare commits

...

10 Commits

Author SHA1 Message Date
RuoYi
9baaff77ad 若依 3.9.2 2026-03-26 08:23:20 +08:00
RuoYi
8b724ab409 优化页签全屏显示 2026-03-26 00:52:25 +08:00
RuoYi
4a0446dce0 优化快速点击页签刷新出现404问题 2026-03-25 21:11:37 +08:00
RuoYi
58a9d61203 暗黑浅色主题优化 2026-03-25 10:02:58 +08:00
RuoYi
46cbbb6bea 黑暗模式下全屏不需要设置背景 2026-03-24 16:03:49 +08:00
RuoYi
59b03b6fc5 菜单管理列表新增类型显示 2026-03-24 15:34:13 +08:00
RuoYi
06a819354f 优化菜单主题风格 2026-03-24 10:31:05 +08:00
RuoYi
2542d2501d 优化页签显示 2026-03-23 11:44:22 +08:00
RuoYi
8e484ae03e 添加持久化标签页开关功能 2026-03-22 23:24:07 +08:00
RuoYi
943cb1815d 添加持久化标签页开关功能 2026-03-22 23:12:36 +08:00
14 changed files with 358 additions and 88 deletions

View File

@@ -1,11 +1,11 @@
<p align="center"> <p align="center">
<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png"> <img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">
</p> </p>
<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.9.1</h1> <h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.9.2</h1>
<h4 align="center">基于SpringBoot+Vue3前后端分离的Java快速开发框架</h4> <h4 align="center">基于SpringBoot+Vue3前后端分离的Java快速开发框架</h4>
<p align="center"> <p align="center">
<a href="https://gitee.com/y_project/RuoYi-Vue/stargazers"><img src="https://gitee.com/y_project/RuoYi-Vue/badge/star.svg?theme=dark"></a> <a href="https://gitee.com/y_project/RuoYi-Vue/stargazers"><img src="https://gitee.com/y_project/RuoYi-Vue/badge/star.svg?theme=dark"></a>
<a href="https://gitee.com/y_project/RuoYi-Vue"><img src="https://img.shields.io/badge/RuoYi-v3.9.1-brightgreen.svg"></a> <a href="https://gitee.com/y_project/RuoYi-Vue"><img src="https://img.shields.io/badge/RuoYi-v3.9.2-brightgreen.svg"></a>
<a href="https://gitee.com/y_project/RuoYi-Vue/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a> <a href="https://gitee.com/y_project/RuoYi-Vue/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
</p> </p>

View File

@@ -1,6 +1,6 @@
{ {
"name": "ruoyi", "name": "ruoyi",
"version": "3.9.1", "version": "3.9.2",
"description": "若依管理系统", "description": "若依管理系统",
"author": "若依", "author": "若依",
"license": "MIT", "license": "MIT",

View File

@@ -74,6 +74,8 @@
overflow: hidden !important; overflow: hidden !important;
text-overflow: ellipsis !important; text-overflow: ellipsis !important;
white-space: nowrap !important; white-space: nowrap !important;
height: 44px !important;
line-height: 44px !important;
} }
.el-menu-item .el-menu-tooltip__trigger { .el-menu-item .el-menu-tooltip__trigger {
@@ -84,7 +86,7 @@
.sub-menu-title-noDropdown, .sub-menu-title-noDropdown,
.el-sub-menu__title { .el-sub-menu__title {
&:hover { &:hover {
background-color: rgba(0, 0, 0, 0.06) !important; background-color: rgba(0, 0, 0, 0.06);
} }
} }
@@ -97,7 +99,7 @@
min-width: vars.$base-sidebar-width !important; min-width: vars.$base-sidebar-width !important;
&:hover { &:hover {
background-color: rgba(0, 0, 0, 0.06) !important; background-color: rgba(0, 0, 0, 0.06);
} }
} }
@@ -109,6 +111,96 @@
background-color: vars.$base-sub-menu-hover !important; background-color: vars.$base-sub-menu-hover !important;
} }
} }
// theme-dark 深色主题
&.theme-dark {
box-shadow: 2px 0 8px rgba(0, 0, 0, 0.4);
border-right: none;
.el-menu-item.is-active {
position: relative;
&::before {
content: '';
position: absolute;
inset: 0;
background-color: var(--current-color-dark-bg, rgba(64, 158, 255, 0.2));
border-right: 3px solid var(--current-color, #409eff);
pointer-events: none;
z-index: 1;
}
}
.el-sub-menu.is-active > .el-sub-menu__title {
color: var(--current-color, #409eff) !important;
}
.el-menu-item:not(.is-active),
.submenu-title-noDropdown,
.el-sub-menu__title {
position: relative;
&::before {
content: '';
position: absolute;
inset: 0;
background-color: transparent;
pointer-events: none;
z-index: 1;
transition: background-color 0.2s;
}
&:hover::before {
background-color: var(--current-color-dark-bg, rgba(64, 158, 255, 0.2));
}
}
}
// theme-light 浅色主题
&.theme-light {
border-right: 1px solid #e8eaf0;
box-shadow: none;
.el-menu-item,
.el-sub-menu__title {
color: rgba(0, 0, 0, 0.65);
}
.el-menu-item.is-active {
color: var(--current-color, #409eff) !important;
position: relative;
&::before {
content: '';
position: absolute;
inset: 0;
background-color: var(--current-color-light, #ecf5ff);
border-right: 3px solid var(--current-color, #409eff);
pointer-events: none;
z-index: 1;
}
}
.el-sub-menu.is-active > .el-sub-menu__title {
color: var(--current-color, #409eff) !important;
}
.el-menu-item:not(.is-active):hover,
.submenu-title-noDropdown:hover,
.el-sub-menu__title:hover {
background-color: #f5f7fa;
color: rgba(0, 0, 0, 0.85) !important;
}
.nest-menu .el-sub-menu > .el-sub-menu__title,
.el-sub-menu .el-menu-item {
background-color: #fafafa;
&:hover {
background-color: #f0f5ff;
}
}
}
} }
.hideSidebar { .hideSidebar {

View File

@@ -11,7 +11,7 @@ $panGreen: #30B08F;
// 默认主题变量 // 默认主题变量
$menuText: #bfcbd9; $menuText: #bfcbd9;
$menuActiveText: #409eff; $menuActiveText: #409eff;
$menuBg: #304156; $menuBg: #1a1f2e;
$menuHover: #263445; $menuHover: #263445;
// 浅色主题theme-light // 浅色主题theme-light
@@ -25,11 +25,11 @@ $base-sidebar-width: 200px;
$sideBarWidth: 200px; $sideBarWidth: 200px;
// 菜单暗色变量 // 菜单暗色变量
$base-menu-color: #bfcbd9; $base-menu-color: rgba(255,255,255,.65);
$base-menu-color-active: #f4f4f5; $base-menu-color-active: #ffffff;
$base-menu-background: #304156; $base-menu-background: #1a1f2e;
$base-sub-menu-background: #1f2d3d; $base-sub-menu-background: #141824;
$base-sub-menu-hover: #001528; $base-sub-menu-hover: rgba(255,255,255,.06);
// 组件变量 // 组件变量
$--color-primary: #409EFF; $--color-primary: #409EFF;
@@ -134,9 +134,36 @@ html.dark {
.el-menu-item:not(.is-active), .menu-title { .el-menu-item:not(.is-active), .menu-title {
color: var(--el-text-color-regular); color: var(--el-text-color-regular);
} }
& .el-menu .theme-dark .nest-menu .el-sub-menu > .el-sub-menu__title,
& .el-menu .theme-dark .el-sub-menu .el-menu-item,
& .theme-dark .nest-menu .el-sub-menu > .el-sub-menu__title, & .theme-dark .nest-menu .el-sub-menu > .el-sub-menu__title,
& .theme-dark .el-sub-menu .el-menu-item { & .theme-dark .el-sub-menu .el-menu-item {
background-color: var(--el-bg-color) !important; background-color: var(--el-bg-color) !important;
&:hover {
background-color: var(--menu-hover) !important;
}
}
&.theme-light {
border-right: none !important;
.el-menu-item,
.el-sub-menu__title {
color: var(--sidebar-text) !important;
}
.el-menu-item:not(.is-active):hover,
.submenu-title-noDropdown:hover,
.el-sub-menu__title:hover {
background-color: var(--menu-hover) !important;
}
.el-menu .nest-menu .el-sub-menu>.el-sub-menu__title,
.el-menu .el-sub-menu .el-menu-item,
.nest-menu .el-sub-menu>.el-sub-menu__title,
.el-sub-menu .el-menu-item {
background-color: var(--el-bg-color) !important;
&:hover {
background-color: var(--menu-hover) !important;
}
}
} }
} }

View File

@@ -63,6 +63,13 @@
</span> </span>
</div> </div>
<div class="drawer-item">
<span>持久化标签页</span>
<span class="comp-style">
<el-switch v-model="settingsStore.tagsViewPersist" :disabled="!settingsStore.tagsView" @change="tagsViewPersistChange" class="drawer-switch" />
</span>
</div>
<div class="drawer-item"> <div class="drawer-item">
<span>显示页签图标</span> <span>显示页签图标</span>
<span class="comp-style"> <span class="comp-style">
@@ -120,6 +127,7 @@ const showSettings = ref(false)
const navType = ref(settingsStore.navType) const navType = ref(settingsStore.navType)
const theme = ref(settingsStore.theme) const theme = ref(settingsStore.theme)
const sideTheme = ref(settingsStore.sideTheme) const sideTheme = ref(settingsStore.sideTheme)
const tagsViewPersist = ref(settingsStore.tagsViewPersist)
const storeSettings = computed(() => settingsStore) const storeSettings = computed(() => settingsStore)
const predefineColors = ref(["#409EFF", "#ff4500", "#ff8c00", "#ffd700", "#90ee90", "#00ced1", "#1e90ff", "#c71585"]) const predefineColors = ref(["#409EFF", "#ff4500", "#ff8c00", "#ffd700", "#90ee90", "#00ced1", "#1e90ff", "#c71585"])
@@ -128,6 +136,11 @@ function dynamicTitleChange() {
useSettingsStore().setTitle(useSettingsStore().title) useSettingsStore().setTitle(useSettingsStore().title)
} }
function tagsViewPersistChange(val) {
settingsStore.tagsViewPersist = val
tagsViewPersist.value = val
}
function themeChange(val) { function themeChange(val) {
settingsStore.theme = val settingsStore.theme = val
handleThemeStyle(val) handleThemeStyle(val)
@@ -164,10 +177,14 @@ watch(() => navType, val => {
function saveSetting() { function saveSetting() {
proxy.$modal.loading("正在保存到本地,请稍候...") proxy.$modal.loading("正在保存到本地,请稍候...")
if (!tagsViewPersist.value) {
proxy.$cache.local.remove('tags-view-visited')
}
let layoutSetting = { let layoutSetting = {
"navType": storeSettings.value.navType, "navType": storeSettings.value.navType,
"tagsView": storeSettings.value.tagsView, "tagsView": storeSettings.value.tagsView,
"tagsIcon": storeSettings.value.tagsIcon, "tagsIcon": storeSettings.value.tagsIcon,
"tagsViewPersist": storeSettings.value.tagsViewPersist,
"fixedHeader": storeSettings.value.fixedHeader, "fixedHeader": storeSettings.value.fixedHeader,
"sidebarLogo": storeSettings.value.sidebarLogo, "sidebarLogo": storeSettings.value.sidebarLogo,
"dynamicTitle": storeSettings.value.dynamicTitle, "dynamicTitle": storeSettings.value.dynamicTitle,
@@ -180,6 +197,7 @@ function saveSetting() {
} }
function resetSetting() { function resetSetting() {
proxy.$cache.local.remove('tags-view-visited')
proxy.$modal.loading("正在清除设置缓存并刷新,请稍候...") proxy.$modal.loading("正在清除设置缓存并刷新,请稍候...")
localStorage.removeItem("layout-setting") localStorage.removeItem("layout-setting")
setTimeout("window.location.reload()", 1000) setTimeout("window.location.reload()", 1000)

View File

@@ -1,5 +1,5 @@
<template> <template>
<div :class="{ 'has-logo': showLogo }" class="sidebar-container"> <div :class="['sidebar-theme-wrapper', {'has-logo':showLogo}, sideTheme]" class="sidebar-container">
<logo v-if="showLogo" :collapse="isCollapse" /> <logo v-if="showLogo" :collapse="isCollapse" />
<el-scrollbar wrap-class="scrollbar-wrapper"> <el-scrollbar wrap-class="scrollbar-wrapper">
<el-menu <el-menu

View File

@@ -38,56 +38,32 @@
</span> </span>
<template #dropdown> <template #dropdown>
<el-dropdown-menu class="tags-dropdown-menu"> <el-dropdown-menu class="tags-dropdown-menu">
<el-dropdown-item command="refresh"> <el-dropdown-item v-if="!isAffix(selectedDropdownTag)" command="close"><close style="width: 1em; height: 1em;" />关闭当前</el-dropdown-item>
<refresh-right style="width: 1em; height: 1em;" /> 刷新页面 <el-dropdown-item command="closeOthers"><circle-close style="width: 1em; height: 1em;" />关闭其他</el-dropdown-item>
</el-dropdown-item> <el-dropdown-item command="closeLeft" :disabled="isFirstView()"><back style="width: 1em; height: 1em;" />关闭左侧</el-dropdown-item>
<el-dropdown-item v-if="!isAffix(selectedDropdownTag)" command="close"> <el-dropdown-item command="closeRight" :disabled="isLastView()"><right style="width: 1em; height: 1em;" />关闭右侧</el-dropdown-item>
<close style="width: 1em; height: 1em;" /> 关闭当前 <el-dropdown-item command="closeAll"><circle-close style="width: 1em; height: 1em;" />全部关闭</el-dropdown-item>
</el-dropdown-item> <el-dropdown-item command="fullscreen" divided>
<el-dropdown-item command="closeOthers"> <template v-if="!isFullscreen"><full-screen style="width: 1em; height: 1em;" />全屏显示</template>
<circle-close style="width: 1em; height: 1em;" /> 关闭其他 <template v-else><close style="width: 1em; height: 1em;" />退出全屏</template>
</el-dropdown-item>
<el-dropdown-item command="closeLeft" :disabled="isFirstView()">
<back style="width: 1em; height: 1em;" /> 关闭左侧
</el-dropdown-item>
<el-dropdown-item command="closeRight" :disabled="isLastView()">
<right style="width: 1em; height: 1em;" /> 关闭右侧
</el-dropdown-item>
<el-dropdown-item command="closeAll" divided>
<circle-close style="width: 1em; height: 1em;" /> 全部关闭
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</template> </template>
</el-dropdown> </el-dropdown>
<!-- 全屏按钮 --> <!-- 刷新按钮 -->
<span class="tags-action-btn tags-fullscreen-btn" :title="isFullscreen ? '退出全屏' : '全屏'" @click="toggleFullscreen"> <span class="tags-action-btn tags-refresh-btn" title="刷新页面" @click="refreshSelectedTag(selectedDropdownTag)">
<el-icon> <el-icon><refresh-right/></el-icon> 刷新
<full-screen v-if="!isFullscreen" />
<aim v-else />
</el-icon>
</span> </span>
<!-- 右键上下文菜单 --> <!-- 右键上下文菜单 -->
<ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu"> <ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
<li @click="refreshSelectedTag(selectedTag)"> <li @click="refreshSelectedTag(selectedTag)"><refresh-right style="width: 1em; height: 1em;" />刷新页面</li>
<refresh-right style="width: 1em; height: 1em;" /> 刷新页面 <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)"><close style="width: 1em; height: 1em;" />关闭当前</li>
</li> <li @click="closeOthersTags"><circle-close style="width: 1em; height: 1em;" />关闭其他</li>
<li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)"> <li v-if="!isFirstView()" @click="closeLeftTags"><back style="width: 1em; height: 1em;" />关闭左侧</li>
<close style="width: 1em; height: 1em;" /> 关闭当前 <li v-if="!isLastView()" @click="closeRightTags"><right style="width: 1em; height: 1em;" />关闭右侧</li>
</li> <li @click="closeAllTags(selectedTag)"><circle-close style="width: 1em; height: 1em;" />全部关闭</li>
<li @click="closeOthersTags">
<circle-close style="width: 1em; height: 1em;" /> 关闭其他
</li>
<li v-if="!isFirstView()" @click="closeLeftTags">
<back style="width: 1em; height: 1em;" /> 关闭左侧
</li>
<li v-if="!isLastView()" @click="closeRightTags">
<right style="width: 1em; height: 1em;" /> 关闭右侧
</li>
<li @click="closeAllTags(selectedTag)">
<circle-close style="width: 1em; height: 1em;" /> 全部关闭
</li>
</ul> </ul>
</div> </div>
</template> </template>
@@ -108,15 +84,18 @@ const scrollPaneRef = ref(null)
const canScrollLeft = ref(false) const canScrollLeft = ref(false)
const canScrollRight = ref(false) const canScrollRight = ref(false)
const isFullscreen = ref(false) const isFullscreen = ref(false)
const hiddenElements = ref([])
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
const route = useRoute() const route = useRoute()
const router = useRouter() const router = useRouter()
const settingsStore = useSettingsStore()
const visitedViews = computed(() => useTagsViewStore().visitedViews) const visitedViews = computed(() => useTagsViewStore().visitedViews)
const routes = computed(() => usePermissionStore().routes) const routes = computed(() => usePermissionStore().routes)
const theme = computed(() => useSettingsStore().theme) const theme = computed(() => useSettingsStore().theme)
const tagsIcon = computed(() => useSettingsStore().tagsIcon) const tagsIcon = computed(() => useSettingsStore().tagsIcon)
const tagsViewPersist = computed(() => useSettingsStore().tagsViewPersist)
// 下拉菜单针对当前激活的 tag // 下拉菜单针对当前激活的 tag
const selectedDropdownTag = computed(() => visitedViews.value.find(v => isActive(v)) || {}) const selectedDropdownTag = computed(() => visitedViews.value.find(v => isActive(v)) || {})
@@ -142,14 +121,21 @@ onMounted(() => {
initTags() initTags()
addTags() addTags()
window.addEventListener('resize', updateArrowState) window.addEventListener('resize', updateArrowState)
document.addEventListener('fullscreenchange', onFullscreenChange) window.addEventListener('keydown', handleKeyDown)
}) })
onBeforeUnmount(() => { onBeforeUnmount(() => {
window.removeEventListener('resize', updateArrowState) window.removeEventListener('resize', updateArrowState)
document.removeEventListener('fullscreenchange', onFullscreenChange) window.removeEventListener('keydown', handleKeyDown)
}) })
function handleKeyDown(event) {
// 当按下Esc键且处于全屏状态时退出全屏
if (event.key === 'Escape' && isFullscreen.value) {
toggleFullscreen()
}
}
function isActive(r) { function isActive(r) {
return r.path === route.path return r.path === route.path
} }
@@ -207,11 +193,14 @@ function filterAffixTags(routes, basePath = '') {
} }
function initTags() { function initTags() {
if (tagsViewPersist.value) {
useTagsViewStore().loadPersistedViews()
}
const res = filterAffixTags(routes.value) const res = filterAffixTags(routes.value)
affixTags.value = res affixTags.value = res
for (const tag of res) { for (const tag of res) {
if (tag.name) { if (tag.name) {
useTagsViewStore().addVisitedView(tag) useTagsViewStore().addAffixView(tag)
} }
} }
} }
@@ -257,22 +246,34 @@ function updateArrowState() {
} }
function toggleFullscreen() { function toggleFullscreen() {
if (!document.fullscreenElement) { const mainContainer = document.querySelector('.main-container')
const appMain = document.querySelector('.app-main') const navbar = document.querySelector('.navbar')
if (appMain) { const sidebar = document.querySelector('.sidebar-container')
appMain.requestFullscreen() if (!mainContainer) return
}
} else {
document.exitFullscreen()
}
}
function onFullscreenChange() { if (!isFullscreen.value) {
isFullscreen.value = !!document.fullscreenElement mainContainer.classList.add('fullscreen-mode')
const appMain = document.querySelector('.app-main') document.body.style.overflow = 'hidden'
if (appMain) { const elementsToHide = [{ el: navbar, originalDisplay: navbar?.style.display || '' }, { el: sidebar, originalDisplay: sidebar?.style.display || '' }]
appMain.style.backgroundColor = document.fullscreenElement ? '#fff' : '' elementsToHide.forEach(item => {
appMain.style.overflowY = document.fullscreenElement ? 'auto' : '' if (item.el && item.el.style.display !== 'none') {
item.originalDisplay = item.el.style.display
item.el.style.display = 'none'
hiddenElements.value.push(item)
}
})
isFullscreen.value = true
} else {
mainContainer.classList.remove('fullscreen-mode')
document.body.style.overflow = ''
hiddenElements.value.forEach(item => {
if (item.el) {
item.el.style.display = item.originalDisplay
}
})
hiddenElements.value = []
document.querySelector('.tags-action-btn').blur()
isFullscreen.value = false
} }
} }
@@ -281,6 +282,7 @@ function handleDropdownCommand(command) {
selectedTag.value = tag selectedTag.value = tag
switch (command) { switch (command) {
case 'refresh': refreshSelectedTag(tag); break case 'refresh': refreshSelectedTag(tag); break
case 'fullscreen': toggleFullscreen(); break
case 'close': closeSelectedTag(tag); break case 'close': closeSelectedTag(tag); break
case 'closeOthers': closeOthersTags(); break case 'closeOthers': closeOthersTags(); break
case 'closeLeft': closeLeftTags(); break case 'closeLeft': closeLeftTags(); break
@@ -427,6 +429,7 @@ function handleScroll() {
padding: 0 8px; padding: 0 8px;
font-size: 12px; font-size: 12px;
margin-left: 5px; margin-left: 5px;
border-radius: 3px;
&:first-of-type { margin-left: 6px; } &:first-of-type { margin-left: 6px; }
&:last-of-type { margin-right: 15px; } &:last-of-type { margin-right: 15px; }
@@ -479,8 +482,8 @@ function handleScroll() {
} }
} }
.tags-fullscreen-btn { .tags-refresh-btn {
border-left: $divider; width: 60px;
} }
.contextmenu { .contextmenu {
@@ -537,4 +540,41 @@ function handleScroll() {
} }
} }
} }
/* 页签全屏模式样式 */
.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> </style>

View File

@@ -1,5 +1,5 @@
<template> <template>
<div :class="classObj" class="app-wrapper" :style="{ '--current-color': theme }"> <div :class="classObj" class="app-wrapper" :style="{ '--current-color': theme, '--current-color-light': theme + '1a', '--current-color-dark-bg': theme + '33' }">
<div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside"/> <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
<sidebar v-if="!sidebar.hide" class="sidebar-container" /> <sidebar v-if="!sidebar.hide" class="sidebar-container" />
<div :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }" class="main-container"> <div :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }" class="main-container">

View File

@@ -5,6 +5,10 @@ export default {
// 刷新当前tab页签 // 刷新当前tab页签
refreshPage(obj) { refreshPage(obj) {
const { path, query, matched } = router.currentRoute.value const { path, query, matched } = router.currentRoute.value
// 防止在重定向过程中重复刷新
if (path.startsWith('/redirect/')) {
return Promise.resolve()
}
if (obj === undefined) { if (obj === undefined) {
matched.forEach((m) => { matched.forEach((m) => {
if (m.components && m.components.default && m.components.default.name) { if (m.components && m.components.default && m.components.default.name) {

View File

@@ -24,6 +24,11 @@ export default {
*/ */
tagsView: true, tagsView: true,
/**
* 持久化标签页
*/
tagsViewPersist: false,
/** /**
* 显示页签图标 * 显示页签图标
*/ */

View File

@@ -5,7 +5,7 @@ import { useDynamicTitle } from '@/utils/dynamicTitle'
const isDark = useDark() const isDark = useDark()
const toggleDark = useToggle(isDark) const toggleDark = useToggle(isDark)
const { sideTheme, showSettings, navType, tagsView, tagsIcon, fixedHeader, sidebarLogo, dynamicTitle, footerVisible, footerContent } = defaultSettings const { sideTheme, showSettings, navType, tagsView, tagsViewPersist, tagsIcon, fixedHeader, sidebarLogo, dynamicTitle, footerVisible, footerContent } = defaultSettings
const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || '' const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
@@ -19,6 +19,7 @@ const useSettingsStore = defineStore(
showSettings: showSettings, showSettings: showSettings,
navType: storageSetting.navType === undefined ? navType : storageSetting.navType, navType: storageSetting.navType === undefined ? navType : storageSetting.navType,
tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView, tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
tagsViewPersist: storageSetting.tagsViewPersist === undefined ? tagsViewPersist : storageSetting.tagsViewPersist,
tagsIcon: storageSetting.tagsIcon === undefined ? tagsIcon : storageSetting.tagsIcon, tagsIcon: storageSetting.tagsIcon === undefined ? tagsIcon : storageSetting.tagsIcon,
fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader, fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo, sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo,

View File

@@ -1,3 +1,26 @@
import cache from '@/plugins/cache'
import useSettingsStore from '@/store/modules/settings'
const PERSIST_KEY = 'tags-view-visited'
function isPersistEnabled() {
return useSettingsStore().tagsViewPersist
}
function saveVisitedViews(views) {
if (!isPersistEnabled()) return
const toSave = views.filter(v => !(v.meta && v.meta.affix)).map(v => ({ path: v.path, fullPath: v.fullPath, name: v.name, title: v.title, query: v.query, meta: v.meta }))
cache.local.setJSON(PERSIST_KEY, toSave)
}
function loadVisitedViews() {
return cache.local.getJSON(PERSIST_KEY) || []
}
function clearVisitedViews() {
cache.local.remove(PERSIST_KEY)
}
const useTagsViewStore = defineStore( const useTagsViewStore = defineStore(
'tags-view', 'tags-view',
{ {
@@ -26,6 +49,15 @@ const useTagsViewStore = defineStore(
title: view.meta.title || 'no-name' title: view.meta.title || 'no-name'
}) })
) )
saveVisitedViews(this.visitedViews)
},
addAffixView(view) {
if (this.visitedViews.some(v => v.path === view.path)) return
this.visitedViews.unshift(
Object.assign({}, view, {
title: view.meta.title || 'no-name'
})
)
}, },
addCachedView(view) { addCachedView(view) {
if (this.cachedViews.includes(view.name)) return if (this.cachedViews.includes(view.name)) return
@@ -52,6 +84,7 @@ const useTagsViewStore = defineStore(
} }
} }
this.iframeViews = this.iframeViews.filter(item => item.path !== view.path) this.iframeViews = this.iframeViews.filter(item => item.path !== view.path)
saveVisitedViews(this.visitedViews)
resolve([...this.visitedViews]) resolve([...this.visitedViews])
}) })
}, },
@@ -84,6 +117,7 @@ const useTagsViewStore = defineStore(
return v.meta.affix || v.path === view.path return v.meta.affix || v.path === view.path
}) })
this.iframeViews = this.iframeViews.filter(item => item.path === view.path) this.iframeViews = this.iframeViews.filter(item => item.path === view.path)
saveVisitedViews(this.visitedViews)
resolve([...this.visitedViews]) resolve([...this.visitedViews])
}) })
}, },
@@ -113,6 +147,7 @@ const useTagsViewStore = defineStore(
const affixTags = this.visitedViews.filter(tag => tag.meta.affix) const affixTags = this.visitedViews.filter(tag => tag.meta.affix)
this.visitedViews = affixTags this.visitedViews = affixTags
this.iframeViews = [] this.iframeViews = []
clearVisitedViews()
resolve([...this.visitedViews]) resolve([...this.visitedViews])
}) })
}, },
@@ -150,6 +185,7 @@ const useTagsViewStore = defineStore(
} }
return false return false
}) })
saveVisitedViews(this.visitedViews)
resolve([...this.visitedViews]) resolve([...this.visitedViews])
}) })
}, },
@@ -173,8 +209,16 @@ const useTagsViewStore = defineStore(
} }
return false return false
}) })
saveVisitedViews(this.visitedViews)
resolve([...this.visitedViews]) resolve([...this.visitedViews])
}) })
},
// 恢复持久化的 tags
loadPersistedViews() {
const views = loadVisitedViews()
views.forEach(view => {
this.addVisitedView(view)
})
} }
} }
}) })

View File

@@ -114,6 +114,41 @@
</div> </div>
</template> </template>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="v3.9.2 - 2026-03-26">
<ol>
<li>新增锁定屏幕功能</li>
<li>首页新增通知公告消息提醒</li>
<li>添加持久化标签页开关功能</li>
<li>菜单搜索支持文本高亮&数量提示</li>
<li>添加菜单路由地址和名称的校验规则</li>
<li>字典类型列表新增抽屉效果详细信息</li>
<li>升级axios到最新版本0.30.3</li>
<li>使用SpringDoc代替Swagger</li>
<li>升级spring-boot到最新版本4.0.3</li>
<li>升级yauaa到最新版本8.1.0</li>
<li>升级oshi到最新版本6.10.0</li>
<li>升级druid到最新版本1.2.28</li>
<li>升级fastjson到最新版2.0.61</li>
<li>升级pagehelper到最新版2.1.1</li>
<li>优化操作日志详细页面</li>
<li>更新在线IP地址查询url</li>
<li>部门管理支持批量保存排序</li>
<li>菜单管理支持批量保存排序</li>
<li>菜单管理列表新增类型显示</li>
<li>代码生成模板支持TypeScript版本</li>
<li>优化菜单主题风格显示</li>
<li>优化topbar顶部菜单样式</li>
<li>优化点击任务名称查看详细</li>
<li>优化字典类型属性提醒说明</li>
<li>优化防重提交间隔时间可自定义</li>
<li>优化页签功能&支持全屏按钮操作</li>
<li>优化RightToolbar搜索栏切换动画</li>
<li>修复Excel自定义格式样式污染问题</li>
<li>优化isAdmin方法统一到SecurityUtils</li>
<li>优化定时任务详情页展示&补充执行时间字段</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.9.1 - 2025-12-18"> <el-collapse-item title="v3.9.1 - 2025-12-18">
<ol> <ol>
<li>支持防盗链功能</li> <li>支持防盗链功能</li>
@@ -1095,7 +1130,7 @@
</template> </template>
<script setup name="Index"> <script setup name="Index">
const version = ref('3.9.1') const version = ref('3.9.2')
function goTarget(url) { function goTarget(url) {
window.open(url, '__blank') window.open(url, '__blank')

View File

@@ -64,10 +64,19 @@
:default-expand-all="isExpandAll" :default-expand-all="isExpandAll"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
> >
<el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column> <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="220">
<el-table-column prop="icon" label="图标" align="center" width="100">
<template #default="scope"> <template #default="scope">
<svg-icon :icon-class="scope.row.icon" /> <svg-icon :icon-class="scope.row.icon" />
<span class="ml5">{{ scope.row.menuName }}</span>
</template>
</el-table-column>
<el-table-column prop="menuName" label="类型" :show-overflow-tooltip="true" width="100">
<template #default="scope">
<el-tag v-if="scope.row.menuType === 'M' && scope.row.isFrame === '0'" type="danger" size="small">外链</el-tag>
<el-tag v-else-if="scope.row.menuType === 'M'" type="primary" size="small">目录</el-tag>
<el-tag v-else-if="scope.row.menuType === 'C' && scope.row.isFrame === '0'" type="danger" size="small">外链</el-tag>
<el-tag v-else-if="scope.row.menuType === 'C'" type="success" size="small">菜单</el-tag>
<el-tag v-else-if="scope.row.menuType === 'F'" type="warning" size="small">按钮</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="orderNum" label="排序" width="200"> <el-table-column prop="orderNum" label="排序" width="200">
@@ -75,18 +84,13 @@
<el-input-number v-model="scope.row.orderNum" controls-position="right" :min="0" style="width: 88px" /> <el-input-number v-model="scope.row.orderNum" controls-position="right" :min="0" style="width: 88px" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true" />
<el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true" />
<el-table-column prop="status" label="状态" width="80"> <el-table-column prop="status" label="状态" width="80">
<template #default="scope"> <template #default="scope">
<dict-tag :options="sys_normal_disable" :value="scope.row.status" /> <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" width="160" prop="createTime">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="210" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="210" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:menu:edit']">修改</el-button> <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:menu:edit']">修改</el-button>