|
@@ -23,13 +23,13 @@
|
|
|
</template>
|
|
|
|
|
|
<a-layout :class="[layoutMode, `content-width-${contentWidth}`]"
|
|
|
- :style="{ paddingLeft: fixSiderbar && isDesktop() ? `${sidebarOpened ? 200 : 80}px` : '0' }">
|
|
|
+ :style="{ paddingLeft: fixSiderbar && isDesktop() ? `${sidebarOpened ? 228 : 80}px` : '0' }">
|
|
|
<!-- layout header -->
|
|
|
<global-header :mode="layoutMode" :menus="menus" :theme="navTheme" :collapsed="collapsed" :device="device"
|
|
|
@toggle="toggle" @updateMenuTitle="handleUpdateMenuTitle" />
|
|
|
|
|
|
<!-- layout content -->
|
|
|
- <a-layout-content :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' }">
|
|
|
+ <a-layout-content :style="{ height: 'calc(100vh - '+fixedHeader ? '59px' : '0'+'px)', paddingTop: fixedHeader ? '59px' : '0', overflow: 'hidden' }">
|
|
|
<slot>
|
|
|
|
|
|
</slot>
|
|
@@ -209,7 +209,7 @@
|
|
|
<style lang="less">
|
|
|
body {
|
|
|
// 打开滚动条固定显示
|
|
|
- overflow-y: scroll;
|
|
|
+ //overflow-y: scroll;
|
|
|
|
|
|
&.colorWeak {
|
|
|
filter: invert(80%);
|