diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 6d3e0a6..17df5af 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -52,6 +52,14 @@ function addIframe() { position: relative; overflow: hidden; padding: 12px; + + &:fullscreen, + &:-webkit-full-screen, + &:-moz-full-screen, + &:-ms-fullscreen { + background: var(--el-bg-color); + overflow-y: auto; + } } .app-main.with-fixed-header { diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue index d60b24b..3bca22f 100644 --- a/src/layout/components/Settings/index.vue +++ b/src/layout/components/Settings/index.vue @@ -42,7 +42,7 @@ dark
- light
-
+
+ 持久化标签页 + + + +
+
显示页签图标 @@ -161,19 +168,19 @@ const toggleDark = () => useToggle(isDark); /** 菜单导航设置 */ watch( - () => navType, - (val: string) => { - if (val.value === NavTypeEnum.TOP) { + navType, + (val) => { + if (val === NavTypeEnum.TOP) { appStore.toggleSideBarHide(true); permissionStore.setSidebarRouters(permissionStore.defaultRoutes as any); - } else if (val.value === NavTypeEnum.LEFT) { + } else if (val === NavTypeEnum.LEFT) { appStore.toggleSideBarHide(false); permissionStore.setSidebarRouters(permissionStore.defaultRoutes as any); - } else if (val.value === NavTypeEnum.MIX) { + } else if (val === NavTypeEnum.MIX) { appStore.toggleSideBarHide(false); } }, - { immediate: true, deep: true } + { immediate: true } ); const handleNavType = (val: NavTypeEnum) => { @@ -202,7 +209,11 @@ const handleTheme = (val: string) => { const saveSetting = () => { proxy?.$modal.loading('正在保存到本地,请稍候...'); const settings = useStorage('layout-setting', defaultSettings); + if (!storeSettings.value.tagsViewPersist) { + localStorage.removeItem('tags-view-visited'); + } settings.value.tagsView = storeSettings.value.tagsView; + settings.value.tagsViewPersist = storeSettings.value.tagsViewPersist; settings.value.tagsIcon = storeSettings.value.tagsIcon; settings.value.fixedHeader = storeSettings.value.fixedHeader; settings.value.sidebarLogo = storeSettings.value.sidebarLogo; @@ -216,6 +227,7 @@ const saveSetting = () => { }; const resetSetting = () => { proxy?.$modal.loading('正在清除设置缓存并刷新,请稍候...'); + localStorage.removeItem('tags-view-visited'); useStorage('layout-setting', null).value = null; setTimeout('window.location.reload()', 1000); }; diff --git a/src/layout/components/TagsView/ScrollPane.vue b/src/layout/components/TagsView/ScrollPane.vue index e24f5ec..8c64c68 100644 --- a/src/layout/components/TagsView/ScrollPane.vue +++ b/src/layout/components/TagsView/ScrollPane.vue @@ -5,84 +5,127 @@ @@ -92,11 +135,15 @@ defineExpose({ position: relative; overflow: hidden; width: 100%; + :deep(.el-scrollbar__bar) { - bottom: 0px; + bottom: 0; } + :deep(.el-scrollbar__wrap) { - height: 49px; + height: 34px; + display: flex; + align-items: center; } } diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index 92c52a3..8fed762 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -1,63 +1,115 @@