diff --git a/src/assets/styles/nprogress.scss b/src/assets/styles/nprogress.scss index 83391b36..b3e7a9f9 100755 --- a/src/assets/styles/nprogress.scss +++ b/src/assets/styles/nprogress.scss @@ -5,7 +5,7 @@ position: fixed; top: 0; left: 0; - z-index: 10031; + z-index: 2000; width: 100%; height: 2px; background: rgb(var(--ui-primary)); @@ -26,7 +26,7 @@ position: fixed; top: 11px; right: 14px; - z-index: 10031; + z-index: 2000; display: block; .spinner-icon { diff --git a/src/layouts/components/Topbar/Tabbar/index.vue b/src/layouts/components/Topbar/Tabbar/index.vue index 3d4da8aa..fcbb59e6 100644 --- a/src/layouts/components/Topbar/Tabbar/index.vue +++ b/src/layouts/components/Topbar/Tabbar/index.vue @@ -53,6 +53,7 @@ function tabbarScrollTip() { title: '温馨提示', duration: 5000, closable: true, + zIndex: 2000, }) } } diff --git a/src/layouts/components/views/link.vue b/src/layouts/components/views/link.vue index 4caa31fe..296e6c06 100755 --- a/src/layouts/components/views/link.vue +++ b/src/layouts/components/views/link.vue @@ -10,7 +10,9 @@ const route = useRoute() const { copy, copied } = useClipboard() watch(copied, (val) => { - val && Message.success('复制成功') + val && Message.success('复制成功', { + zIndex: 2000, + }) }) function open() { diff --git a/src/layouts/index.vue b/src/layouts/index.vue index 7f228fa7..f2c6d6bf 100755 --- a/src/layouts/index.vue +++ b/src/layouts/index.vue @@ -159,6 +159,11 @@ const enableAppSetting = import.meta.env.VITE_APP_SETTING === 'true' width: calc(var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width)); box-shadow: -1px 0 0 0 var(--g-border-color), 1px 0 0 0 var(--g-border-color); transition: width 0.3s, transform 0.3s, box-shadow 0.3s, top 0.3s; + + &:has(> .main-sidebar-container.main-sidebar-enter-active), + &:has(> .main-sidebar-container.main-sidebar-leave-active) { + overflow: hidden; + } } .sidebar-mask { diff --git a/src/utils/composables/useTabbar.ts b/src/utils/composables/useTabbar.ts index 6c8af296..b53a00e3 100755 --- a/src/utils/composables/useTabbar.ts +++ b/src/utils/composables/useTabbar.ts @@ -52,11 +52,15 @@ export default function useTabbar() { } } else { - Message.error('当前只有一个标签页,已阻止关闭') + Message.error('当前只有一个标签页,已阻止关闭', { + zIndex: 2000, + }) } } else { - Message.error('关闭的页面不存在') + Message.error('关闭的页面不存在', { + zIndex: 2000, + }) } }