Commit 4d1d8485 authored by Sendya's avatar Sendya

fix(PageContainer): fixedHeader headerHeight undefined.

parent 34437dd4
...@@ -151,6 +151,7 @@ export default defineComponent({ ...@@ -151,6 +151,7 @@ export default defineComponent({
navTheme: 'dark', navTheme: 'dark',
layout: 'side', layout: 'side',
fixSiderbar: true, fixSiderbar: true,
fixedHeader: true,
}); });
const breadcrumb = computed(() => const breadcrumb = computed(() =>
router.currentRoute.value.matched.concat().map(item => { router.currentRoute.value.matched.concat().map(item => {
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
v-bind="state" v-bind="state"
:loading="loading" :loading="loading"
:breadcrumb="{ routes: breadcrumb }" :breadcrumb="{ routes: breadcrumb }"
breakpoint="sm"
> >
<template #menuHeaderRender> <template #menuHeaderRender>
<a> <a>
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
</template> </template>
<span>page-content</span> <span>page-content</span>
<a-button @click="handleClick">Button</a-button> <a-button @click="handleClick">Button</a-button>
<p v-for="item in new Array(20)" :key="item">text block...</p>
</page-container> </page-container>
</template> </template>
......
...@@ -182,6 +182,7 @@ const ProLayout = defineComponent({ ...@@ -182,6 +182,7 @@ const ProLayout = defineComponent({
'disableMobile', 'disableMobile',
'fixSiderbar', 'fixSiderbar',
'fixedHeader', 'fixedHeader',
'headerHeight',
// 'hasSideMenu', // 'hasSideMenu',
// 'hasHeader', // 'hasHeader',
// 'hasFooter', // 'hasFooter',
......
...@@ -275,6 +275,8 @@ const PageContainer = defineComponent({ ...@@ -275,6 +275,8 @@ const PageContainer = defineComponent({
return () => { return () => {
const footer = getPropsSlot(slots, props, 'footer'); const footer = getPropsSlot(slots, props, 'footer');
//
console.log('value.headerHeight', value.headerHeight);
return ( return (
<div class={classNames.value}> <div class={classNames.value}>
{value.fixedHeader ? ( {value.fixedHeader ? (
......
...@@ -64,7 +64,7 @@ export const siderMenuProps = { ...@@ -64,7 +64,7 @@ export const siderMenuProps = {
default: () => undefined, default: () => undefined,
}, },
breakpoint: { breakpoint: {
type: [Object, Boolean] as PropType<SiderProps['breakpoint'] | false>, type: [Object, String, Boolean] as PropType<SiderProps['breakpoint'] | false>,
default: () => false, default: () => false,
}, },
isMobile: PropTypes.bool, isMobile: PropTypes.bool,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment