github
/
halo-admin
mirror of https://github.com/halo-dev/halo-admin
1
0
Fork 0
Code Issues Releases Wiki Activity

[release-2.2] fix: menu scroll bar is blocked (#855) 

This is an automated cherry-pick of #845

/assign ruibaby

```release-note
完整显示左侧菜单栏滚动条
```
pull/856/head
Halo Dev Bot 2023-02-15 14:06:11 +08:00 committed by GitHub
parent 996eac806b
commit 11e08762a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 97 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/layouts/BasicLayout.vue
View File

@ -187,7 +187,9 @@ onMounted(generateMenus);
<template> <template>
<div class="flex h-full"> <div class="flex h-full">
<aside class="navbar fixed hidden h-full overflow-y-auto md:block"> <aside
class="navbar fixed hidden h-full overflow-y-auto md:flex md:flex-col"
>
<div class="logo flex justify-center pt-5 pb-7"> <div class="logo flex justify-center pt-5 pb-7">
<a href="/" target="_blank" title="访问首页"> <a href="/" target="_blank" title="访问首页">
<IconLogo <IconLogo
@ -195,6 +197,7 @@ onMounted(generateMenus);
/> />
</a> </a>
</div> </div>
<div class="flex-1 overflow-y-auto">
<div class="px-3"> <div class="px-3">
<div <div
class="flex cursor-pointer items-center rounded bg-gray-100 p-2 text-gray-400 transition-all hover:text-gray-900" class="flex cursor-pointer items-center rounded bg-gray-100 p-2 text-gray-400 transition-all hover:text-gray-900"
@ -210,6 +213,8 @@ onMounted(generateMenus);
</div> </div>
</div> </div>
<RoutesMenu :menus="menus" /> <RoutesMenu :menus="menus" />
</div>
<div class="profile-placeholder">
<div class="current-profile"> <div class="current-profile">
<div v-if="userStore.currentUser?.spec.avatar" class="profile-avatar"> <div v-if="userStore.currentUser?.spec.avatar" class="profile-avatar">
<VAvatar <VAvatar
@ -263,6 +268,7 @@ onMounted(generateMenus);
</template> </template>
</FloatingDropdown> </FloatingDropdown>
</div> </div>
</div>
</aside> </aside>
<main class="content w-full overflow-y-auto pb-12 mb-safe md:pb-0"> <main class="content w-full overflow-y-auto pb-12 mb-safe md:pb-0">
@ -368,7 +374,9 @@ onMounted(generateMenus);
@apply bg-white; @apply bg-white;
z-index: 999; z-index: 999;
box-shadow: 0 4px 4px #f6c6ce; box-shadow: 0 4px 4px #f6c6ce;
padding-bottom: 70px;
.profile-placeholder {
height: 70px;
.current-profile { .current-profile {
height: 70px; height: 70px;
@ -397,6 +405,7 @@ onMounted(generateMenus);
} }
} }
} }
}
.content { .content {
@apply ml-0 @apply ml-0