From 904a89f705712007dbf62d134a8cc9d6a090d9ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=9F=E8=B4=A4?= Date: Thu, 31 Aug 2023 20:56:40 +0800 Subject: [PATCH] fix(layout): fix menu title center error --- .../layout/src/components/SiderMenu/BaseMenu.tsx | 13 +++++++++++-- .../layout/src/components/SiderMenu/style/menu.ts | 6 ++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/packages/layout/src/components/SiderMenu/BaseMenu.tsx b/packages/layout/src/components/SiderMenu/BaseMenu.tsx index fb1c1df67a60..44e5e647021c 100644 --- a/packages/layout/src/components/SiderMenu/BaseMenu.tsx +++ b/packages/layout/src/components/SiderMenu/BaseMenu.tsx @@ -236,6 +236,8 @@ class MenuUtil { this.props?.hashId, { [`${baseClassName}-item-title-collapsed`]: collapsed, + [`${baseClassName}-item-title-collapsed-level-${level}`]: + collapsed, [`${baseClassName}-group-item-title`]: menuType === 'group', [`${baseClassName}-item-collapsed-show-title`]: menu?.collapsedShowTitle && collapsed, @@ -379,6 +381,7 @@ class MenuUtil { this.props?.hashId, { [`${baseClassName}-item-title-collapsed`]: collapsed, + [`${baseClassName}-item-title-collapsed-level-${level}`]: collapsed, [`${baseClassName}-item-collapsed-show-title`]: menu?.collapsedShowTitle && collapsed, }, @@ -421,6 +424,8 @@ class MenuUtil { this.props?.hashId, { [`${baseClassName}-item-title-collapsed`]: collapsed, + [`${baseClassName}-item-title-collapsed-level-${level}`]: + collapsed, [`${baseClassName}-item-link`]: true, [`${baseClassName}-item-collapsed-show-title`]: menu?.collapsedShowTitle && collapsed, @@ -460,7 +465,7 @@ class MenuUtil { onClick: () => onCollapse && onCollapse(true), children: undefined, }; - return ( + return level === 0 ? ( {menuItemRender(renderItemProps, defaultItem, this.props)} + ) : ( + menuItemRender(renderItemProps, defaultItem, this.props) ); } - return ( + return level === 0 ? ( {defaultItem} + ) : ( + defaultItem ); }; diff --git a/packages/layout/src/components/SiderMenu/style/menu.ts b/packages/layout/src/components/SiderMenu/style/menu.ts index dde01c70aee4..6bfb010bb030 100644 --- a/packages/layout/src/components/SiderMenu/style/menu.ts +++ b/packages/layout/src/components/SiderMenu/style/menu.ts @@ -75,8 +75,6 @@ const genProLayoutBaseMenuStyle: GenerateStyle = ( whiteSpace: 'nowrap', }, '&-collapsed': { - flexDirection: 'column', - justifyContent: 'center', minWidth: 40, height: 40, [`${token.componentCls}-item-icon`]: { @@ -93,6 +91,10 @@ const genProLayoutBaseMenuStyle: GenerateStyle = ( display: 'none !important', }, }, + '&-collapsed-level-0': { + flexDirection: 'column', + justifyContent: 'center', + }, [`&${token.componentCls}-group-item-title`]: { gap: token.marginXS, height: 18,