From 4a21fdf5ad56aa09a9c06b20063ea27203267913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=9F=E8=B4=A4?= Date: Mon, 15 Jan 2024 14:51:46 +0800 Subject: [PATCH] fix(layout): fix bgLayout no work error --- packages/layout/src/ProLayout.tsx | 8 +- tests/form/__snapshots__/demo.test.ts.snap | 3 + tests/layout/__snapshots__/demo.test.ts.snap | 120 ++++++++++++++++++ .../layout/__snapshots__/index.test.tsx.snap | 21 +++ .../layout/__snapshots__/mobile.test.tsx.snap | 21 +++ .../__snapshots__/pageContainer.test.tsx.snap | 9 ++ .../pageHeaderWarp.test.tsx.snap | 6 + 7 files changed, 184 insertions(+), 4 deletions(-) diff --git a/packages/layout/src/ProLayout.tsx b/packages/layout/src/ProLayout.tsx index 00be8a67fce4..c07367d70fbf 100644 --- a/packages/layout/src/ProLayout.tsx +++ b/packages/layout/src/ProLayout.tsx @@ -724,9 +724,11 @@ const BaseProLayout: React.FC = (props) => { useDocumentTitle(pageTitleInfo, props.title || false); + const { token } = useContext(ProProvider); + const bgImgStyleList = useMemo(() => { if (bgLayoutImgList && bgLayoutImgList.length > 0) { - return bgLayoutImgList.map((item, index) => { + return bgLayoutImgList?.map((item, index) => { return ( = (props) => { return null; }, [bgLayoutImgList]); - const { token } = useContext(ProProvider); - return wrapSSR( = (props) => { <>{children} ) : (
- {bgImgStyleList ? ( + {bgImgStyleList || token.layout?.bgLayout ? (
diff --git a/tests/form/__snapshots__/demo.test.ts.snap b/tests/form/__snapshots__/demo.test.ts.snap index 31f3016fefee..ed38e82e4c69 100644 --- a/tests/form/__snapshots__/demo.test.ts.snap +++ b/tests/form/__snapshots__/demo.test.ts.snap @@ -49039,6 +49039,9 @@ exports[`form demos > 📸 renders ./packages/form/src/demos/layout-footer.tsx c
+
📸 renders ./packages/layout/src/demos/AlwaysDefaultOp
+
📸 renders ./packages/layout/src/demos/BreadcrumbsRepe
+
📸 renders ./packages/layout/src/demos/DefaultOpenAllM
+
📸 renders ./packages/layout/src/demos/IconFont.tsx co
+
📸 renders ./packages/layout/src/demos/MenuGroup.tsx c
+
📸 renders ./packages/layout/src/demos/MultipleMenuOne
+
📸 renders ./packages/layout/src/demos/Nested.tsx corr
+
📸 renders ./packages/layout/src/demos/Nested.tsx corr
+
📸 renders ./packages/layout/src/demos/TopmenuNested.t
+
📸 renders ./packages/layout/src/demos/TopmenuNested.t
+
📸 renders ./packages/layout/src/demos/antd@4MenuIconF
+
📸 renders ./packages/layout/src/demos/api.tsx correct
+
📸 renders ./packages/layout/src/demos/appList-group.t
+
📸 renders ./packages/layout/src/demos/appList-group-s
+
📸 renders ./packages/layout/src/demos/collapsedShowTi
+
📸 renders ./packages/layout/src/demos/config-provider
+
📸 renders ./packages/layout/src/demos/customize-colla
+
📸 renders ./packages/layout/src/demos/customizeMenu.t
+
📸 renders ./packages/layout/src/demos/dark.tsx correc
+
📸 renders ./packages/layout/src/demos/debug-demo.tsx
+
📸 renders ./packages/layout/src/demos/dynamic-setting
+
📸 renders ./packages/layout/src/demos/dynamicMenu.tsx
+
📸 renders ./packages/layout/src/demos/error-boundarie
+
📸 renders ./packages/layout/src/demos/footer.tsx corr
+
📸 renders ./packages/layout/src/demos/ghost.tsx corre
+
📸 renders ./packages/layout/src/demos/hideMenu.tsx co
+
📸 renders ./packages/layout/src/demos/immersive-navig
+
📸 renders ./packages/layout/src/demos/immersive-navig
+
📸 renders ./packages/layout/src/demos/menu-group.tsx
+
📸 renders ./packages/layout/src/demos/morse_debug.tsx
+
📸 renders ./packages/layout/src/demos/searchMenu.tsx
+
📸 renders ./packages/layout/src/demos/splitMenus.tsx
+
📸 renders ./packages/layout/src/demos/splitMenus.tsx
+
📸 renders ./packages/layout/src/demos/splitMenus.tsx
+
📸 renders ./packages/layout/src/demos/splitMenus.tsx
+
📸 renders ./packages/layout/src/demos/splitMenus.tsx
+
📸 renders ./packages/layout/src/demos/splitMenus.tsx
+
📸 renders ./packages/layout/src/demos/splitMenus.tsx
+
📸 renders ./packages/layout/src/demos/theme.tsx corre
+
📸 renders ./packages/layout/src/demos/top-breadcrumb.
+
🥩 BasicLayout menu support menu.true 1`] = `
+
🥩 BasicLayout menu support menu.true 1`] = `
+
🥩 BasicLayout menu support menu.true 1`] = `
+
🥩 base use 1`] = `
+
🥩 compatibleStyle 1`] = `
+
🥩 contentStyle should change dom 1`] = `
+
🥩 mix layout hideInMenu render right 1`] = `
+
📱 base use 1`] = `
+
📱 collapsed=false 1`] = `
+
📱 layout menuHeaderRender 1`] = `
+
📱 layout menuHeaderRender 2`] = `
+
📱 layout menuHeaderRender=false 1`] = `
+
📱 layout=mix 1`] = `
+
📱 layout=mix and splitMenus 1`] = `
+
🐲 FooterToolbar should know width 1`] = `
+
🐲 footer should know width 1`] = `
+
🐲 pro-layout support breadcrumbProps 1`] = `
+
base use 1`] = `
+
content is text 1`] = `
+