Commit 1eb4eba0 authored by Sendya's avatar Sendya Committed by 言肆

fix: loss headerHeight

parent 49bf02d3
...@@ -117,6 +117,48 @@ export default defineComponent({ ...@@ -117,6 +117,48 @@ export default defineComponent({
}} */ }} */
> >
<pre>{JSON.stringify(route.meta, null, 4)}</pre> <pre>{JSON.stringify(route.meta, null, 4)}</pre>
<p>
<p>block</p>
...
<br />
long text..
</p>
<p>
<p>block</p>
...
<br />
long text..
</p>
<p>
<p>block</p>
...
<br />
long text..
</p>
<p>
<p>block</p>
...
<br />
long text..
</p>
<p>
<p>block</p>
...
<br />
long text..
</p>
<p>
<p>block</p>
...
<br />
long text..
</p>
<p>
<p>block</p>
...
<br />
long text..
</p>
</PageContainer> </PageContainer>
); );
}, },
......
...@@ -71,7 +71,7 @@ const BasicLayout = defineComponent({ ...@@ -71,7 +71,7 @@ const BasicLayout = defineComponent({
watch(route, () => { watch(route, () => {
updateSelectedMenu(); updateSelectedMenu();
updateOpenKeys(); updateOpenKeys();
}) });
}); });
return () => ( return () => (
...@@ -145,9 +145,8 @@ const BasicLayout = defineComponent({ ...@@ -145,9 +145,8 @@ const BasicLayout = defineComponent({
routes: breadcrumb.value, routes: breadcrumb.value,
}} }}
> >
<WaterMark content="Pro Layout"> <router-view />
<router-view />
</WaterMark>
<FooterToolbar> <FooterToolbar>
<Space> <Space>
<Button <Button
......
...@@ -72,10 +72,11 @@ ...@@ -72,10 +72,11 @@
}, },
"dependencies": { "dependencies": {
"@babel/runtime": "^7.11.2", "@babel/runtime": "^7.11.2",
"ant-design-vue": "^2.2.0-beta.3", "ant-design-vue": "^2.2.0-rc.1",
"core-js": "^3.9.1", "core-js": "^3.9.1",
"lodash-es": "^4.17.20", "lodash-es": "^4.17.20",
"omit.js": "^2.0.2", "omit.js": "^2.0.2",
"vue": "^3.1.0",
"vue-types": "^3.0.1" "vue-types": "^3.0.1"
}, },
"files": [ "files": [
......
...@@ -189,6 +189,7 @@ const ProLayout = defineComponent({ ...@@ -189,6 +189,7 @@ const ProLayout = defineComponent({
fixedHeader: refProps.fixSiderbar, fixedHeader: refProps.fixSiderbar,
fixSiderbar: refProps.fixSiderbar, fixSiderbar: refProps.fixSiderbar,
sideWidth: siderWidth, sideWidth: siderWidth,
headerHeight: refProps.headerHeight,
hasFooterToolbar: false, hasFooterToolbar: false,
menuData: refProps.menuData, menuData: refProps.menuData,
selectedKeys: refProps.selectedKeys, selectedKeys: refProps.selectedKeys,
......
...@@ -314,5 +314,5 @@ const PageContainer = defineComponent({ ...@@ -314,5 +314,5 @@ const PageContainer = defineComponent({
); );
}, },
}); });
// <WaterMark content="Pro Layout"></WaterMark>
export default withInstall(PageContainer); export default withInstall(PageContainer);
...@@ -45,6 +45,7 @@ export interface RouteContextProps extends Partial<PureSettings>, MenuState { ...@@ -45,6 +45,7 @@ export interface RouteContextProps extends Partial<PureSettings>, MenuState {
hasSideMenu?: boolean; hasSideMenu?: boolean;
hasHeader?: boolean; hasHeader?: boolean;
sideWidth?: number; sideWidth?: number;
headerHeight?: number;
hasFooterToolbar?: boolean; hasFooterToolbar?: boolean;
hasFooter?: boolean; hasFooter?: boolean;
setHasFooterToolbar?: (bool: boolean) => void; setHasFooterToolbar?: (bool: boolean) => void;
......
This diff is collapsed.
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