Logan.Li
514d62644e
核心修复:
- ssh-service.ts: 新增 resolvePrivateKey()，将私钥文件路径(~/.ssh/id_rsa)解析为内容后传给 ssh2，
解决 'Cannot parse privateKey: Unsupported key format' 错误
- useTerminalConnection.ts + sessionHelper.ts: 根据 authType 过滤字段，password/agent 认证不再传 privateKey
- sessionStore.ts: addSession() 现在先调用 sessionCreate() 持久化到 SQLite，解决恢复标签'无可用连接信息'问题
- database-service.ts: updateSession() 补充 private_key_path 字段持久化
- SessionDialog.tsx: 默认 username='root'、privateKey='~/.ssh/id_rsa'
UI/UX:
- 语义化主题系统(app-theme.ts)，强制深色模式，全局无边框设计
- macOS 标题栏支持双击最大化(window:toggleMaximize IPC)
- macOS 菜单栏('OpsXShell' 应用菜单 + Settings Cmd+,)
- WelcomeView 4卡片布局，移除 Settings 按钮
- TabBar/TabItem 背景色统一(bg-dark-800/900)，消除白色边框线
架构优化:
- SFTP 生命周期修复(useSFTP.ts useRef + autoConnectAttempted guard)
- 连接池竞态修复，支持快速多标签连接
- IPC 接口规范化，安全错误处理
- Vite 代码分割优化
质量: lint零错误 | tsc零错误 | build成功 | 49 tests pass
93 lines
2.5 KiB
TypeScript
93 lines
2.5 KiB
TypeScript
/**
|
|
* ConnectionPanel - SFTP 连接状态面板
|
|
*
|
|
* 显示连接状态或连接选择界面
|
|
*/
|
|
|
|
import { Monitor, AlertCircle, Loader2 } from 'lucide-react'
|
|
import { ConnectionSelector } from './ConnectionSelector'
|
|
import type { Session } from '../../../shared/types/session.types'
|
|
|
|
interface ConnectionPanelProps {
|
|
isConnected: boolean
|
|
isConnecting: boolean
|
|
error: string | null
|
|
sessions: Session[]
|
|
showSelector: boolean
|
|
onConnect: (sessionId: string) => void
|
|
onShowSelector: () => void
|
|
onCloseSelector: () => void
|
|
}
|
|
|
|
export function ConnectionPanel({
|
|
isConnected,
|
|
isConnecting,
|
|
error,
|
|
sessions,
|
|
showSelector,
|
|
onConnect,
|
|
onShowSelector,
|
|
onCloseSelector,
|
|
}: ConnectionPanelProps) {
|
|
// Connected State
|
|
if (isConnected) {
|
|
return (
|
|
<div className="flex items-center gap-2 px-4 py-2 bg-green-500/10 border-b border-green-500/20">
|
|
<Monitor className="w-4 h-4 text-green-400" />
|
|
<span className="text-sm text-green-400">已连接</span>
|
|
</div>
|
|
)
|
|
}
|
|
|
|
// Connecting State
|
|
if (isConnecting) {
|
|
return (
|
|
<div className="flex items-center gap-2 px-4 py-2 bg-accent-blue/10 border-b border-accent-blue/20">
|
|
<Loader2 className="w-4 h-4 text-accent-blue animate-spin" />
|
|
<span className="text-sm text-accent-blue">连接中...</span>
|
|
</div>
|
|
)
|
|
}
|
|
|
|
// Error State
|
|
if (error) {
|
|
return (
|
|
<div className="flex items-center justify-between px-4 py-2 bg-red-500/10 border-b border-red-500/20">
|
|
<div className="flex items-center gap-2">
|
|
<AlertCircle className="w-4 h-4 text-red-400" />
|
|
<span className="text-sm text-red-400">{error}</span>
|
|
</div>
|
|
<button
|
|
onClick={onShowSelector}
|
|
className="px-3 py-1 bg-dark-700 hover:bg-dark-600 rounded text-sm transition-colors"
|
|
>
|
|
重新连接
|
|
</button>
|
|
</div>
|
|
)
|
|
}
|
|
|
|
// Disconnected State
|
|
return (
|
|
<>
|
|
<div className="flex items-center justify-between px-4 py-2 bg-dark-800 border-b border-dark-700/30">
|
|
<span className="text-sm text-gray-400">未连接</span>
|
|
<button
|
|
onClick={onShowSelector}
|
|
className="px-3 py-1.5 bg-accent-blue hover:bg-blue-600 rounded text-sm font-medium transition-colors"
|
|
>
|
|
选择服务器
|
|
</button>
|
|
</div>
|
|
|
|
{showSelector && (
|
|
<ConnectionSelector
|
|
sessions={sessions}
|
|
onSelect={onConnect}
|
|
onClose={onCloseSelector}
|
|
/>
|
|
)}
|
|
</>
|
|
)
|
|
}
|