refactor: streamline sidebar account menu

This commit is contained in:
aits2026
2026-03-10 13:24:47 +08:00
parent 627aa35f88
commit 5b2e48badd
2 changed files with 70 additions and 46 deletions

View File

@@ -45,29 +45,48 @@
margin: 0 12px 10px; margin: 0 12px 10px;
} }
.sidebar-user-clear-trigger { .sidebar-user-menu {
position: absolute; position: absolute;
left: 0; left: 0;
right: 0; right: 0;
bottom: calc(100% + 8px); bottom: calc(100% + 8px);
z-index: 12; z-index: 12;
border: 1px solid rgba(255, 59, 48, 0.28); border: 1px solid var(--border-color);
border-radius: 10px; border-radius: 12px;
background: var(--bg-secondary); background: var(--bg-secondary);
color: #d93025; display: flex;
padding: 8px 10px; flex-direction: column;
gap: 4px;
padding: 6px;
box-shadow: 0 8px 20px rgba(15, 23, 42, 0.12);
}
.sidebar-user-menu-item {
width: 100%;
border: none;
border-radius: 10px;
background: transparent;
color: var(--text-primary);
padding: 9px 10px;
display: flex; display: flex;
align-items: center; align-items: center;
gap: 8px; gap: 8px;
font-size: 12px; font-size: 13px;
font-weight: 600; font-weight: 500;
cursor: pointer; cursor: pointer;
box-shadow: 0 8px 20px rgba(15, 23, 42, 0.12); text-align: left;
transition: background 0.2s ease, color 0.2s ease, border-color 0.2s ease; transition: background 0.2s ease, color 0.2s ease;
&:hover { &:hover {
background: rgba(255, 59, 48, 0.08); background: var(--bg-tertiary);
border-color: rgba(255, 59, 48, 0.46); }
&.danger {
color: #d93025;
&:hover {
background: rgba(255, 59, 48, 0.08);
}
} }
} }

View File

@@ -282,6 +282,11 @@ function Sidebar({ collapsed }: SidebarProps) {
setShowClearAccountDialog(true) setShowClearAccountDialog(true)
} }
const openSettingsFromAccountMenu = () => {
setIsAccountMenuOpen(false)
navigate('/settings')
}
const handleConfirmClearAccountData = async () => { const handleConfirmClearAccountData = async () => {
if (!canConfirmClear || isClearingAccountData) return if (!canConfirmClear || isClearingAccountData) return
setIsClearingAccountData(true) setIsClearingAccountData(true)
@@ -420,16 +425,43 @@ function Sidebar({ collapsed }: SidebarProps) {
</nav> </nav>
<div className="sidebar-footer"> <div className="sidebar-footer">
<button
className="nav-item"
onClick={() => {
if (authEnabled) {
setLocked(true)
return
}
navigate('/settings', { state: { initialTab: 'security' } })
}}
title={collapsed ? (authEnabled ? '锁定' : '未锁定') : undefined}
>
<span className="nav-icon">{authEnabled ? <Lock size={20} /> : <LockOpen size={20} />}</span>
<span className="nav-label">{authEnabled ? '锁定' : '未锁定'}</span>
</button>
<div className="sidebar-user-card-wrap" ref={accountCardWrapRef}> <div className="sidebar-user-card-wrap" ref={accountCardWrapRef}>
{isAccountMenuOpen && ( {isAccountMenuOpen && (
<button <div className="sidebar-user-menu" role="menu" aria-label="账号菜单">
className="sidebar-user-clear-trigger" <button
onClick={openClearAccountDialog} className="sidebar-user-menu-item"
type="button" onClick={openSettingsFromAccountMenu}
> type="button"
<Trash2 size={14} /> role="menuitem"
<span></span> >
</button> <Settings size={14} />
<span></span>
</button>
<button
className="sidebar-user-menu-item danger"
onClick={openClearAccountDialog}
type="button"
role="menuitem"
>
<Trash2 size={14} />
<span></span>
</button>
</div>
)} )}
<div <div
className={`sidebar-user-card ${isAccountMenuOpen ? 'menu-open' : ''}`} className={`sidebar-user-card ${isAccountMenuOpen ? 'menu-open' : ''}`}
@@ -458,33 +490,6 @@ function Sidebar({ collapsed }: SidebarProps) {
)} )}
</div> </div>
</div> </div>
<button
className="nav-item"
onClick={() => {
if (authEnabled) {
setLocked(true)
return
}
navigate('/settings', { state: { initialTab: 'security' } })
}}
title={collapsed ? (authEnabled ? '锁定' : '未锁定') : undefined}
>
<span className="nav-icon">{authEnabled ? <Lock size={20} /> : <LockOpen size={20} />}</span>
<span className="nav-label">{authEnabled ? '锁定' : '未锁定'}</span>
</button>
<NavLink
to="/settings"
className={`nav-item ${isActive('/settings') ? 'active' : ''}`}
title={collapsed ? '设置' : undefined}
>
<span className="nav-icon">
<Settings size={20} />
</span>
<span className="nav-label"></span>
</NavLink>
</div> </div>
{showClearAccountDialog && ( {showClearAccountDialog && (