diff --git a/packages/card/package.json b/packages/card/package.json index 1d81a245cfa4..0583358ee396 100644 --- a/packages/card/package.json +++ b/packages/card/package.json @@ -30,6 +30,7 @@ ], "dependencies": { "@ant-design/icons": "^4.2.1", + "@ant-design/pro-provider": "2.0.13", "@ant-design/pro-utils": "2.2.13", "@babel/runtime": "^7.18.0", "classnames": "^2.2.6", diff --git a/packages/layout/src/components/PageContainer/index.tsx b/packages/layout/src/components/PageContainer/index.tsx index a2ef3c429bc1..6bd98ab75cef 100644 --- a/packages/layout/src/components/PageContainer/index.tsx +++ b/packages/layout/src/components/PageContainer/index.tsx @@ -206,6 +206,7 @@ const memoRenderPageHeader = ( header, prefixedClassName, extraContent, + childrenContentStyle, style, prefixCls, hashId, @@ -289,6 +290,7 @@ const PageContainerBase: React.FC = (props) => { token: propsToken, fixedHeader, breadcrumbRender, + childrenContentStyle, ...restProps } = props; const value = useContext(RouteContext); @@ -344,12 +346,15 @@ const PageContainerBase: React.FC = (props) => { const content = useMemo(() => { return children ? ( <> -
+
{children}
) : null; - }, [children, basePageContainer, hashId]); + }, [children, basePageContainer, childrenContentStyle, hashId]); const renderContentDom = useMemo(() => { // 只要loadingDom非空我们就渲染loadingDom,否则渲染内容 diff --git a/packages/layout/src/components/PageHeader/index.tsx b/packages/layout/src/components/PageHeader/index.tsx index 1b9d90c81ea9..e96903cda35e 100644 --- a/packages/layout/src/components/PageHeader/index.tsx +++ b/packages/layout/src/components/PageHeader/index.tsx @@ -14,6 +14,7 @@ export interface PageHeaderProps { title?: React.ReactNode; subTitle?: React.ReactNode; style?: React.CSSProperties; + childrenContentStyle?: React.CSSProperties; breadcrumb?: BreadcrumbProps | React.ReactElement; breadcrumbRender?: (props: PageHeaderProps, defaultDom: React.ReactNode) => React.ReactNode; tags?: React.ReactElement | React.ReactElement[];