container.content
diff --git a/packages/pro-layout/package.json b/packages/pro-layout/package.json
index 5f616381..f79c0c5e 100644
--- a/packages/pro-layout/package.json
+++ b/packages/pro-layout/package.json
@@ -1,6 +1,6 @@
{
"name": "@ant-design-vue/pro-layout",
- "version": "3.2.1",
+ "version": "3.2.2",
"scripts": {
"dev": "vite",
"build": "vue-tsc --noEmit && vite build",
diff --git a/packages/pro-layout/src/BasicLayout.tsx b/packages/pro-layout/src/BasicLayout.tsx
index 597c432d..7b61e77d 100644
--- a/packages/pro-layout/src/BasicLayout.tsx
+++ b/packages/pro-layout/src/BasicLayout.tsx
@@ -227,6 +227,7 @@ const ProLayout = defineComponent({
'disableMobile',
'fixSiderbar',
'fixedHeader',
+ 'headerHeight',
// 'hasSideMenu',
// 'hasHeader',
// 'hasFooter',
@@ -238,6 +239,7 @@ const ProLayout = defineComponent({
breadcrumb,
flatMenuData,
hasSide,
+ hasHeader: true,
flatMenu: hasFlatMenu,
});
provide(routeContextInjectKey, routeContext);
@@ -292,6 +294,8 @@ const ProLayout = defineComponent({
)
);
+ routeContext.hasHeader = !!headerDom.value;
+
const contentClassName = computed(() => {
return {
[`${baseClassName.value}-content`]: true,
diff --git a/packages/pro-layout/src/components/PageContainer/index.tsx b/packages/pro-layout/src/components/PageContainer/index.tsx
index 9ea24065..1fead417 100644
--- a/packages/pro-layout/src/components/PageContainer/index.tsx
+++ b/packages/pro-layout/src/components/PageContainer/index.tsx
@@ -188,6 +188,7 @@ const ProPageHeader: FunctionalComponent
{
const { fixedHeader } = props;
const footer = getSlot(slots, props, 'footer');
-
return (
{fixedHeader && headerDom.value ? (
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1302e46d..3141da13 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -54,7 +54,7 @@ importers:
'@vue/eslint-config-typescript': ^10.0.0
'@vue/test-utils': ^2.0.0-rc.20
'@vue/tsconfig': ^0.1.3
- ant-design-vue: ^3.1.1
+ ant-design-vue: ^3.2.0
eslint: ^8.13.0
eslint-plugin-prettier: ^4.0.0
eslint-plugin-vue: ^8.6.0
@@ -70,7 +70,7 @@ importers:
vue-tsc: ^0.34.7
dependencies:
'@ant-design/icons-vue': 6.1.0_vue@3.2.33
- ant-design-vue: 3.1.1_vue@3.2.33
+ ant-design-vue: 3.2.0_vue@3.2.33
omit.js: 2.0.2
vue: 3.2.33
vue-router: 4.0.14_vue@3.2.33
@@ -1090,8 +1090,8 @@ packages:
color-convert: 2.0.1
dev: true
- /ant-design-vue/3.1.1_vue@3.2.33:
- resolution: {integrity: sha512-QcnESmPllfyPy4SavOlf1jml/bdmzCIcCgYWRwl0WKG5jbuuOQ0vhgfUCC2rI6R+84gb/qf4/0qoZnWcEyQziA==}
+ /ant-design-vue/3.2.0_vue@3.2.33:
+ resolution: {integrity: sha512-qY9f/kF9YqfzV/vJ9/GKj7s1wmpCuNwWVRyQ3qsG8P4Was/u5WTKG5hz9huUY/cNle2nBTDacvMBIOkfxPeUiQ==}
peerDependencies:
vue: '>=3.2.0'
dependencies: