初始化

初始化项目

web/src/components/Layout.tsx

@@ -3,17 +3,36 @@ import { useLocation, useNavigate } from 'react-router-dom'
 import { useAuthStore } from '../stores/auth'
 import { usePlayProfileStore } from '../stores/playProfile'
 import {
-  LayoutFrameFooter,
   LayoutHeader,
   LayoutSidebars,
   LayoutWorkspace,
 } from './LayoutSections'
-import { useLayoutSearch } from './useLayoutSearch'
 import { useLayoutPermissions } from './useLayoutPermissions'
 import { useLayoutProfiles } from './useLayoutProfiles'
 import { useLayoutSidebar } from './useLayoutSidebar'
 import { useThemeMode } from './useThemeMode'
 
+function isMediaView(pathname: string, search: string): boolean {
+  const params = new URLSearchParams(search)
+  // 从设置/管理后台菜单进入（携带 from=admin 或 from=settings 或 manage=1）时展示左侧栏
+  if (params.get('from') === 'admin' || params.get('from') === 'settings' || params.get('manage') === '1') {
+    return false
+  }
+
+  return (
+    pathname === '/' ||
+    pathname === '/libraries' ||
+    pathname.startsWith('/library') ||
+    pathname.startsWith('/media') ||
+    pathname.startsWith('/play') ||
+    pathname === '/favourites' ||
+    pathname === '/playlists' ||
+    pathname.startsWith('/playlist') ||
+    pathname === '/history' ||
+    pathname === '/poster-wall'
+  )
+}
+
 export function Layout() {
   const navigate = useNavigate()
   const location = useLocation()
@@ -22,11 +41,6 @@ export function Layout() {
   const activeProfileId = usePlayProfileStore((s) => s.activeProfileId)
   const setActiveProfile = usePlayProfileStore((s) => s.setActiveProfile)
   const theme = useThemeMode()
-  const search = useLayoutSearch({
-    pathname: location.pathname,
-    locationSearch: location.search,
-    navigate,
-  })
   const permissions = useLayoutPermissions(user)
   const sidebar = useLayoutSidebar(location.pathname)
   const profile = useLayoutProfiles({ activeProfileId, setActiveProfile, user })
@@ -34,18 +48,19 @@ export function Layout() {
   const handleLogout = () => { logout(); navigate('/login') }
   const closeProfileAndLogout = () => { profile.setIsProfileOpen(false); handleLogout() }
 
+  const showSidebar = !isMediaView(location.pathname, location.search)
+  const hideSearch = location.pathname.startsWith('/settings')
+
   return (
     <div className="flex h-screen w-screen overflow-hidden bg-[var(--app-bg)] text-[var(--app-text)] font-body select-none">
       <LayoutSidebars
         sidebar={sidebar}
         isAdmin={permissions.isAdmin}
-        username={user?.username}
         can={permissions.can}
-        onLogout={handleLogout}
+        showSidebar={showSidebar}
       />
       <div className="flex flex-1 flex-col min-w-0 overflow-hidden">
         <LayoutHeader
-          search={search}
           permissions={permissions}
           theme={theme}
           onOpenMobileDrawer={() => sidebar.setIsMobileDrawerOpen(true)}
@@ -53,9 +68,10 @@ export function Layout() {
           activeProfileId={activeProfileId}
           profile={profile}
           onLogout={closeProfileAndLogout}
+          showSidebar={showSidebar}
+          hideSearch={hideSearch}
         />
         <LayoutWorkspace routeKey={location.pathname} />
-        <LayoutFrameFooter />
       </div>
     </div>
   )