wayne/happy-export
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(layout): 顶栏横跨整宽并压在侧边栏之上，侧栏去标题、按钮移到工作台右侧

Browse Source 
- App.jsx: 新增 .app-shell / .app-body 两层结构，GlobalHeader 提到侧边栏之前；
  inert 上移到 .app-shell，行为不变
- 侧边栏删除带 happy出口通 的 .sidebar-header（logo 与名字统一交给顶栏，且更大）
- 折叠/展开按钮从侧栏标题栏移到「工作台」右侧（.sidebar-top），收起时自动落到工作台下方
- 新增 --header-height 变量（80px，≤680px 时 62px），顶栏 min-height 与侧栏 sticky top/
  height、route-content min-height 全部据此计算
- 移除已失效的 .sidebar-header 规则（含 ≤900px 媒体查询）
This commit is contained in:
Drsakura
2026-09-10 17:04:05 +08:00
parent 47f6214056
commit d650ff9c4d
5 changed files with 123 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/App.jsx
+92 -86
View File
@@ -86,6 +86,8 @@ function App() {
}, [reducedMotion])
const navClass = ({ isActive }) => `nav-item${isActive ? ' active' : ''}`
/* 工作台额外带一个类，供「展开/收起导航按钮挂在它右侧」定位 */
const homeNavClass = ({ isActive }) => `nav-item nav-item-home${isActive ? ' active' : ''}`
const toggleGroup = React.useCallback((id) => {
setCollapsedGroups(current => current.includes(id) ? current.filter(x => x !== id) : [...current, id])
@@ -94,94 +96,98 @@ function App() {
return (
<Router>
<div className="app-container">
<aside inert={settingsOpen || assistantOpen ? "" : undefined} className={`sidebar ${collapsed ? 'collapsed' : ''}`}>
<div className="sidebar-header">
<h1>{collapsed ? 'HET' : 'happy出口通'}</h1>
<button
onClick={() => setCollapsed(!collapsed)}
className="collapse-btn"
aria-label={collapsed ? '展开导航' : '收起导航'}
title={collapsed ? '展开导航' : '收起导航'}
>
<SidebarLayoutIcon size={20} />
</button>
</div>
<nav className="sidebar-nav">
{/* 工作台：独立置顶，不属于任何分组 */}
<NavLink aria-label="工作台" title="工作台" to="/" end className={navClass}>
<span className="icon"><DashboardIcon size={18} /></span>
{!collapsed && <span>工作台</span>}
</NavLink>
{NAV_GROUPS.map(group => {
/* 侧栏整体收起时忽略分组的折叠状态，保证图标仍可点 */
const open = collapsed || !collapsedGroups.includes(group.id)
return (
<div className="nav-group" key={group.id}>
<div className="nav-group-header">
<span className="nav-group-title">{group.title}</span>
{!collapsed && (
<button
type="button"
className={`nav-group-toggle${open ? ' open' : ''}`}
onClick={() => toggleGroup(group.id)}
aria-expanded={open}
aria-label={`${open ? '收起' : '展开'}${group.title}`}
title={`${open ? '收起' : '展开'}${group.title}`}
>
<ChevronDownIcon size={14} />
</button>
)}
</div>
{open && group.items.map(item => {
const ItemIcon = item.icon
return (
<NavLink key={item.to} aria-label={item.label} title={item.label} to={item.to} className={navClass}>
<span className="icon"><ItemIcon size={18} /></span>
{!collapsed && <span>{item.label}</span>}
</NavLink>
)
})}
</div>
)
})}
</nav>
<div className="sidebar-footer">
<div className="user-info">管理员</div>
<button
className="theme-toggle-btn"
onClick={() => setTheme(current => current === 'light' ? 'dark' : 'light')}
title={theme === 'light' ? '切换至夜间模式' : '切换至日间模式'}
aria-label={theme === 'light' ? '切换至夜间模式' : '切换至日间模式'}
>
{theme === 'light' ? <MoonIcon size={18} /> : <SunIcon size={18} />}
</button>
<button className="settings-btn" onClick={() => setSettingsOpen(true)} title="设置" aria-label="设置">
<TuneIcon size={18} />
</button>
</div>
</aside>
<main inert={settingsOpen || assistantOpen ? "" : undefined} className="main-content">
<div className="app-shell" inert={settingsOpen || assistantOpen ? "" : undefined}>
{/* 顶栏横跨整宽，压在侧边栏之上 */}
<GlobalHeader onOpenAssistant={() => setAssistantOpen(true)} />
<div className="route-content">
<Routes>
<Route path="/" element={<Dashboard />} />
<Route path="/quotes" element={<QuoteManagement />} />
<Route path="/pi-contracts" element={<PiContractManagement />} />
<Route path="/purchase-orders" element={<PurchaseOrderManagement />} />
<Route path="/products" element={<ProductManagement />} />
<Route path="/suppliers" element={<SupplierManagement />} />
<Route path="/procurement/import" element={<EmbeddedSku view="import" />} />
<Route path="/customers" element={<CustomerManagement />} />
<Route path="/orders" element={<OrderManagement />} />
<Route path="/prospects" element={<ProspectManagement />} />
<Route path="*" element={<Navigate to="/" replace />} />
</Routes>
<div className="app-body">
<aside className={`sidebar ${collapsed ? 'collapsed' : ''}`}>
{/* 工作台置顶；展开/收起导航按钮挂在它右侧 */}
<div className="sidebar-top">
<NavLink aria-label="工作台" title="工作台" to="/" end className={homeNavClass}>
<span className="icon"><DashboardIcon size={18} /></span>
{!collapsed && <span>工作台</span>}
</NavLink>
<button
onClick={() => setCollapsed(!collapsed)}
className="collapse-btn"
aria-label={collapsed ? '展开导航' : '收起导航'}
title={collapsed ? '展开导航' : '收起导航'}
>
<SidebarLayoutIcon size={18} />
</button>
</div>
<nav className="sidebar-nav">
{NAV_GROUPS.map(group => {
/* 侧栏整体收起时忽略分组的折叠状态，保证图标仍可点 */
const open = collapsed || !collapsedGroups.includes(group.id)
return (
<div className="nav-group" key={group.id}>
<div className="nav-group-header">
<span className="nav-group-title">{group.title}</span>
{!collapsed && (
<button
type="button"
className={`nav-group-toggle${open ? ' open' : ''}`}
onClick={() => toggleGroup(group.id)}
aria-expanded={open}
aria-label={`${open ? '收起' : '展开'}${group.title}`}
title={`${open ? '收起' : '展开'}${group.title}`}
>
<ChevronDownIcon size={14} />
</button>
)}
</div>
{open && group.items.map(item => {
const ItemIcon = item.icon
return (
<NavLink key={item.to} aria-label={item.label} title={item.label} to={item.to} className={navClass}>
<span className="icon"><ItemIcon size={18} /></span>
{!collapsed && <span>{item.label}</span>}
</NavLink>
)
})}
</div>
)
})}
</nav>
<div className="sidebar-footer">
<div className="user-info">管理员</div>
<button
className="theme-toggle-btn"
onClick={() => setTheme(current => current === 'light' ? 'dark' : 'light')}
title={theme === 'light' ? '切换至夜间模式' : '切换至日间模式'}
aria-label={theme === 'light' ? '切换至夜间模式' : '切换至日间模式'}
>
{theme === 'light' ? <MoonIcon size={18} /> : <SunIcon size={18} />}
</button>
<button className="settings-btn" onClick={() => setSettingsOpen(true)} title="设置" aria-label="设置">
<TuneIcon size={18} />
</button>
</div>
</aside>
<main className="main-content">
<div className="route-content">
<Routes>
<Route path="/" element={<Dashboard />} />
<Route path="/quotes" element={<QuoteManagement />} />
<Route path="/pi-contracts" element={<PiContractManagement />} />
<Route path="/purchase-orders" element={<PurchaseOrderManagement />} />
<Route path="/products" element={<ProductManagement />} />
<Route path="/suppliers" element={<SupplierManagement />} />
<Route path="/procurement/import" element={<EmbeddedSku view="import" />} />
<Route path="/customers" element={<CustomerManagement />} />
<Route path="/orders" element={<OrderManagement />} />
<Route path="/prospects" element={<ProspectManagement />} />
<Route path="*" element={<Navigate to="/" replace />} />
</Routes>
</div>
</main>
</div>
</main>
</div>
<AIAssistant isOpen={assistantOpen} onClose={closeAssistant} />
<Settings isOpen={settingsOpen} onClose={closeSettings} theme={theme} onThemeChange={setTheme} reducedMotion={reducedMotion} onReducedMotionChange={setReducedMotion} />
frontend/src/components/GlobalHeader.jsx
+1 -1
View File
@@ -49,7 +49,7 @@ function GlobalHeader({ onOpenAssistant }) {
return (
<header className="global-header">
<div className="global-header-brand"><span className="brand-mark" title="happy出口通"><CloudDbIcon size={28} /><span className="header-status-dot" /></span><div><strong>happy出口通</strong><span>EXPORT OPERATIONS CONSOLE</span></div></div>
<div className="global-header-brand"><span className="brand-mark" title="happy出口通"><CloudDbIcon size={36} /><span className="header-status-dot" /></span><div><strong>happy出口通</strong><span>EXPORT OPERATIONS CONSOLE</span></div></div>
<div className={`global-search ${searchOpen ? 'is-open' : ''}`}>
<SearchIcon size={17} />
<input ref={searchRef} aria-label="搜索 everything" value={query} onFocus={() => setSearchOpen(true)} onChange={event => setQuery(event.target.value)} placeholder="搜索 everything" autoComplete="off" />
frontend/src/styles/index.css
+17 -8
View File
@@ -2,14 +2,17 @@
应用布局与页面组件
============================================================ */
.app-container { display: flex; min-height: 100vh; background: var(--bg-primary); }
.app-container { min-height: 100vh; background: var(--bg-primary); }
/* 顶栏横跨整宽、压在侧边栏之上；它下方才是「侧边栏 + 主内容」两栏 */
.app-shell { display: flex; flex-direction: column; min-height: 100vh; }
.app-body { display: flex; flex: 1 1 auto; min-height: 0; }
/* 侧边栏：仪表板式工业控制台 */
.sidebar {
position: sticky;
top: 0;
top: var(--header-height);
width: var(--sidebar-width);
height: 100vh;
height: calc(100vh - var(--header-height));
flex: 0 0 var(--sidebar-width);
display: flex;
flex-direction: column;
@@ -21,14 +24,20 @@
}
.sidebar::before { content: ""; height: 3px; flex: 0 0 3px; background: linear-gradient(90deg, var(--primary-dark), var(--primary-light)); }
.sidebar.collapsed { width: var(--sidebar-collapsed-width); flex-basis: var(--sidebar-collapsed-width); }
.sidebar-header { display: flex; align-items: center; justify-content: space-between; gap: 12px; min-height: 76px; padding: 18px 18px 16px; border-bottom: 1px solid var(--border-light); }
.sidebar-header h1 { margin: 0; overflow: hidden; color: var(--text-primary); font-family: var(--font-display); font-size: 16px; font-weight: 700; letter-spacing: 0.02em; white-space: nowrap; }
/* 首行：工作台（左）+ 展开/收起导航按钮（右） */
.sidebar-top { display: flex; align-items: center; gap: 8px; min-height: 62px; padding: 8px 12px; border-bottom: 1px solid var(--border-light); }
.sidebar-top .nav-item-home { flex: 1 1 auto; min-width: 0; margin: 0; }
.sidebar-top .collapse-btn { flex: 0 0 auto; }
.sidebar-top .collapse-btn svg { transition: transform var(--transition-base); }
.sidebar.collapsed .sidebar-top { flex-direction: column; gap: 8px; padding: 8px; }
.sidebar.collapsed .sidebar-top .nav-item-home { width: 100%; flex: 0 0 auto; }
.sidebar.collapsed .collapse-btn svg { transform: rotate(180deg); }
.collapse-btn { flex: 0 0 30px; width: 30px; height: 30px; border: 1px solid var(--border); border-radius: var(--radius-sm); background: var(--surface-deep); color: var(--primary-light); cursor: pointer; font-size: 16px; transition: all var(--transition-fast); }
.collapse-btn:hover { background: var(--primary); color: #041522; border-color: var(--primary); }
.sidebar-nav { flex: 1; overflow-y: auto; padding: 14px 10px; }
.sidebar-nav { flex: 1; overflow-y: auto; padding: 6px 10px 14px; }
/* 分组标题行：标题 + 右侧折叠按钮 */
.nav-group { display: block; }
.nav-group:first-of-type .nav-group-header { margin-top: 14px; padding-top: 12px; border-top: 1px solid var(--border-light); }
.nav-group:first-of-type .nav-group-header { margin-top: 6px; padding-top: 0; }
.nav-group-header { display: flex; align-items: center; justify-content: space-between; gap: 6px; margin: 16px 4px 6px; padding: 0 6px; }
.nav-group-title { flex: 1; margin: 0; color: var(--text-tertiary); font-size: 12px; font-weight: 600; letter-spacing: 0.04em; }
.nav-group-toggle { display: flex; flex: 0 0 auto; align-items: center; justify-content: center; width: 24px; height: 24px; padding: 0; border: 1px solid transparent; border-radius: var(--radius-sm); background: transparent; color: var(--text-tertiary); cursor: pointer; transition: color var(--transition-fast), background var(--transition-fast), border-color var(--transition-fast); }
@@ -138,7 +147,7 @@
@keyframes spin { to { transform: rotate(360deg); } }
@media (max-width: 1180px) { .stats-grid { grid-template-columns: repeat(3, minmax(160px, 1fr)); } }
@media (max-width: 900px) { .sidebar { width: var(--sidebar-collapsed-width); flex-basis: var(--sidebar-collapsed-width); } .sidebar-header { justify-content: center; padding: 18px 10px; } .sidebar-header h1 { display: none; } .sidebar-nav { padding-inline: 9px; } .nav-group-header, .nav-item span:not(.icon), .user-info { display: none; } .nav-item { justify-content: center; padding-inline: 10px; } .sidebar-footer { justify-content: center; padding-inline: 10px; } .dashboard-grid { grid-template-columns: 1fr; } }
@media (max-width: 900px) { .sidebar { width: var(--sidebar-collapsed-width); flex-basis: var(--sidebar-collapsed-width); } .sidebar-top { flex-direction: column; gap: 8px; padding: 8px; } .sidebar-top .nav-item-home { width: 100%; flex: 0 0 auto; } .sidebar-top .collapse-btn svg { transform: rotate(180deg); } .sidebar-nav { padding-inline: 9px; } .nav-group-header, .nav-item span:not(.icon), .user-info { display: none; } .nav-item { justify-content: center; padding-inline: 10px; } .sidebar-footer { justify-content: center; padding-inline: 10px; } .dashboard-grid { grid-template-columns: 1fr; } }
@media (max-width: 620px) { .main-content { padding: 24px 14px 36px; } .stats-grid { grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 10px; } .stat-card { min-height: 88px; padding: 13px; } .stat-icon { flex-basis: 30px; } .stat-value { font-size: 22px; } .dashboard-grid { display: block; } .form-row { grid-template-columns: 1fr; } .settings-modal { height: calc(100vh - 20px); width: calc(100vw - 20px); flex-direction: column; } .settings-sidebar { width: auto; flex-basis: auto; } .settings-header { padding: 14px 18px; } .settings-nav { display: flex; gap: 8px; overflow-x: auto; } .settings-nav-item { width: auto; white-space: nowrap; margin: 0; } .settings-content { padding: 20px 18px; } }
/* 产品页使用的原生 table 同样复用工业表格视觉 */
frontend/src/styles/industrial.css
+2
View File
@@ -79,6 +79,8 @@
--text-secondary-legacy: var(--text-secondary);
--sidebar-width: 264px;
--sidebar-collapsed-width: 76px;
/* 顶栏高度：顶栏横跨整宽压在侧边栏之上，侧边栏据此吸附在其下方 */
--header-height: 80px;
}
[data-theme="light"] {
frontend/src/styles/luxury.css
+11 -13
View File
@@ -80,9 +80,7 @@ body::before {
body { font-size: 14px; }
.sidebar { background: var(--bg-secondary); box-shadow: none; border-color: var(--border-light); }
.sidebar::before { background: transparent; }
.sidebar-header { min-height: 92px; }
.sidebar.collapsed .sidebar-header h1 { display: none; }
.sidebar.collapsed .sidebar-header { justify-content: center; }
.sidebar-top { min-height: 62px; }
.nav-item { min-height: 46px; font-weight: 600; }
.nav-item.active { border-color: transparent; background: var(--primary-bg); box-shadow: inset 0 1px 0 var(--panel-highlight); }
.nav-item.active::before { display: none; }
@@ -219,15 +217,15 @@ input:focus-visible, select:focus-visible, textarea:focus-visible { outline: 2px
/* ============================================================
Global header + calendar dashboard + AI assistant
============================================================ */
.app-container { display: flex; min-height: 100vh; }
.main-content { min-height: 100vh; overflow: hidden; padding: 0; }
.route-content { min-height: calc(100vh - 72px); overflow-y: auto; padding: 32px clamp(18px, 3.6vw, 52px) 56px; }
.global-header { position: sticky; top: 0; z-index: 25; display: flex; align-items: center; gap: 22px; min-height: 72px; padding: 0 clamp(18px, 3.6vw, 52px); background: color-mix(in srgb, var(--bg-primary) 90%, transparent); border-bottom: 1px solid var(--border-light); backdrop-filter: blur(18px) saturate(1.25); }
.global-header-brand { display: flex; align-items: center; gap: 10px; min-width: 238px; }
.app-container { min-height: 100vh; }
.main-content { min-height: 0; overflow: hidden; padding: 0; }
.route-content { min-height: calc(100vh - var(--header-height)); overflow-y: auto; padding: 32px clamp(18px, 3.6vw, 52px) 56px; }
.global-header { position: sticky; top: 0; z-index: 25; display: flex; align-items: center; gap: 22px; min-height: var(--header-height); padding: 0 clamp(18px, 3.6vw, 52px); background: color-mix(in srgb, var(--bg-primary) 90%, transparent); border-bottom: 1px solid var(--border-light); backdrop-filter: blur(18px) saturate(1.25); }
.global-header-brand { display: flex; align-items: center; gap: 13px; min-width: 272px; }
.global-header-brand strong, .global-header-brand span { display: block; }
.global-header-brand strong { font-size: 13px; letter-spacing: .02em; }
.global-header-brand span:not(.header-status-dot):not(.brand-mark) { color: var(--text-tertiary); font: 9px var(--font-mono); letter-spacing: .12em; margin-top: 3px; }
.header-status-dot { width: 8px; height: 8px; flex: 0 0 8px; border-radius: 50%; background: var(--success); box-shadow: 0 0 10px var(--success); }
.global-header-brand strong { font-size: 19px; letter-spacing: .01em; line-height: 1.2; }
.global-header-brand span:not(.header-status-dot):not(.brand-mark) { color: var(--text-tertiary); font: 10px var(--font-mono); letter-spacing: .14em; margin-top: 2px; }
.header-status-dot { width: 9px; height: 9px; flex: 0 0 9px; border-radius: 50%; background: var(--success); box-shadow: 0 0 10px var(--success); }
.global-search { display: flex; align-items: center; gap: 9px; width: min(420px, 35vw); min-height: 38px; padding: 0 11px; color: var(--text-tertiary); background: var(--surface-deep); border: 1px solid var(--border-light); border-radius: 11px; transition: border-color 150ms, box-shadow 150ms; }
.global-search:focus-within { border-color: var(--primary-border); box-shadow: 0 0 0 3px var(--accent-glow); }
.global-search input { min-height: 0; padding: 0; border: 0; background: transparent; box-shadow: none; color: var(--text-primary); }
@@ -319,7 +317,7 @@ input:focus-visible, select:focus-visible, textarea:focus-visible { outline: 2px
.ai-suggestion-row { display: flex; gap: 7px; padding: 8px 20px; overflow-x: auto; }.ai-suggestion-row button { flex: 0 0 auto; padding: 6px 9px; border: 1px solid var(--border-light); border-radius: 99px; background: var(--surface-deep); color: var(--text-secondary); cursor: pointer; font-size: 10px; }.ai-suggestion-row button:hover { color: var(--primary-light); border-color: var(--primary-border); }
.ai-input-row { display: flex; gap: 8px; padding: 10px 16px; border-top: 1px solid var(--border-light); }.ai-input-row input { min-height: 40px; background: var(--surface-deep); }.ai-input-row button { display: grid; place-items: center; width: 40px; min-width: 40px; border: 0; border-radius: 11px; background: var(--primary); color: var(--surface-deep); cursor: pointer; }.ai-input-row button:disabled { cursor: not-allowed; opacity: .4; }.ai-panel-footer { padding: 8px 20px 13px; color: var(--text-tertiary); font-size: 10px; text-align: center; }
@media (max-width: 980px) { .global-header-brand { min-width: auto; }.global-header-brand div { display: none; }.global-search { width: min(360px, 40vw); }.header-clock span { display: none; }.dashboard-content-grid { grid-template-columns: 1fr; }.dashboard-secondary-column { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 18px; }.dashboard-secondary-column .dashboard-panel { margin-bottom: 0; } }
@media (max-width: 680px) { .global-header { gap: 8px; min-height: 62px; padding: 0 12px; }.global-search { display: none; }.global-search.is-open { position: absolute; left: 12px; right: 12px; top: 65px; display: flex; width: auto; background: var(--surface); }.mobile-search-btn { display: inline-flex; }.quick-create-btn span, .ai-entry-btn span, .header-clock { display: none; }.ai-entry-btn { padding: 8px; }.route-content { min-height: calc(100vh - 62px); padding: 22px 12px 42px; }.dashboard-welcome { align-items: flex-start; flex-direction: column; }.dashboard-date-chip { text-align: left; }.calendar-day { min-height: 68px; padding: 5px 4px; }.calendar-week-row > div { padding: 8px 4px; }.calendar-event { font-size: 8px; }.calendar-day-number { font-size: 10px; }.dashboard-secondary-column { display: block; }.dashboard-secondary-column .dashboard-panel { margin-bottom: 18px; }.ai-assistant-panel { top: 8px; right: 8px; bottom: 8px; width: calc(100vw - 16px); } }
@media (max-width: 680px) { :root { --header-height: 62px; }.global-header { gap: 8px; padding: 0 12px; }.global-search { display: none; }.global-search.is-open { position: absolute; left: 12px; right: 12px; top: 65px; display: flex; width: auto; background: var(--surface); }.mobile-search-btn { display: inline-flex; }.quick-create-btn span, .ai-entry-btn span, .header-clock { display: none; }.ai-entry-btn { padding: 8px; }.route-content { min-height: calc(100vh - var(--header-height)); padding: 22px 12px 42px; }.dashboard-welcome { align-items: flex-start; flex-direction: column; }.dashboard-date-chip { text-align: left; }.calendar-day { min-height: 68px; padding: 5px 4px; }.calendar-week-row > div { padding: 8px 4px; }.calendar-event { font-size: 8px; }.calendar-day-number { font-size: 10px; }.dashboard-secondary-column { display: block; }.dashboard-secondary-column .dashboard-panel { margin-bottom: 18px; }.ai-assistant-panel { top: 8px; right: 8px; bottom: 8px; width: calc(100vw - 16px); } }
/* Requested compact navigation controls. */
.collapse-btn { display: grid; place-items: center; width: 32px; height: 32px; padding: 0; border: 1px solid var(--border-strong); border-radius: 8px; background: var(--surface-deep); color: var(--text-secondary); box-shadow: inset 0 1px 0 var(--panel-highlight); }
@@ -356,4 +354,4 @@ input:focus-visible, select:focus-visible, textarea:focus-visible { outline: 2px
/* ---- 品牌标识：云 + 数据库（矢量重绘，随主题变色） ---- */
.global-header-brand .brand-mark { position: relative; display: inline-flex; align-items: center; justify-content: center; color: var(--text-primary); }
.global-header-brand .brand-mark svg { display: block; }
.global-header-brand .brand-mark .header-status-dot { position: absolute; right: -1px; bottom: -1px; width: 8px; height: 8px; border-radius: 50%; background: var(--success); box-shadow: 0 0 0 3px var(--bg-primary), 0 0 10px var(--success); }
.global-header-brand .brand-mark .header-status-dot { position: absolute; right: -1px; bottom: -1px; width: 9px; height: 9px; border-radius: 50%; background: var(--success); box-shadow: 0 0 0 3px var(--bg-primary), 0 0 10px var(--success); }