fix:GlobalHeader not show; GlobalLayout#content minHeight not correct

master
chenghx 7 years ago
parent 14f2012270
commit fa7478b01b
  1. 6
      src/components/layout/GlobalLayout.vue

@ -10,12 +10,12 @@
<i-menu :collapsed="collapsed" :menuData="menuData" /> <i-menu :collapsed="collapsed" :menuData="menuData" />
</a-layout-sider> </a-layout-sider>
<a-layout> <a-layout>
<gloabl-header :collapsed="collapsed" @toggleCollapse="toggleCollapse"/> <global-header :collapsed="collapsed" @toggleCollapse="toggleCollapse"/>
<a-layout-content :style="{minHeight: minHeight, margin: '24px 24px 0'}"> <a-layout-content :style="{minHeight: minHeight, margin: '24px 24px 0'}">
<slot></slot> <slot></slot>
</a-layout-content> </a-layout-content>
<a-layout-footer style="padding: 0px"> <a-layout-footer style="padding: 0px">
<gloabl-footer /> <global-footer />
</a-layout-footer> </a-layout-footer>
</a-layout> </a-layout>
</a-layout> </a-layout>
@ -32,7 +32,7 @@ const ALayoutSider = ALayout.Sider
const ALayoutHeader = ALayout.Header const ALayoutHeader = ALayout.Header
const ALayoutContent = ALayout.Content const ALayoutContent = ALayout.Content
const ALayoutFooter = ALayout.Footer const ALayoutFooter = ALayout.Footer
const minHeight = window.innerHeight - 64 - 48 const minHeight = window.innerHeight - 64 - 24 - 122
let menuData = [] let menuData = []

Loading…
Cancel
Save