diff --git a/web/src/routes/Main/Navbar/GroupNav.tsx b/web/src/routes/Main/Navbar/GroupNav.tsx index 073fa7c7..c0e50b4d 100644 --- a/web/src/routes/Main/Navbar/GroupNav.tsx +++ b/web/src/routes/Main/Navbar/GroupNav.tsx @@ -26,7 +26,11 @@ export const GroupNav: React.FC = React.memo(() => { {Array.isArray(groups) && groups.map((group) => (
- + void; }> = React.memo((props) => { - const { name, className, to } = props; + const { name, className, to, showPill = false } = props; const location = useLocation(); const isActive = typeof to === 'string' && location.pathname.startsWith(to); - const inner = ( + let inner = ( {name}
} placement="right" >
{inner}; + inner = {inner}; } - return inner; + return ( +
+ {showPill && ( +
+ +
+ )} + {inner} +
+ ); }); NavbarNavItem.displayName = 'NavbarNavItem'; diff --git a/web/src/routes/Main/Navbar/index.tsx b/web/src/routes/Main/Navbar/index.tsx index b0159aae..02a79a28 100644 --- a/web/src/routes/Main/Navbar/index.tsx +++ b/web/src/routes/Main/Navbar/index.tsx @@ -5,6 +5,7 @@ import { NavbarNavItem } from './NavItem'; import { GroupNav } from './GroupNav'; import { MobileMenuBtn } from './MobileMenuBtn'; import { SettingBtn } from './SettingBtn'; +import { Divider } from 'antd'; /** * 导航栏组件 @@ -13,12 +14,12 @@ export const Navbar: React.FC = React.memo(() => { const userInfo = useAppSelector((state) => state.user.info); return ( -
+
{/* Navbar */} -
- +
+ { src={userInfo?.avatar} /> -
+ +
+ +
diff --git a/web/tailwind.config.js b/web/tailwind.config.js index d7a14950..4df894c5 100644 --- a/web/tailwind.config.js +++ b/web/tailwind.config.js @@ -77,6 +77,7 @@ module.exports = { display: ['group-hover'], borderRadius: ['hover'], borderWidth: ['last'], + height: ['group-hover'], }, }, plugins: [tailchat],