Skip to content

revert: 开始任务后禁止切换顶部状态栏 #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zmdyy0318 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

revert: 开始任务后禁止切换顶部状态栏 #333

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 15 additions & 49 deletions src/components/TabBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ export function TabBar() {
};

const langKey = getInterfaceLangKey(language);
const topBarLocked = instances.some((inst) => inst.isRunning);

// 右键菜单处理
const handleTabContextMenu = useCallback(
Expand Down Expand Up @@ -381,14 +380,7 @@ export function TabBar() {
return (
<div className="flex items-center h-10 bg-bg-secondary border-b border-border select-none">
{/* 标签页区域 */}
<div
id="tab-bar-area"
className={clsx(
'flex-1 flex items-center h-full overflow-x-auto',
topBarLocked && 'pointer-events-none',
)}
aria-disabled={topBarLocked}
>
<div id="tab-bar-area" className="flex-1 flex items-center h-full overflow-x-auto">
{instances.map((instance, index) => {
const isAnimatingIn = animatingTabIds.includes(instance.id);
const isClosing = closingTabIds.includes(instance.id);
Expand All @@ -401,7 +393,7 @@ export function TabBar() {
else tabRefs.current.delete(instance.id);
}}
onMouseDown={(e) => handleMouseDown(e, index)}
onClick={() => !topBarLocked && !isClosing && setActiveInstance(instance.id)}
onClick={() => !isClosing && setActiveInstance(instance.id)}
onDoubleClick={(e) => handleDoubleClick(e, instance.id, instance.name)}
onContextMenu={(e) => handleTabContextMenu(e, instance.id, instance.name)}
onAnimationEnd={() => {
Expand All @@ -411,7 +403,6 @@ export function TabBar() {
}}
className={clsx(
'group flex items-center gap-1 h-full px-2 cursor-pointer border-r border-border min-w-[120px] max-w-[200px]',
topBarLocked && 'cursor-not-allowed opacity-70',
instance.id === activeInstanceId
? 'bg-bg-primary text-accent border-b-2 border-b-accent'
: 'bg-bg-tertiary text-text-secondary hover:bg-bg-hover border-b-2 border-b-transparent',
Expand Down Expand Up @@ -512,11 +503,7 @@ export function TabBar() {
{/* 新建标签按钮 */}
<button
onClick={handleNewTab}
disabled={topBarLocked}
className={clsx(
'flex items-center justify-center w-8 h-full transition-colors',
topBarLocked ? 'cursor-not-allowed opacity-50' : 'hover:bg-bg-hover',
)}
className="flex items-center justify-center w-8 h-full hover:bg-bg-hover transition-colors"
title={t('titleBar.newTab')}
>
<Plus className="w-4 h-4 text-text-secondary" />
Expand All @@ -534,15 +521,10 @@ export function TabBar() {
{(updateInfo?.hasUpdate || updateInfo?.errorCode || downloadStatus === 'downloading') && (
<button
ref={bellButtonRef}
onClick={() => !topBarLocked && setShowUpdatePanel(!showUpdatePanel)}
disabled={topBarLocked}
onClick={() => setShowUpdatePanel(!showUpdatePanel)}
className={clsx(
'relative p-2 rounded-md transition-colors',
topBarLocked
? 'cursor-not-allowed opacity-50'
: showUpdatePanel
? 'bg-accent/10'
: 'hover:bg-bg-hover',
showUpdatePanel ? 'bg-accent/10' : 'hover:bg-bg-hover',
)}
title={
updateInfo?.hasUpdate
Expand Down Expand Up @@ -575,43 +557,31 @@ export function TabBar() {
{recentlyClosed.length > 0 && (
<button
ref={recentlyClosedButtonRef}
onClick={() => !topBarLocked && setShowRecentlyClosedPanel(!showRecentlyClosedPanel)}
disabled={topBarLocked}
onClick={() => setShowRecentlyClosedPanel(!showRecentlyClosedPanel)}
className={clsx(
'p-2 rounded-md transition-colors',
topBarLocked
? 'cursor-not-allowed opacity-50'
: showRecentlyClosedPanel
? 'bg-accent/10 text-accent'
: 'hover:bg-bg-hover text-text-secondary',
showRecentlyClosedPanel
? 'bg-accent/10 text-accent'
: 'hover:bg-bg-hover text-text-secondary',
)}
title={t('recentlyClosed.title')}
>
<History className="w-4 h-4" />
</button>
)}
<button
onClick={() => !topBarLocked && toggleDashboardView()}
disabled={topBarLocked}
onClick={toggleDashboardView}
className={clsx(
'p-2 rounded-md transition-colors',
topBarLocked
? 'cursor-not-allowed opacity-50'
: dashboardView
? 'bg-accent/10 text-accent'
: 'hover:bg-bg-hover text-text-secondary',
dashboardView ? 'bg-accent/10 text-accent' : 'hover:bg-bg-hover text-text-secondary',
)}
title={t('dashboard.toggle')}
>
<LayoutGrid className="w-4 h-4" />
</button>
<button
onClick={() => !topBarLocked && toggleTheme()}
disabled={topBarLocked}
className={clsx(
'p-2 rounded-md transition-colors',
topBarLocked ? 'cursor-not-allowed opacity-50' : 'hover:bg-bg-hover',
)}
onClick={toggleTheme}
className="p-2 rounded-md hover:bg-bg-hover transition-colors"
title={
resolveThemeMode(theme) === 'light' ? t('settings.themeDark') : t('settings.themeLight')
}
Expand All @@ -623,12 +593,8 @@ export function TabBar() {
)}
</button>
<button
onClick={() => !topBarLocked && setCurrentPage('settings')}
disabled={topBarLocked}
className={clsx(
'p-2 rounded-md transition-colors',
topBarLocked ? 'cursor-not-allowed opacity-50' : 'hover:bg-bg-hover',
)}
onClick={() => setCurrentPage('settings')}
className="p-2 rounded-md hover:bg-bg-hover transition-colors"
title={t('titleBar.settings')}
>
<Settings className="w-4 h-4 text-text-secondary" />
Expand Down