优化前端用户信息显示

AIDotNet · Nov 17, 2024 · 8f63b62 · 8f63b62
1 parent 1af619a
commit 8f63b62
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 16 deletions.
diff --git a/web/src/admin/_layout/Desktop/index.tsx b/web/src/admin/_layout/Desktop/index.tsx
@@ -3,11 +3,12 @@ import { memo } from "react";
 import { Outlet } from "react-router-dom";
 import { Layout, Menu, theme } from 'antd';
 import './index.css'
-import { Logo } from "@lobehub/ui";
+import { Header, Logo } from "@lobehub/ui";
 import { Package, User, Gauge, ChartCandlestick, Settings } from 'lucide-react'
 import { useNavigate, useLocation } from "react-router-dom";
 import React from "react";
-const { Header, Content, Footer, Sider } = Layout;
+import Avatar from "./Avatar";
+const { Content, Footer, Sider } = Layout;
 
 const DesktopLayout = memo(() => {
     const navigate = useNavigate();
@@ -33,17 +34,15 @@ const DesktopLayout = memo(() => {
                 console.log(collapsed, type);
             }}
         >
-            <div>
-                <div
-                    className="logo"
-                    style={{
-                        height: '32px',
-                        background: 'rgba(255, 255, 255, 0.2)',
-                        margin: '16px',
-                    }}
-                >
-                    <Logo size={35} extra="NuGet Next" />
-                </div>
+            <div
+                style={{
+                    height: '32px',
+                    margin: '16px',
+                    background: borderRadiusLG,
+
+                }}
+            >
+                <Logo size={35} extra="NuGet Next" />
             </div>
             <Menu mode="inline"
                 defaultSelectedKeys={[selectedKey]}
@@ -93,7 +92,11 @@ const DesktopLayout = memo(() => {
                 ]} />
         </Sider>
         <Layout>
-            <Header style={{ padding: 0, background: colorBgContainer }} />
+            <Header
+                actions={<>
+                    <Avatar />
+                </>}
+                style={{ padding: 0, background: colorBgContainer }} />
             <Content style={{ margin: '24px 16px 0' }}>
                 <div
                     style={{

diff --git a/web/src/features/User/UserPanel/useMenu.tsx b/web/src/features/User/UserPanel/useMenu.tsx
@@ -16,6 +16,7 @@ import { DOCUMENTS, EMAIL_SUPPORT, GITHUB_ISSUES, mailTo } from '@/const/url';
 import { useQueryRoute } from '@/hooks/useQueryRoute';
 import { useUserStore } from '@/store/user';
 import { authSelectors } from '@/store/user/selectors';
+import { useLocation } from 'react-router-dom';
 
 export const useMenu = () => {
   const router = useQueryRoute();
@@ -25,6 +26,7 @@ export const useMenu = () => {
     s.logout,
     s.user,
   ]);
+  const location = useLocation();
 
   function downloadNugetConfig() {
 
@@ -114,9 +116,17 @@ export const useMenu = () => {
       {
         icon: <Icon icon={AppWindow} />,
         key: 'admin',
-        label: '管理',
+        label: location.pathname.includes('/admin') ? '首页' : '控制面板',
         onClick: () => {
-          router.push('/admin');
+          if (!location.pathname.includes('/admin')) {
+            router.push('/admin', {
+              replace: true,
+            });
+          } else {
+            router.push('/', {
+              replace: true,
+            });
+          }
         },
       },
     ] : [