UI/细节调整

This commit is contained in:
zhongluofeng committed 2026-09-22 19:10:16 +08:00
1 parent b018abd922
commit bccd21fde5
135 files changed
+11393 -5104

No files matched your search

+56 -38
View File
@@ -1,15 +1,14 @@
<script setup lang="ts">
import { ref, computed, onMounted, onUnmounted, watch, nextTick } from 'vue'
import {
ClipboardList, Copy, Pin, PinOff, Trash2, Search, Image as ImageIcon,
ClipboardList, Copy, Database, Pin, PinOff, Trash2, Search, Image as ImageIcon,
FileText, Files, Settings as SettingsIcon, Loader2, Eraser, Keyboard,
} from '@lucide/vue'
import { toast } from 'vue-sonner'
import { useClipboardStore, type ClipboardItem, type ClipboardKind, type ClipboardItemDetail } from '@/stores/clipboardStore'
import { useModuleTabs } from '@/lib/use-module-tabs'
import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs'
import { ScrollArea } from '@/components/ui/scroll-area'
import { Card, CardContent } from '@/components/ui/card'
import { Tabs, TabsContent } from '@/components/ui/tabs'
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input'
import { Switch } from '@/components/ui/switch'
@@ -33,11 +32,11 @@ import {
const store = useClipboardStore()
const activeTab = ref('history')
const tabsListRef = useModuleTabs('clipboard', activeTab, [
useModuleTabs('clipboard', activeTab, [
{ value: 'history', label: '历史' },
{ value: 'pinned', label: '固定' },
{ value: 'settings', label: '设置' },
])
], { alwaysVisible: true })
// 历史搜索/过滤
const searchQuery = ref('')
@@ -276,10 +275,10 @@ const kindIcon = (k: string) => {
const kindLabel = (k: string) => (k === 'text' ? '文本' : k === 'image' ? '图片' : '文件')
const kindBadgeClass = (k: string) =>
k === 'text'
? 'border-blue-500/40 bg-blue-500/10 text-blue-600 dark:text-blue-400'
? 'border-info/40 bg-info-soft text-info-text'
: k === 'image'
? 'border-emerald-500/40 bg-emerald-500/10 text-emerald-600 dark:text-emerald-400'
: 'border-amber-500/40 bg-amber-500/10 text-amber-600 dark:text-amber-400'
? 'border-success/40 bg-success-soft text-success-text'
: 'border-warning/40 bg-warning-soft text-warning-text'
const formatSize = (bytes: number) => {
if (!bytes) return ''
if (bytes < 1024) return `${bytes} B`
@@ -320,18 +319,10 @@ onUnmounted(() => {
</script>
<template>
<div class="h-full p-6 overflow-hidden flex flex-col">
<div class="min-h-full p-5 flex flex-col">
<Tabs v-model="activeTab" class="flex-1 min-h-0 flex flex-col">
<div ref="tabsListRef" class="shrink-0">
<TabsList class="grid w-full max-w-md grid-cols-3 !bg-transparent !p-0 !shadow-none">
<TabsTrigger value="history" class="gap-1.5"><ClipboardList class="size-3.5" />历史</TabsTrigger>
<TabsTrigger value="pinned" class="gap-1.5"><Pin class="size-3.5" />固定</TabsTrigger>
<TabsTrigger value="settings" class="gap-1.5"><SettingsIcon class="size-3.5" />设置</TabsTrigger>
</TabsList>
</div>
<!-- 历史 -->
<TabsContent value="history" class="flex-1 min-h-0 flex flex-col mt-4 tab-animate">
<TabsContent value="history" class="flex-1 min-h-0 flex flex-col tab-animate">
<div class="flex items-center gap-2 mb-3 shrink-0">
<div class="relative flex-1 max-w-sm">
<Search class="absolute left-2.5 top-1/2 -translate-y-1/2 size-4 text-muted-foreground" />
@@ -392,7 +383,7 @@ onUnmounted(() => {
</span>
</div>
<ScrollArea class="flex-1 min-h-0">
<div class="flex-1 min-h-0">
<div class="space-y-1.5 pr-2">
<!-- 加载骨架:数据异步返回前撑起画面,避免误显示"暂无历史" -->
<div v-if="store.loading" class="space-y-1.5">
@@ -450,12 +441,17 @@ onUnmounted(() => {
</CardContent>
</Card>
</div>
</ScrollArea>
</div>
</TabsContent>
<!-- 固定 -->
<TabsContent value="pinned" class="flex-1 min-h-0 flex flex-col mt-4 tab-animate">
<div class="flex-1 min-h-0 overflow-y-auto space-y-1.5 pr-1">
<TabsContent value="pinned" class="flex-1 min-h-0 flex flex-col tab-animate">
<!--
这份列表是模块内的独立滚动区:视口会裁掉超出自身的阴影,而这里的卡片
悬停时是 shadow-md(比 shadow-sm 更大)。`-mx-3` + 内层 `px-3 pb-2`
让视口两侧各多出 12px、底部多出 8px 的余量,卡片位置与宽度不变。
-->
<div class="flex-1 min-h-0 overflow-y-auto -mx-3">
<Empty v-if="!pinnedList.length" class="h-full py-8">
<EmptyHeader>
<EmptyMedia variant="icon">
@@ -467,6 +463,8 @@ onUnmounted(() => {
<EmptyDescription>鼠标悬停历史条目,点击图钉按钮即可固定</EmptyDescription>
</EmptyContent>
</Empty>
<div v-else class="space-y-1.5 px-3 pb-2">
<Card v-for="item in pinnedList" :key="item.id" class="group hover:shadow-md transition-shadow py-0">
<CardContent class="flex items-center gap-3 px-3 py-2">
<component :is="kindIcon(item.kind)" class="size-4 text-primary shrink-0" />
@@ -491,20 +489,29 @@ onUnmounted(() => {
</div>
</CardContent>
</Card>
</div>
</div>
</TabsContent>
<!-- 设置 -->
<TabsContent value="settings" class="flex-1 min-h-0 overflow-y-auto mt-4 tab-animate">
<div class="max-w-xl space-y-4">
<div class="flex items-center">
<h3 class="text-base font-medium flex items-center gap-2">
<SettingsIcon class="size-4" />基本设置
</h3>
</div>
<!--
设置页同样自带滚动(只有内容区滚,Tab 行固定)。内层 `px-3 pb-3` 是
必须的:卡片阴影贴着这个视口的边缘会被裁,而根元素上的内边距不属于
滚动内容(滚到底时最后一张卡片的底部阴影照样没了)。
卡片形态对齐下载器/监控等模块的设置页:标题进卡片(CardHeader +
CardTitle,图标用主题色),卡片铺满内容宽度(此前是 max-w-xl 的窄栏 +
一个页级 h3,读起来像「页面上浮着一个标题 + 三张无标题的卡片」)。
-->
<TabsContent value="settings" class="flex-1 min-h-0 overflow-y-auto tab-animate -mx-3">
<div class="space-y-4 px-3 pb-3">
<!-- 基本设置 -->
<Card>
<CardContent class="space-y-4 p-4">
<CardHeader>
<CardTitle class="flex items-center gap-2 text-base">
<SettingsIcon class="size-4 text-primary" />基本设置
</CardTitle>
</CardHeader>
<CardContent class="space-y-4">
<div class="flex items-center justify-between">
<div>
<Label>启用剪贴板监听</Label>
@@ -546,9 +553,16 @@ onUnmounted(() => {
</CardContent>
</Card>
<!-- 容量与上限 -->
<Card>
<CardContent class="space-y-4 p-4">
<div class="grid grid-cols-2 gap-4">
<CardHeader>
<CardTitle class="flex items-center gap-2 text-base">
<Database class="size-4 text-primary" />容量与上限
</CardTitle>
</CardHeader>
<CardContent>
<!-- 数值输入限宽:卡片铺满后让输入框跟着拉到六百多像素只是难读 -->
<div class="grid grid-cols-2 gap-4 max-w-xl">
<div class="space-y-2">
<Label>最大历史条数</Label>
<Input v-model.number="form.maxItems" type="number" min="50" max="10000" />
@@ -563,13 +577,17 @@ onUnmounted(() => {
</CardContent>
</Card>
<!-- 快捷弹窗 -->
<Card>
<CardContent class="space-y-4 p-4">
<CardHeader>
<CardTitle class="flex items-center gap-2 text-base">
<Keyboard class="size-4 text-primary" />快捷弹窗
</CardTitle>
</CardHeader>
<CardContent class="space-y-4">
<div class="flex items-center justify-between">
<div>
<Label class="flex items-center gap-2">
<Keyboard class="size-4" />快捷弹窗快捷键
</Label>
<Label>快捷弹窗快捷键</Label>
<p class="text-xs text-muted-foreground mt-1">全局快捷键触发鼠标位置历史弹窗,留空禁用</p>
</div>
<Button variant="outline" size="sm" @click="handleTestPopup">测试弹窗</Button>
+4 -1
View File
@@ -3,6 +3,7 @@ import { ref, computed, onMounted, onUnmounted, nextTick, watch } from 'vue'
import { listen, type UnlistenFn } from '@tauri-apps/api/event'
import { getCurrentWindow } from '@tauri-apps/api/window'
import { EVENTS, STORAGE_KEYS } from '@/lib/constants'
import { applyStoredAccent } from '@/lib/theme'
import { Effect, EffectState } from '@tauri-apps/api/window'
// Rust 端通过 tauri-specta 生成的命令绑定(bindings.ts)
import { commands } from '@/lib/bindings'
@@ -36,7 +37,7 @@ const kindFilter = ref<'all' | 'text' | 'image' | 'files'>('all')
const selectedIndex = ref(0)
const loading = ref(false)
const searchInputRef = ref<HTMLInputElement | null>(null)
let unlistenFns: UnlistenFn[] = []
const unlistenFns: UnlistenFn[] = []
let searchTimer: ReturnType<typeof setTimeout> | null = null
const totalPages = computed(() => Math.max(1, Math.ceil(total.value / PAGE_SIZE)))
@@ -356,6 +357,8 @@ async function applyTheme() {
root.classList.remove('dark', 'effect-mica', 'effect-acrylic', 'effect-normal')
root.classList.add(`effect-${effect}`)
if (isDark) root.classList.add('dark')
// 主题色:与主窗口共用同一份设置
applyStoredAccent(root, isDark ? 'dark' : 'light', STORAGE_KEYS.appSettings)
// 4. 设置窗口效果与背景色
// 弹窗窗口创建时 transparent=true,透明窗口下原生背景色不显示,
+4 -1
View File
@@ -3,6 +3,7 @@ import { ref, onMounted, onUnmounted } from 'vue'
import { listen, emit, type UnlistenFn } from '@tauri-apps/api/event'
import { getCurrentWindow, Effect, EffectState } from '@tauri-apps/api/window'
import { EVENTS, STORAGE_KEYS } from '@/lib/constants'
import { applyStoredAccent } from '@/lib/theme'
import { commands } from '@/lib/bindings'
import { ZoomIn, ZoomOut, FileText, Image as ImageIcon } from '@lucide/vue'
import { ScrollArea } from '@/components/ui/scroll-area'
@@ -14,7 +15,7 @@ const thumbSrc = ref('')
const fullSrc = ref('')
const enlarged = ref(false)
const loading = ref(false)
let unlistenFns: UnlistenFn[] = []
const unlistenFns: UnlistenFn[] = []
// 加载序号:连续悬停快速切换时丢弃过期请求结果
let loadSeq = 0
@@ -208,6 +209,8 @@ async function applyTheme() {
root.classList.remove('dark', 'effect-mica', 'effect-acrylic', 'effect-normal')
root.classList.add(`effect-${effect}`)
if (isDark) root.classList.add('dark')
// 主题色:与主窗口共用同一份设置
applyStoredAccent(root, isDark ? 'dark' : 'light', STORAGE_KEYS.appSettings)
try {
const tauriWin = getCurrentWindow()
await tauriWin.clearEffects()
+1 -1
View File
@@ -55,5 +55,5 @@ export const moduleConfig: ModuleConfig = {
defaultEnabled: true,
loader: () => import('./ClipboardModule.vue'),
searchItems,
order: 20
order: 80
}
+40 -16
View File
@@ -4,7 +4,6 @@ import { ArrowLeft, Search } from '@lucide/vue'
import { Input } from '@/components/ui/input'
import { Button } from '@/components/ui/button'
import { Card, CardContent } from '@/components/ui/card'
import { ScrollArea } from '@/components/ui/scroll-area'
import { Separator } from '@/components/ui/separator'
import { useSearchStore } from '@/stores/searchStore'
import { registerAllTools, TOOLS_META } from './tools'
@@ -77,21 +76,46 @@ watch(selectedId, () => {
</script>
<template>
<div class="h-full p-6 overflow-hidden flex flex-col">
<!--
# 滚动归属:只有主滚动区滚(2026-09-22 由内滚动改为外滚动)
此前本模块的列表页与详情页各自套一层 `ScrollArea`(`h-full overflow-hidden`
的模块根 + 内部滚动),与 monitor / music / clipboard / 设置页的形态不一致 ——
那些模块的模块根是 `min-h-full p-*`,整页在 ModuleContainer 的主滚动区里滚。
两套滚动归属混用会带来一串副作用:Tab 行/工具条要不要固定、内边距该加在
滚动容器根还是内层、卡片阴影被视口裁(`-mx-3 px-3` 就是在补这个)。
现在统一到外滚动:模块根 `min-h-full p-5`,内容自然增高,滚动交给主滚动区。
p-5 属于**滚动内容**(模块根在主滚动区内部),因此卡片阴影四周都有余量,
不再需要任何负外边距补偿。
工具自身需要限高的地方(正则结果、diff 输出等)仍保留各自的 `max-h-*` 内滚动
盒子 —— 那是「一块有边界的输出区」,与页面级滚动不是一回事。
-->
<div class="min-h-full p-5 flex flex-col">
<!-- 列表视图 -->
<template v-if="!selectedTool">
<div class="flex items-center gap-3 mb-4 shrink-0 flex-wrap">
<div class="flex items-center gap-3 mb-4 flex-wrap">
<div class="relative flex-1 min-w-[180px] max-w-xs">
<Search class="absolute left-2.5 top-1/2 -translate-y-1/2 size-4 text-muted-foreground" />
<Input v-model="query" placeholder="搜索工具..." class="h-8 pl-8 text-sm" />
</div>
<!--
分类筛选:选中态用主题色软底(与 SegmentedNav 及其余模块的筛选 chip 同一
口径)。此前写的是 `bg-secondary text-foreground` —— 灰底黑字读起来像
「禁用」,也是全项目唯一用实心灰表达选中的地方。
-->
<Button
v-for="cat in (['all', ...CATEGORY_ORDER] as const)"
:key="cat"
size="sm"
variant="ghost"
class="h-7 px-2.5 text-xs"
:class="category === cat ? 'bg-secondary text-foreground' : 'text-muted-foreground'"
:class="
category === cat
? 'bg-primary-soft font-medium text-primary-soft-text'
: 'text-fg-secondary hover:text-foreground'
"
@click="category = cat as typeof category"
>
{{ cat === 'all' ? '全部' : CATEGORY_LABEL[cat as DevTool['category']] }}
@@ -99,12 +123,16 @@ watch(selectedId, () => {
<span class="text-xs text-muted-foreground ml-auto">{{ (category === 'all' ? allTools : filteredTools).length }} 个工具</span>
</div>
<ScrollArea class="flex-1 min-h-0 -mr-3 pr-3">
<div v-if="filteredTools.length === 0" class="h-full flex items-center justify-center text-muted-foreground text-sm">
没有找到匹配的工具
</div>
<!-- 空态:flex-1 撑住剩余高度,短页面时也能垂直居中 -->
<div
v-if="filteredTools.length === 0"
class="flex-1 flex items-center justify-center text-muted-foreground text-sm"
>
没有找到匹配的工具
</div>
<!-- 按分类分组 -->
<!-- 按分类分组 -->
<div v-else>
<div v-for="group in groupedTools" :key="group.category" class="mb-5">
<div class="flex items-center gap-2 mb-2">
<span class="text-xs font-medium text-muted-foreground">{{ group.label }}</span>
@@ -129,12 +157,12 @@ watch(selectedId, () => {
</Card>
</div>
</div>
</ScrollArea>
</div>
</template>
<!-- 工具详情视图 -->
<template v-else>
<div class="flex items-center gap-3 mb-4 shrink-0">
<div class="flex items-center gap-3 mb-4">
<Button size="sm" variant="ghost" class="gap-1 h-8" @click="selectedId = null">
<ArrowLeft class="size-4" />
返回
@@ -147,11 +175,7 @@ watch(selectedId, () => {
<span class="text-xs text-muted-foreground leading-snug">{{ selectedTool.description }}</span>
</div>
</div>
<ScrollArea class="flex-1 min-h-0 -mr-3 pr-3">
<div class="max-w-3xl px-1 pb-6">
<component :is="selectedTool.component" />
</div>
</ScrollArea>
<component :is="selectedTool.component" />
</template>
</div>
</template>
@@ -58,7 +58,7 @@ const onInput = (v: string | number) => {
:title="copied ? '已复制' : '复制'"
@click="copy"
>
<Check v-if="copied" class="size-3.5 text-green-500" />
<Check v-if="copied" class="size-3.5 text-success" />
<Copy v-else class="size-3.5" />
</Button>
</div>
+1 -1
View File
@@ -23,5 +23,5 @@ export const moduleConfig: ModuleConfig = {
onEnable: async () => {},
onDisable: async () => {}
},
order: 60
order: 100
}
+7 -7
View File
@@ -12,7 +12,6 @@ type Tab = 'convert' | 'file'
const tab = ref<Tab>('convert')
const mode = ref<'encode' | 'decode'>('encode')
const input = ref('')
const error = ref('')
function encode(s: string): string {
const bytes = new TextEncoder().encode(s)
@@ -28,17 +27,18 @@ function decode(s: string): string {
return new TextDecoder().decode(bytes)
}
const output = computed(() => {
error.value = ''
// 一次试算同时产出结果与错误,computed 内保持无副作用
const result = computed(() => {
const v = input.value
if (!v) return ''
if (!v) return { out: '', err: '' }
try {
return mode.value === 'encode' ? encode(v) : decode(v)
return { out: mode.value === 'encode' ? encode(v) : decode(v), err: '' }
} catch (e) {
error.value = '解码失败:' + String(e)
return ''
return { out: '', err: '解码失败:' + String(e) }
}
})
const output = computed(() => result.value.out)
const error = computed(() => result.value.err)
const swap = () => {
if (output.value) {
+4 -4
View File
@@ -111,11 +111,11 @@ const unifiedText = computed(() => {
<div class="flex flex-col gap-4">
<div class="grid grid-cols-2 gap-3">
<div class="flex flex-col gap-1.5">
<Label class="text-xs text-red-500">旧文本(删除 {{ stats.dels }} 行)</Label>
<Label class="text-xs text-danger">旧文本(删除 {{ stats.dels }} 行)</Label>
<Textarea v-model="oldText" placeholder="旧文本..." class="min-h-[140px] font-mono text-xs resize-y" />
</div>
<div class="flex flex-col gap-1.5">
<Label class="text-xs text-green-500">新文本(新增 {{ stats.adds }} 行)</Label>
<Label class="text-xs text-success">新文本(新增 {{ stats.adds }} 行)</Label>
<Textarea v-model="newText" placeholder="新文本..." class="min-h-[140px] font-mono text-xs resize-y" />
</div>
</div>
@@ -130,8 +130,8 @@ const unifiedText = computed(() => {
:key="i"
class="flex whitespace-pre px-2 py-0.5"
:class="{
'bg-red-500/10 text-red-600 dark:text-red-400': l.op === 'del',
'bg-green-500/10 text-green-600 dark:text-green-400': l.op === 'add',
'bg-danger-soft text-danger-text': l.op === 'del',
'bg-success-soft text-success-text': l.op === 'add',
'text-muted-foreground': l.op === 'equal'
}"
>
@@ -118,11 +118,11 @@ const MIMES: MimeDef[] = [
]
const STATUS_CLASS: Record<string, string> = {
'1xx': 'bg-sky-500/10 text-sky-600 dark:text-sky-400 border-sky-500/30',
'2xx': 'bg-green-500/10 text-green-600 dark:text-green-400 border-green-500/30',
'3xx': 'bg-blue-500/10 text-blue-600 dark:text-blue-400 border-blue-500/30',
'4xx': 'bg-amber-500/10 text-amber-600 dark:text-amber-400 border-amber-500/30',
'5xx': 'bg-red-500/10 text-red-600 dark:text-red-400 border-red-500/30'
'1xx': 'bg-info-soft text-info-text border-info/30',
'2xx': 'bg-success-soft text-success-text border-success/30',
'3xx': 'bg-info-soft text-info-text border-info/30',
'4xx': 'bg-warning-soft text-warning-text border-warning/30',
'5xx': 'bg-danger-soft text-danger-text border-danger/30'
}
const statusGroups = computed(() => {
+1 -1
View File
@@ -128,7 +128,7 @@ const converted = computed(() => {
<template v-if="cidr">
<p v-if="cidr.error" class="text-xs text-destructive">{{ cidr.error }}</p>
<template v-else>
<p v-if="!cidr.ipIsNetwork" class="text-xs text-amber-600 dark:text-amber-400">
<p v-if="!cidr.ipIsNetwork" class="text-xs text-warning-text">
注意:输入地址不是该子网的网络地址,已按网络 {{ cidr.network }}/{{ cidr.prefix }} 计算。
</p>
<div class="rounded-md border border-border divide-y divide-border text-xs">
+1 -1
View File
@@ -88,7 +88,7 @@ function normalizeReplacer(sort: boolean): (this: unknown, key: string, value: u
</div>
<div v-if="isValid !== false" class="flex items-center gap-2 text-xs">
<span v-if="isValid === true" class="text-green-600 dark:text-green-400">✓ 合法 JSON</span>
<span v-if="isValid === true" class="text-success-text">✓ 合法 JSON</span>
</div>
<ResultArea :text="output" placeholder="结果" />
<p v-if="error" class="text-xs text-destructive break-all">{{ error }}</p>
+15 -13
View File
@@ -6,7 +6,6 @@ import { Badge } from '@/components/ui/badge'
import ResultArea from '../components/ResultArea.vue'
const token = ref('')
const error = ref('')
function base64UrlDecode(s: string): string {
const cleaned = s.replace(/-/g, '+').replace(/_/g, '/')
@@ -24,30 +23,33 @@ interface TimeClaim {
status: 'ok' | 'expired' | 'not-yet' | 'unknown'
}
const parsed = computed<{
// 一次解析同时产出数据与错误,computed 内保持无副作用
const parsedResult = computed<{ data: {
header: string
payload: string
signature: string
timeClaims: TimeClaim[]
} | null>(() => {
error.value = ''
} | null; err: string }>(() => {
const t = token.value.trim()
if (!t) return null
if (!t) return { data: null, err: '' }
const parts = t.split('.')
if (parts.length < 2) {
error.value = 'JWT 格式不正确(应为 header.payload.signature)'
return null
return { data: null, err: 'JWT 格式不正确(应为 header.payload.signature)' }
}
try {
const header = formatJson(base64UrlDecode(parts[0]))
const payload = formatJson(base64UrlDecode(parts[1]))
const signature = parts[2] ?? ''
return { header, payload, signature, timeClaims: parseTimeClaims(payload) }
return {
data: { header, payload, signature, timeClaims: parseTimeClaims(payload) },
err: ''
}
} catch (e) {
error.value = '解码失败:' + String(e)
return null
return { data: null, err: '解码失败:' + String(e) }
}
})
const parsed = computed(() => parsedResult.value.data)
const error = computed(() => parsedResult.value.err)
function formatJson(s: string): string {
let pretty = s
@@ -90,9 +92,9 @@ function parseTimeClaims(payload: string): TimeClaim[] {
const STATUS_BADGE: Record<TimeClaim['status'], { label: string; class: string } | null> = {
ok: null,
expired: { label: '已过期', class: 'bg-red-500/10 text-red-600 dark:text-red-400 border-red-500/30' },
'not-yet': { label: '尚未生效', class: 'bg-amber-500/10 text-amber-600 dark:text-amber-400 border-amber-500/30' },
unknown: { label: '签发时间在未来(时钟偏差?)', class: 'bg-amber-500/10 text-amber-600 dark:text-amber-400 border-amber-500/30' }
expired: { label: '已过期', class: 'bg-danger-soft text-danger-text border-danger/30' },
'not-yet': { label: '尚未生效', class: 'bg-warning-soft text-warning-text border-warning/30' },
unknown: { label: '签发时间在未来(时钟偏差?)', class: 'bg-warning-soft text-warning-text border-warning/30' }
}
</script>
+4 -4
View File
@@ -73,10 +73,10 @@ const entropy = computed(() => {
const strength = computed(() => {
const e = entropy.value
if (e >= 128) return { label: '极强(128+ bit)', class: 'text-green-600 dark:text-green-400' }
if (e >= 80) return { label: '强(80-127 bit)', class: 'text-green-600 dark:text-green-400' }
if (e >= 60) return { label: '中等(60-79 bit)', class: 'text-amber-600 dark:text-amber-400' }
return { label: '弱(<60 bit)', class: 'text-red-600 dark:text-red-400' }
if (e >= 128) return { label: '极强(128+ bit)', class: 'text-success-text' }
if (e >= 80) return { label: '强(80-127 bit)', class: 'text-success-text' }
if (e >= 60) return { label: '中等(60-79 bit)', class: 'text-warning-text' }
return { label: '弱(<60 bit)', class: 'text-danger-text' }
})
function generate() {
+11 -6
View File
@@ -17,7 +17,6 @@ const bases: { value: Radix; label: string }[] = [
const from = ref<Radix>('10')
const to = ref<Radix>('16')
const input = ref('')
const error = ref('')
const RADIX_MAP: Record<Radix, number> = { '2': 2, '8': 8, '10': 10, '16': 16 }
@@ -37,23 +36,29 @@ function parseBigInt(s: string, radix: number): bigint {
return negative ? -n : n
}
// 一次试算同时产出结果与错误,computed 内保持无副作用
const result = computed(() => {
error.value = ''
const v = input.value.trim()
if (!v) return { dec: null, output: '', outputUppercase: '' }
if (!v) return { dec: null, output: '', outputUppercase: '', err: '' }
try {
const parsed = parseBigInt(v, RADIX_MAP[from.value])
const out = parsed.toString(RADIX_MAP[to.value])
return {
dec: parsed,
output: out,
outputUppercase: to.value === '16' ? out.toUpperCase() : out
outputUppercase: to.value === '16' ? out.toUpperCase() : out,
err: ''
}
} catch {
error.value = '输入不合法,请确认数字与当前进制匹配(如十六进制仅含 0-9a-f)'
return { dec: null, output: '', outputUppercase: '' }
return {
dec: null,
output: '',
outputUppercase: '',
err: '输入不合法,请确认数字与当前进制匹配(如十六进制仅含 0-9a-f)'
}
}
})
const error = computed(() => result.value.err)
</script>
<template>
+10 -6
View File
@@ -6,6 +6,7 @@ import { listen, type UnlistenFn } from '@tauri-apps/api/event'
import { Pause, Play, X, Minus, FolderOpen, AlertCircle, Loader2, XCircle } from '@lucide/vue'
import { commands, type DownloadTask, type Segment, type TaskStatus } from '@/lib/bindings'
import { STORAGE_KEYS } from '@/lib/constants'
import { applyStoredAccent } from '@/lib/theme'
import { createLogger } from '@/lib/logger'
const logger = createLogger('download-window')
@@ -68,6 +69,7 @@ const statusText = computed(() => {
case 'complete': return '已完成'
case 'error': return '出错'
case 'cancelled': return '已取消'
default: return ''
}
})
const statusTone = computed(() => {
@@ -175,6 +177,8 @@ async function applyTheme() {
root.classList.remove('dark', 'effect-mica', 'effect-acrylic', 'effect-normal')
root.classList.add(`effect-${effect}`)
if (isDark) root.classList.add('dark')
// 主题色:与主窗口共用同一份设置
applyStoredAccent(root, isDark ? 'dark' : 'light', STORAGE_KEYS.appSettings)
// 4. 设置窗口效果:mica/acrylic 下卡片透明,普通模式用不透明背景
try {
@@ -297,7 +301,7 @@ onUnmounted(() => {
<div class="dlw-titlebar" data-tauri-drag-region>
<div class="dlw-title-left" data-tauri-drag-region>
<Loader2 v-if="status === 'active'" class="size-3 shrink-0 animate-spin text-primary" />
<XCircle v-else-if="status === 'error'" class="size-3 shrink-0 text-red-500" />
<XCircle v-else-if="status === 'error'" class="size-3 shrink-0 text-danger" />
<Pause v-else class="size-3 shrink-0 text-muted-foreground" />
<span v-if="loading" class="text-xs font-medium text-muted-foreground">下载</span>
<span v-else-if="task" class="dlw-title-name" :title="task.filename"
@@ -363,7 +367,7 @@ onUnmounted(() => {
</div>
</div>
<div v-if="actionError" class="mt-1.5 truncate text-right text-[10px] text-red-500" @click="clearErrorSoon">
<div v-if="actionError" class="mt-1.5 truncate text-right text-[10px] text-danger" @click="clearErrorSoon">
{{ actionError }}
</div>
</template>
@@ -460,8 +464,8 @@ onUnmounted(() => {
white-space: nowrap;
}
.dlw-status-badge.tone-active { background: var(--primary); color: var(--primary-foreground); }
.dlw-status-badge.tone-success { background: #10b981; color: #fff; }
.dlw-status-badge.tone-destructive { background: #ef4444; color: #fff; }
.dlw-status-badge.tone-success { background: var(--success); color: #fff; }
.dlw-status-badge.tone-destructive { background: var(--danger); color: #fff; }
.dlw-status-badge.tone-muted { background: var(--muted); color: var(--muted-foreground); }
.dlw-bar { height: 7px; border-radius: 999px; background: var(--muted); overflow: hidden; }
@@ -487,8 +491,8 @@ onUnmounted(() => {
white-space: nowrap;
}
.dlw-btn:hover { background: var(--accent); color: var(--accent-foreground); }
.dlw-btn-danger { color: #ef4444; }
.dlw-btn-danger:hover { background: rgb(239 68 68 / 0.12); color: #dc2626; }
.dlw-btn-danger { color: var(--danger); }
.dlw-btn-danger:hover { background: rgb(239 68 68 / 0.12); color: var(--danger); }
.dlw-btn-primary { background: var(--primary); color: var(--primary-foreground); border-color: transparent; }
/* hover 时显式保持前景色,避免被上面的 .dlw-btn:hover 覆盖成深色导致黑字黑底不可见 */
.dlw-btn-primary:hover { background: var(--primary); color: var(--primary-foreground); filter: brightness(1.05); }
+34 -96
View File
@@ -24,7 +24,7 @@ import { Input } from '@/components/ui/input'
import { Textarea } from '@/components/ui/textarea'
import { Label } from '@/components/ui/label'
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs'
import { Tabs, TabsContent } from '@/components/ui/tabs'
import { ScrollArea } from '@/components/ui/scroll-area'
import { Separator } from '@/components/ui/separator'
import { Progress } from '@/components/ui/progress'
@@ -44,11 +44,11 @@ const logger = createLogger('downloader')
// ===== 主 Tab 状态 =====
const activeTab = ref('tasks')
const tabsListRef = useModuleTabs('downloader', activeTab, [
useModuleTabs('downloader', activeTab, [
{ value: 'tasks', label: '下载任务' },
{ value: 'settings', label: '设置' },
{ value: 'extension', label: '浏览器扩展' }
])
], { alwaysVisible: true })
// 添加下载表单
const addUriText = ref('')
@@ -237,8 +237,6 @@ const SORT_OPTIONS: { label: string; value: SortField }[] = [
{ label: '下载大小', value: 'size' }
]
const running = computed(() => store.status.running)
// ===== 工具函数 =====
/** BT 第 i 个文件已下载字节(progress 事件把每文件进度写入 segments[i].completed) */
const btFileDownloaded = (task: DownloadTask, i: number): number =>
@@ -347,7 +345,7 @@ const handleResume = async (id: string) => {
// ===== 取消下载(参考下载窗口:二次点击确认,3 秒内未二次点击则取消)=====
const cancelArmed = ref<Record<string, boolean>>({})
let cancelArmTimers: Record<string, number> = {}
const cancelArmTimers: Record<string, number> = {}
const handleCancel = (id: string) => {
if (cancelArmed.value[id]) {
// 二次点击:执行取消
@@ -813,13 +811,6 @@ onUnmounted(() => {
const allTasks = computed<DownloadTask[]>(() => store.tasks)
// 状态栏计数:单次遍历统计各状态任务数(替代模板内 4 次 filter 全量扫描)
const statusCounts = computed(() => {
const counts: Record<TaskStatus, number> = { queued: 0, active: 0, paused: 0, complete: 0, error: 0, cancelled: 0 }
for (const t of allTasks.value) counts[t.status]++
return counts
})
// 状态筛选
const filteredByStatus = computed<DownloadTask[]>(() => {
if (statusFilter.value === 'all') return allTasks.value
@@ -878,79 +869,11 @@ const toggleSortOrder = () => {
</script>
<template>
<div class="h-full p-6 overflow-hidden flex flex-col">
<Tabs v-model="activeTab" class="h-full flex flex-col">
<div ref="tabsListRef">
<TabsList class="grid w-full grid-cols-3 max-w-md !bg-transparent !p-0 !shadow-none">
<TabsTrigger value="tasks" class="gap-1.5">
<ListChecks class="size-4" />
下载任务
</TabsTrigger>
<TabsTrigger value="settings" class="gap-1.5">
<SettingsIcon class="size-4" />
设置
</TabsTrigger>
<TabsTrigger value="extension" class="gap-1.5">
<Puzzle class="size-4" />
浏览器扩展
</TabsTrigger>
</TabsList>
</div>
<div class="min-h-full p-5 flex flex-col">
<Tabs v-model="activeTab" class="flex flex-col">
<!-- ===== 下载任务 ===== -->
<TabsContent value="tasks" class="flex-1 mt-4 min-h-0 min-w-0 tab-animate">
<TabsContent value="tasks" class="flex-1 min-h-0 min-w-0 tab-animate">
<div class="h-full flex flex-col gap-4 min-w-0">
<!-- 状态栏 -->
<Card class="shrink-0 !py-0 !gap-0">
<CardContent class="pl-4 pr-4 py-3">
<div class="flex items-center justify-between flex-wrap gap-3">
<div class="flex items-center gap-3">
<div class="flex items-center gap-2">
<div
class="h-2.5 w-2.5 rounded-full"
:class="running ? 'bg-green-500 animate-pulse' : 'bg-muted-foreground'"
/>
<span class="text-sm font-medium">
下载引擎 {{ running ? '运行中' : '已停止' }}
</span>
</div>
<Separator orientation="vertical" class="h-5" />
<div v-if="running" class="flex items-center gap-2 text-xs">
<Badge variant="secondary" class="gap-1">
<Download class="size-3" />
下载中 {{ statusCounts.active }}
</Badge>
<Badge variant="secondary" class="gap-1">
<Clock class="size-3" />
等待 {{ statusCounts.queued }}
</Badge>
<Badge v-if="statusCounts.paused > 0" variant="secondary" class="gap-1">
<Pause class="size-3" />
已暂停 {{ statusCounts.paused }}
</Badge>
<Badge variant="secondary" class="gap-1">
<Check class="size-3" />
已完成 {{ statusCounts.complete }}
</Badge>
<Badge v-if="statusCounts.cancelled > 0" variant="secondary" class="gap-1">
<XCircle class="size-3" />
已取消 {{ statusCounts.cancelled }}
</Badge>
</div>
</div>
<div class="flex items-center gap-2">
<Button
size="sm"
variant="ghost"
@click="store.refreshTasks()"
>
<RefreshCw class="size-4" />
</Button>
</div>
</div>
</CardContent>
</Card>
<!-- 工具栏:筛选 / 排序 / 搜索 -->
<div class="shrink-0 flex items-center gap-2 flex-wrap">
<!-- 新建下载按钮 -->
@@ -1052,13 +975,28 @@ const toggleSortOrder = () => {
下载设置
</Button>
<!-- 手动刷新任务列表(横幅移除后保留,事件漏收时可兜底) -->
<Tooltip>
<TooltipTrigger as-child>
<Button
size="sm"
variant="outline"
class="size-8 p-0 bg-transparent"
@click="store.refreshTasks()"
>
<RefreshCw class="size-4" />
</Button>
</TooltipTrigger>
<TooltipContent>刷新任务列表</TooltipContent>
</Tooltip>
<span class="text-xs text-muted-foreground ml-auto">
共 {{ sortedTasks.length }} 个任务
</span>
</div>
<!-- 任务列表 -->
<ScrollArea class="flex-1 min-h-0 min-w-0">
<div class="flex-1 min-h-0 min-w-0">
<div v-if="pagedTasks.length === 0" key="empty" class="h-full flex flex-col items-center justify-center text-muted-foreground gap-2 pt-10">
<CheckCircle2 class="size-16 opacity-30" />
<p>暂无符合条件的任务</p>
@@ -1093,7 +1031,7 @@ const toggleSortOrder = () => {
<span>
{{ formatSize(task.completedSize) }} / {{ formatTotalSize(task.totalSize) }}
</span>
<span v-if="task.status === 'active'" class="flex items-center gap-1 text-green-600 dark:text-green-400">
<span v-if="task.status === 'active'" class="flex items-center gap-1 text-success-text">
<Download class="size-3" />
{{ formatSpeed(task.speed) }}
</span>
@@ -1287,14 +1225,14 @@ const toggleSortOrder = () => {
<TooltipContent>最后一页</TooltipContent>
</Tooltip>
</div>
</ScrollArea>
</div>
</div>
</TabsContent>
<!-- ===== 设置 ===== -->
<TabsContent value="settings" class="flex-1 mt-4 min-h-0 tab-animate">
<ScrollArea class="h-full pr-3">
<div class="flex flex-col gap-4 pb-4 max-w-2xl">
<TabsContent value="settings" class="flex-1 min-h-0 tab-animate">
<div>
<div class="flex flex-col gap-4 pb-4">
<!-- 下载设置 -->
<Card>
<CardHeader>
@@ -1482,13 +1420,13 @@ const toggleSortOrder = () => {
</CardContent>
</Card>
</div>
</ScrollArea>
</div>
</TabsContent>
<!-- ===== 浏览器扩展 ===== -->
<TabsContent value="extension" class="flex-1 mt-4 min-h-0 tab-animate">
<ScrollArea class="h-full pr-3">
<div class="flex flex-col gap-4 pb-4 max-w-2xl">
<TabsContent value="extension" class="flex-1 min-h-0 tab-animate">
<div>
<div class="flex flex-col gap-4 pb-4">
<Card>
<CardHeader>
<CardTitle class="flex items-center gap-2 text-base">
@@ -1623,7 +1561,7 @@ const toggleSortOrder = () => {
</CardContent>
</Card>
</div>
</ScrollArea>
</div>
</TabsContent>
</Tabs>
@@ -1879,7 +1817,7 @@ const toggleSortOrder = () => {
<AlertDialogContent class="max-w-md">
<AlertDialogHeader>
<AlertDialogTitle class="flex items-center gap-2">
<AlertCircle class="size-4 text-amber-500" />
<AlertCircle class="size-4 text-warning" />
下载重复提醒
</AlertDialogTitle>
<AlertDialogDescription class="text-xs">
+1 -1
View File
@@ -64,5 +64,5 @@ export const moduleConfig: ModuleConfig = {
// 模块禁用时不停止引擎(引擎在应用退出时统一清理)
}
},
order: 50
order: 30
}
+157 -106
View File
@@ -5,7 +5,7 @@ import {
ShieldCheck, ShieldOff, Zap, Thermometer, Clock, ChevronDown,
ArrowDown, ArrowUp, Wifi, FolderOpen, Copy, ListChecks,
Monitor as MonitorIcon, GripVertical, SlidersHorizontal,
Eye, EyeOff, MousePointerClick, Plus, PencilLine,
Eye, EyeOff, MousePointerClick, Check, PencilLine,
CircuitBoard, BatteryFull, Gamepad2,
} from '@lucide/vue'
import type { LucideIcon } from '@lucide/vue'
@@ -33,7 +33,7 @@ import OverviewCard, { type OverviewCardView } from './OverviewCard.vue'
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
import { Button } from '@/components/ui/button'
import { Badge } from '@/components/ui/badge'
import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs'
import { Tabs, TabsContent } from '@/components/ui/tabs'
import { ScrollArea } from '@/components/ui/scroll-area'
import { Accordion, AccordionItem, AccordionTrigger, AccordionContent } from '@/components/ui/accordion'
import { Progress } from '@/components/ui/progress'
@@ -50,12 +50,12 @@ const store = useMonitorStore()
// ===== Tab 配置(注册到 TitleBar 浮动切换器) =====
const activeTab = ref('overview')
const tabsListRef = useModuleTabs('monitor', activeTab, [
useModuleTabs('monitor', activeTab, [
{ value: 'overview', label: '概览' },
{ value: 'details', label: '详细' },
{ value: 'osd', label: 'OSD 显示' },
{ value: 'settings', label: '设置' },
])
], { alwaysVisible: true })
// ===== 关键指标 computed =====
@@ -248,8 +248,14 @@ function saveOverviewCards() {
/** 编辑模式:显示拖拽把手/移除按钮,启用拖拽排序 */
const overviewEditing = ref(false)
/** 添加卡片 Popover 开关 */
const overviewAddOpen = ref(false)
/**
* 「布局」Popover 开关(编辑模式 + 添加卡片)。
*
* 两件事合并进同一个 popover:它们都是**对概览卡片集合的操作**,此前各占一个
* 文字按钮(「编辑布局」「添加卡片」),把横幅挤成了两行 —— 而横幅的规范是
* 「状态区 → 指标区 → 操作区」一行常驻(UI_DESIGN_SYSTEM §3.4)。
*/
const overviewEditOpen = ref(false)
/** 尚未添加的卡片(添加菜单内容) */
const addableOverviewCards = computed(() =>
@@ -260,7 +266,7 @@ function addOverviewCard(id: OverviewCardId) {
if (overviewCards.value.includes(id)) return
overviewCards.value.push(id)
saveOverviewCards()
overviewAddOpen.value = false
overviewEditOpen.value = false
}
function removeOverviewCard(id: string) {
@@ -330,8 +336,8 @@ function buildOverviewCardView(id: OverviewCardId): OverviewCardView {
case 'network':
return {
id, title: '网络', icon: Wifi,
main: { label: '下载', labelIcon: ArrowDown, text: downSpeed.value.value, unit: downSpeed.value.unit, colorClass: 'text-sky-500' },
subs: [{ label: '上传', labelIcon: ArrowUp, text: upSpeed.value.value, unit: upSpeed.value.unit, colorClass: 'text-violet-500' }],
main: { label: '下载', labelIcon: ArrowDown, text: downSpeed.value.value, unit: downSpeed.value.unit, colorClass: 'text-info' },
subs: [{ label: '上传', labelIcon: ArrowUp, text: upSpeed.value.value, unit: upSpeed.value.unit, colorClass: 'text-data-up' }],
load: null,
}
case 'storage':
@@ -376,12 +382,13 @@ const overviewCardViews = computed<OverviewCardView[]>(() =>
)
// ===== 连接状态徽章 =====
const stateMeta: Record<ConnectionState, { text: string; class: string }> = {
idle: { text: '未启动', class: 'bg-muted text-muted-foreground' },
loading: { text: '启动中', class: 'bg-yellow-500/15 text-yellow-600 dark:text-yellow-400' },
connected: { text: '已连接', class: 'bg-emerald-500/15 text-emerald-600 dark:text-emerald-400' },
disconnected: { text: '已断开', class: 'bg-orange-500/15 text-orange-600 dark:text-orange-400' },
error: { text: '错误', class: 'bg-red-500/15 text-red-600 dark:text-red-400' },
/** 横幅状态区用:状态点颜色 + 状态文字颜色(规范 §3.4 = 状态点 8px + 状态文字 13px/500) */
const stateMeta: Record<ConnectionState, { text: string; dot: string; textClass: string }> = {
idle: { text: '未启动', dot: 'bg-muted-foreground', textClass: 'text-muted-foreground' },
loading: { text: '启动中', dot: 'bg-warning', textClass: 'text-warning' },
connected: { text: '已连接', dot: 'bg-success', textClass: 'text-success' },
disconnected: { text: '已断开', dot: 'bg-warning', textClass: 'text-warning' },
error: { text: '错误', dot: 'bg-danger', textClass: 'text-danger' },
}
// ===== 分组列表(详细页用) =====
@@ -1342,20 +1349,11 @@ watch(() => store.status?.ready, (ready, prev) => {
</script>
<template>
<div class="h-full p-6">
<Tabs v-model="activeTab" class="h-full flex flex-col">
<div ref="tabsListRef">
<TabsList class="grid w-full max-w-md grid-cols-4 !bg-transparent !p-0 !shadow-none">
<TabsTrigger value="overview" class="gap-1.5"><Activity class="size-3.5" />概览</TabsTrigger>
<TabsTrigger value="details" class="gap-1.5"><Gauge class="size-3.5" />详细</TabsTrigger>
<TabsTrigger value="osd" class="gap-1.5"><MonitorIcon class="size-3.5" />OSD</TabsTrigger>
<TabsTrigger value="settings" class="gap-1.5"><SettingsIcon class="size-3.5" />设置</TabsTrigger>
</TabsList>
</div>
<div class="min-h-full p-5">
<Tabs v-model="activeTab" class="flex flex-col">
<!-- ===== 概览 ===== -->
<TabsContent value="overview" class="flex-1 mt-4 tab-animate">
<ScrollArea class="h-full pr-3">
<TabsContent value="overview" class="flex-1 tab-animate">
<div>
<!-- 加载中占位(仅首次初始化前显示) -->
<div v-if="!store.initialized" key="initializing" class="h-full flex flex-col items-center justify-center text-muted-foreground gap-2 pt-10">
<Loader2 class="size-8 animate-spin" />
@@ -1363,40 +1361,59 @@ watch(() => store.status?.ready, (ready, prev) => {
</div>
<template v-else>
<!-- ===== Kernel 状态栏(置顶紧凑横条) ===== -->
<Card class="py-0 gap-0 mb-2.5">
<CardContent class="px-3.5 py-2 flex flex-wrap items-center gap-x-3 gap-y-1.5 text-xs">
<span class="flex items-center gap-1.5 font-medium text-sm">
<Activity class="size-4 text-primary" />Kernel
</span>
<span :class="['px-2 py-0.5 rounded-full', stateMeta[store.connState].class]">
{{ stateMeta[store.connState].text }}
</span>
<Badge :variant="store.snapshot?.isAdmin ? 'default' : 'outline'" :class="store.snapshot?.isAdmin ? 'bg-emerald-500 hover:bg-emerald-500' : ''">
{{ store.snapshot?.isAdmin ? '管理员' : '普通' }}
</Badge>
<Badge v-if="store.status?.thingElevated" variant="outline" class="border-emerald-500/50 text-emerald-600 dark:text-emerald-400">
<ShieldCheck class="size-2.5 mr-0.5" />提权
</Badge>
<span class="text-muted-foreground">PID: <span class="font-mono text-foreground">{{ store.status?.pid ?? '--' }}</span></span>
<span class="text-muted-foreground">传感器: <span class="font-mono text-foreground">{{ store.status?.sensorCount ?? '--' }}</span></span>
<span class="text-muted-foreground">重启: <span class="font-mono text-foreground">{{ store.status?.restartCount ?? 0 }}</span></span>
<span class="text-muted-foreground">事件: <span class="font-mono text-foreground">{{ store.eventCount }}</span></span>
<div class="flex items-center gap-1.5 ml-auto">
<!-- ===== Kernel 状态横幅:状态区 → 指标区 → 操作区(UI_DESIGN_SYSTEM §3.4) ===== -->
<Card class="!py-0 !gap-0 mb-2.5">
<CardContent class="flex flex-wrap items-center gap-x-6 gap-y-3 px-4 py-4">
<!-- 状态区:状态点 8px + 状态文字 13px/500 + 进程名 13px 次要色 -->
<div class="flex flex-wrap items-center gap-2.5">
<span class="flex items-center gap-1.5 text-[13px] font-medium" :class="stateMeta[store.connState].textClass">
<span
class="size-2 rounded-full"
:class="[stateMeta[store.connState].dot, store.connState === 'connected' && 'status-dot-pulse']"
/>{{ stateMeta[store.connState].text }}
</span>
<span class="text-[13px] text-fg-secondary">ThingHK</span>
<Badge :variant="store.snapshot?.isAdmin ? 'default' : 'outline'" :class="store.snapshot?.isAdmin ? 'bg-success hover:bg-success' : ''">
{{ store.snapshot?.isAdmin ? '管理员' : '普通' }}
</Badge>
<Badge v-if="store.status?.thingElevated" variant="outline" class="border-success/50 text-success-text">
<ShieldCheck class="size-2.5 mr-0.5" />提权
</Badge>
</div>
<!-- 指标区:核心属性同样占一个指标位(label 11px 灰 + 数值 18px/600 tabular-nums) -->
<div class="flex flex-wrap items-center gap-6">
<div class="flex min-w-20 flex-col gap-0.5">
<span class="text-[11px] text-muted-foreground">PID</span>
<span class="text-lg font-semibold tabular-nums text-foreground">{{ store.status?.pid ?? '—' }}</span>
</div>
<div class="flex min-w-12 flex-col gap-0.5">
<span class="text-[11px] text-muted-foreground">传感器</span>
<span class="text-lg font-semibold tabular-nums text-foreground">{{ store.status?.sensorCount ?? 0 }}</span>
</div>
<div class="flex min-w-12 flex-col gap-0.5">
<span class="text-[11px] text-muted-foreground">重启</span>
<span class="text-lg font-semibold tabular-nums text-foreground">{{ store.status?.restartCount ?? 0 }}</span>
</div>
<div class="flex min-w-12 flex-col gap-0.5">
<span class="text-[11px] text-muted-foreground">事件</span>
<span class="text-lg font-semibold tabular-nums text-foreground">{{ store.eventCount }}</span>
</div>
</div>
<div class="ml-auto flex flex-wrap items-center gap-1.5">
<!-- 启动中 loading(starting=true 但状态还没变为 loading 时显示) -->
<Button v-if="store.starting && store.connState === 'idle'" size="xs" variant="outline" disabled>
<Loader2 class="size-3 animate-spin" />启动中
<Button v-if="store.starting && store.connState === 'idle'" size="sm" variant="outline" disabled>
<Loader2 class="size-3.5 animate-spin" />启动中
</Button>
<!-- 启动按钮(未运行且非启动中时显示) -->
<Button v-if="store.connState === 'idle' && !store.starting" size="xs" :disabled="store.starting" @click="handleStart">
<Play class="size-3" />启动
<Button v-if="store.connState === 'idle' && !store.starting" size="sm" :disabled="store.starting" @click="handleStart">
<Play class="size-3.5" />启动
</Button>
<!-- 提权按钮(标志未启用时显示:设置标志 + 以管理员权限重启 Thing) -->
<Tooltip v-if="!store.elevateOnLaunch">
<TooltipTrigger as-child>
<Button size="xs" variant="outline" class="gap-1 text-emerald-600 dark:text-emerald-400 border-emerald-500/40 hover:bg-emerald-500/10" :disabled="store.starting" @click="handleElevateSelf">
<Loader2 v-if="store.starting" class="size-3 animate-spin" />
<ShieldCheck v-else class="size-3" />提权
<Button size="sm" variant="outline" class="gap-1 text-success-text border-success/40 hover:bg-success/10" :disabled="store.starting" @click="handleElevateSelf">
<Loader2 v-if="store.starting" class="size-3.5 animate-spin" />
<ShieldCheck v-else class="size-3.5" />提权
</Button>
</TooltipTrigger>
<TooltipContent class="max-w-[480px] break-words">以管理员权限重启 Thing(弹 UAC,ThingHK 子进程继承权限,后续启动自动提权,崩溃自动重启)</TooltipContent>
@@ -1404,36 +1421,70 @@ watch(() => store.status?.ready, (ready, prev) => {
<!-- 取消提权按钮(标志已启用时显示:清除标志,下次启动不触发 UAC) -->
<Tooltip v-else>
<TooltipTrigger as-child>
<Button size="xs" variant="outline" class="gap-1 text-muted-foreground hover:text-foreground" @click="handleCancelElevation">
<ShieldOff class="size-3" />取消提权
<Button size="sm" variant="outline" class="gap-1 text-muted-foreground hover:text-foreground" @click="handleCancelElevation">
<ShieldOff class="size-3.5" />取消提权
</Button>
</TooltipTrigger>
<TooltipContent class="max-w-[480px] break-words">取消提权,下次启动将以普通权限运行(不影响当前会话)</TooltipContent>
</Tooltip>
<Button size="xs" variant="outline" :disabled="store.starting || store.stopping || store.connState === 'idle'" @click="handleRefresh">
<RefreshCw class="size-3" />刷新
<!--
刷新:图标按钮(原来是与启动/停止同级的文字按钮,把操作区撑宽
近一个按钮的宽度)。语义交给 Tooltip,与其它图标按钮一致。
-->
<Tooltip>
<TooltipTrigger as-child>
<Button
variant="outline"
size="icon-sm"
:disabled="store.starting || store.stopping || store.connState === 'idle'"
@click="handleRefresh"
>
<RefreshCw class="size-3.5" />
</Button>
</TooltipTrigger>
<TooltipContent>刷新传感器数据</TooltipContent>
</Tooltip>
<Button size="sm" variant="destructive" :disabled="store.starting || store.stopping || store.connState === 'idle'" @click="handleStop">
<Square class="size-3.5" />停止
</Button>
<Button size="xs" variant="outline" :disabled="store.starting || store.stopping || store.connState === 'idle'" @click="handleStop">
<Square class="size-3" />停止
</Button>
<Separator orientation="vertical" class="h-4 mx-0.5" />
<!-- 编辑布局开关:拖拽排序 / 删除卡片 -->
<Button
size="xs"
:variant="overviewEditing ? 'default' : 'outline'"
:title="overviewEditing ? '完成编辑' : '编辑卡片布局(拖拽排序 / 删除)'"
@click="overviewEditing = !overviewEditing"
>
<PencilLine class="size-3" />{{ overviewEditing ? '完成' : '编辑布局' }}
</Button>
<!-- 添加卡片 -->
<Popover v-model:open="overviewAddOpen">
<Separator orientation="vertical" class="h-5 mx-0.5" />
<!--
布局:编辑模式(拖拽排序 / 移除)+ 添加卡片 收进一个图标按钮的
popover。两件事都属于「卡片集合的操作」,低频且互斥于运行控制,
各占一个文字按钮只会把横幅挤成两行。
按钮在编辑态用主题色软底提示「正在编辑」。
-->
<Popover v-model:open="overviewEditOpen">
<PopoverTrigger as-child>
<Button size="xs" variant="outline" :disabled="!addableOverviewCards.length" title="添加硬件卡片">
<Plus class="size-3" />添加卡片
<Button
variant="outline"
size="icon-sm"
title="编辑卡片布局 / 添加卡片"
:class="
overviewEditing
? 'border-primary/40 bg-primary-soft text-primary-soft-text'
: ''
"
>
<PencilLine class="size-3.5" />
</Button>
</PopoverTrigger>
<PopoverContent class="w-64 p-1.5" align="end">
<!-- 编辑布局开关:点完即收起 popover(编辑态的反馈在卡片本身:把手与移除按钮出现) -->
<button
class="w-full flex items-center gap-2.5 rounded-md px-2.5 py-2 text-sm hover:bg-accent transition-colors text-left"
@click="overviewEditing = !overviewEditing; overviewEditOpen = false"
>
<PencilLine class="size-4 text-primary shrink-0" />
<span class="min-w-0 flex-1">
<span class="block">{{ overviewEditing ? '完成编辑' : '编辑卡片布局' }}</span>
<span class="block text-xs text-muted-foreground">拖拽排序、移除卡片</span>
</span>
<Check v-if="overviewEditing" class="size-4 text-primary shrink-0" />
</button>
<Separator class="my-1" />
<p class="px-2.5 pb-0.5 pt-1 text-[11px] font-medium text-muted-foreground">添加卡片</p>
<button
v-for="c in addableOverviewCards"
:key="c.id"
@@ -1454,11 +1505,11 @@ watch(() => store.status?.ready, (ready, prev) => {
</Card>
<!-- PawnIO 驱动缺失提示(提权但驱动未装 → CPU 温度/功耗无法读取) -->
<Card v-if="store.pawnIoMissing" class="py-0 gap-0 mb-2.5 !border-amber-500/40 bg-amber-500/10">
<CardContent class="px-3.5 py-2 flex flex-wrap items-center gap-2 text-xs text-amber-600 dark:text-amber-400">
<Card v-if="store.pawnIoMissing" class="py-0 gap-0 mb-2.5 !border-warning/40 bg-warning-soft">
<CardContent class="px-3.5 py-2 flex flex-wrap items-center gap-2 text-xs text-warning-text">
<AlertTriangle class="size-4 shrink-0" />
<span class="flex-1 min-w-[200px]">检测到 PawnIO 驱动未安装,CPU 温度/功耗可能无法读取(误卸载过 PawnIO 等情况会触发)。点击下方按钮自动安装并重启监控内核。</span>
<Button size="xs" variant="outline" class="shrink-0 text-amber-600 dark:text-amber-400 border-amber-500/40 hover:bg-amber-500/10" :disabled="store.starting || store.stopping || repairingPawnio" @click="handleRepairPawnio">
<Button size="xs" variant="outline" class="shrink-0 text-warning-text border-warning/40 hover:bg-warning/10" :disabled="store.starting || store.stopping || repairingPawnio" @click="handleRepairPawnio">
<Loader2 v-if="repairingPawnio" class="size-3 mr-1 animate-spin" />
<RefreshCw v-else class="size-3 mr-1" />
{{ repairingPawnio ? '修复中...' : '检测并修复' }}
@@ -1523,32 +1574,32 @@ watch(() => store.status?.ready, (ready, prev) => {
</VueDraggable>
<!-- 断线提示 -->
<Card v-if="store.connState === 'disconnected'" class="mt-2.5 border-orange-500/40 py-0 gap-0">
<Card v-if="store.connState === 'disconnected'" class="mt-2.5 border-warning/40 py-0 gap-0">
<CardContent class="pt-3 flex items-start gap-2 text-sm">
<AlertTriangle class="size-4 text-orange-500 mt-0.5 shrink-0" />
<AlertTriangle class="size-4 text-warning mt-0.5 shrink-0" />
<div>
<div class="font-medium text-orange-600 dark:text-orange-400">SSE 连接断开</div>
<div class="font-medium text-warning-text">SSE 连接断开</div>
<div class="text-xs text-muted-foreground mt-0.5">Kernel 可能正在重启,等待自动重连...</div>
</div>
</CardContent>
</Card>
<!-- 错误提示 -->
<Card v-if="store.errorMsg" class="mt-2.5 border-red-500/40 py-0 gap-0">
<Card v-if="store.errorMsg" class="mt-2.5 border-danger/40 py-0 gap-0">
<CardContent class="pt-3 flex items-start gap-2 text-sm">
<AlertTriangle class="size-4 text-red-500 mt-0.5 shrink-0" />
<AlertTriangle class="size-4 text-danger mt-0.5 shrink-0" />
<div>
<div class="font-medium text-red-600 dark:text-red-400">错误</div>
<div class="font-medium text-danger-text">错误</div>
<div class="text-xs font-mono mt-0.5 break-all">{{ store.errorMsg }}</div>
</div>
</CardContent>
</Card>
</template>
</ScrollArea>
</div>
</TabsContent>
<!-- ===== 详细 ===== -->
<TabsContent value="details" class="flex-1 mt-4 tab-animate">
<TabsContent value="details" class="flex-1 tab-animate">
<div v-if="!store.snapshot" key="no-snapshot" class="h-full flex flex-col items-center justify-center text-muted-foreground gap-2 pt-10">
<Gauge class="size-12 opacity-30" />
<p class="text-sm">无快照数据</p>
@@ -1558,7 +1609,7 @@ watch(() => store.status?.ready, (ready, prev) => {
</Button>
</div>
<ScrollArea v-else key="details-list" class="h-full pr-3">
<div v-else key="details-list">
<div class="flex items-center justify-between mb-3">
<p class="text-sm text-muted-foreground">{{ groups.length }} 个分组 / {{ store.status?.sensorCount ?? 0 }} 个传感器</p>
<Button size="xs" variant="outline" @click="store.fetchSnapshot()">
@@ -1582,7 +1633,7 @@ watch(() => store.status?.ready, (ready, prev) => {
<AccordionContent class="px-4 pb-3 pt-0">
<!-- 无传感器数据占位(硬件已启用但 LHB 未检测到传感器,通常因权限不足或硬件不支持) -->
<div v-if="!g.sensors.length" class="py-3 flex items-center gap-2 text-xs text-muted-foreground">
<AlertTriangle class="size-3.5 shrink-0 text-amber-500" />
<AlertTriangle class="size-3.5 shrink-0 text-warning" />
<span>未检测到传感器数据(可能需要管理员权限或硬件不支持)</span>
</div>
<div v-for="hwGroup in groupSensors(g.sensors)" :key="hwGroup.hardware" class="py-2 border-t first:border-t-0">
@@ -1611,13 +1662,13 @@ watch(() => store.status?.ready, (ready, prev) => {
</AccordionItem>
</Card>
</Accordion>
</ScrollArea>
</div>
</TabsContent>
<!-- ===== OSD 显示 ===== -->
<TabsContent value="osd" class="flex-1 mt-4 tab-animate">
<ScrollArea class="h-full pr-3">
<div class="max-w-2xl space-y-4 pb-4">
<TabsContent value="osd" class="flex-1 tab-animate">
<div>
<div class="space-y-4 pb-4">
<!-- 悬浮窗开关 -->
<Card>
<CardHeader>
@@ -1665,7 +1716,7 @@ watch(() => store.status?.ready, (ready, prev) => {
/>
</div>
<div v-if="!store.snapshot?.ready" class="flex items-start gap-2 text-xs text-amber-600 dark:text-amber-400 rounded-md border border-amber-500/30 bg-amber-500/5 p-2.5">
<div v-if="!store.snapshot?.ready" class="flex items-start gap-2 text-xs text-warning-text rounded-md border border-warning/30 bg-warning-soft p-2.5">
<AlertTriangle class="size-3.5 mt-0.5 shrink-0" />
<span>Kernel 未就绪,无法获取可用传感器列表。请先在概览页启动 Kernel。</span>
</div>
@@ -2234,13 +2285,13 @@ watch(() => store.status?.ready, (ready, prev) => {
<!-- 预览卡片已移除(用户可在桌面悬浮窗直接看实际效果) -->
</div>
</ScrollArea>
</div>
</TabsContent>
<!-- ===== 设置 ===== -->
<TabsContent value="settings" class="flex-1 mt-4 tab-animate">
<ScrollArea class="h-full pr-3">
<div class="max-w-2xl space-y-4 pb-4">
<TabsContent value="settings" class="flex-1 tab-animate">
<div>
<div class="space-y-4 pb-4">
<!-- 控制 -->
<Card>
<CardHeader>
@@ -2296,7 +2347,7 @@ watch(() => store.status?.ready, (ready, prev) => {
</div>
<div class="flex justify-between">
<span class="text-muted-foreground">已安装</span>
<Badge :variant="store.kernelInfo.exists ? 'default' : 'destructive'" :class="store.kernelInfo.exists ? 'bg-emerald-500 hover:bg-emerald-500' : ''">
<Badge :variant="store.kernelInfo.exists ? 'default' : 'destructive'" :class="store.kernelInfo.exists ? 'bg-success hover:bg-success' : ''">
{{ store.kernelInfo.exists ? '是' : '否' }}
</Badge>
</div>
@@ -2347,10 +2398,10 @@ watch(() => store.status?.ready, (ready, prev) => {
<div class="flex items-center justify-between">
<span>当前权限</span>
<div class="flex items-center gap-1.5">
<Badge :variant="store.snapshot?.isAdmin ? 'default' : 'outline'" :class="store.snapshot?.isAdmin ? 'bg-emerald-500 hover:bg-emerald-500' : ''">
<Badge :variant="store.snapshot?.isAdmin ? 'default' : 'outline'" :class="store.snapshot?.isAdmin ? 'bg-success hover:bg-success' : ''">
{{ store.snapshot?.isAdmin ? '管理员' : '普通' }}
</Badge>
<Badge v-if="store.status?.thingElevated" variant="outline" class="border-emerald-500/50 text-emerald-600 dark:text-emerald-400">
<Badge v-if="store.status?.thingElevated" variant="outline" class="border-success/50 text-success-text">
<ShieldCheck class="size-2.5 mr-0.5" />提权
</Badge>
</div>
@@ -2363,13 +2414,13 @@ watch(() => store.status?.ready, (ready, prev) => {
<!-- 提权说明 -->
<div class="space-y-2">
<div class="flex items-start gap-2">
<ShieldCheck class="size-3.5 mt-0.5 shrink-0 text-emerald-500" />
<ShieldCheck class="size-3.5 mt-0.5 shrink-0 text-success" />
<div class="text-xs">
<span class="font-medium text-foreground">提权</span>:以管理员权限重启 Thing 自身,ThingHK 子进程继承权限。标志持久化,后续每次启动自动触发 UAC;可在概览页点击"取消提权"关闭。ThingHK 崩溃由 ProcessManager 自动重启,避免数据停止后 Thing 不感知。
</div>
</div>
</div>
<p v-if="store.status?.thingElevated" class="text-xs leading-relaxed text-emerald-600 dark:text-emerald-400 flex items-start gap-1.5">
<p v-if="store.status?.thingElevated" class="text-xs leading-relaxed text-success-text flex items-start gap-1.5">
<ShieldCheck class="size-3.5 mt-0.5 shrink-0" />
<span>提权模式:Thing 与 ThingHK 均以管理员权限运行,ProcessManager 可直接 kill,崩溃自动重启可用。</span>
</p>
@@ -2396,7 +2447,7 @@ watch(() => store.status?.ready, (ready, prev) => {
</CardContent>
</Card>
</div>
</ScrollArea>
</div>
</TabsContent>
</Tabs>
</div>
@@ -2433,7 +2484,7 @@ watch(() => store.status?.ready, (ready, prev) => {
<label :for="'hw-' + hw.key" class="text-sm cursor-pointer truncate">{{ hw.name }}</label>
<span v-if="hw.key === 'motherboard'" class="text-[10px] text-muted-foreground/60">含 SuperIO/EC(自动联动)</span>
</div>
<Badge v-if="hw.requiresAdmin" variant="outline" class="text-[10px] shrink-0 text-amber-600 border-amber-500/40">
<Badge v-if="hw.requiresAdmin" variant="outline" class="text-[10px] shrink-0 text-warning-text border-warning/40">
需管理员
</Badge>
</div>
@@ -2478,7 +2529,7 @@ watch(() => store.status?.ready, (ready, prev) => {
<DialogContent class="max-w-md">
<DialogHeader>
<DialogTitle class="flex items-center gap-2">
<TriangleAlert class="size-4 text-amber-500" />
<TriangleAlert class="size-4 text-warning" />
需先启动监控内核
</DialogTitle>
<DialogDescription>
+1 -1
View File
@@ -325,7 +325,7 @@ const config = ref<OsdConfig | null>(null)
/** 数据通道:显示项 key→value 映射(由主窗口每秒推送,替代全量快照) */
const dataMap = ref<Record<string, number | null>>({})
const networkSpeed = ref<NetworkSpeed | null>(null)
let unlistenFns: UnlistenFn[] = []
const unlistenFns: UnlistenFn[] = []
// ===== 数据查询 =====
function getOsdItemValue(item: OsdItem): number | null {
+7 -7
View File
@@ -13,18 +13,18 @@ export function fmt(v: number | null, digits = 1): string {
/** 温度颜色:绿(<50) → 黄(<70) → 橙(<85) → 红(>=85) */
export function tempColor(t: number | null): string {
if (t == null) return 'text-muted-foreground'
if (t < 50) return 'text-emerald-500'
if (t < 70) return 'text-yellow-500'
if (t < 85) return 'text-orange-500'
return 'text-red-500'
if (t < 50) return 'text-success'
if (t < 70) return 'text-warning'
if (t < 85) return 'text-warning'
return 'text-danger'
}
/** 负载颜色:蓝(<50) → 紫(<80) → 红(>=80) */
export function loadColor(v: number | null): string {
if (v == null) return 'text-muted-foreground'
if (v < 50) return 'text-sky-500'
if (v < 80) return 'text-violet-500'
return 'text-red-500'
if (v < 50) return 'text-info'
if (v < 80) return 'text-warning'
return 'text-danger'
}
/** 格式化网速(bytes/s → 自适应 KB/s 或 MB/s) */
+1 -1
View File
@@ -107,5 +107,5 @@ export const moduleConfig: ModuleConfig = {
}
}
},
order: 40
order: 60
}
+16 -27
View File
@@ -11,7 +11,6 @@ import {
HardDriveDownload,
History,
Info,
Library,
Link2,
ListMusic,
Loader2,
@@ -20,7 +19,6 @@ import {
Plus,
RotateCw,
Search,
Settings as SettingsIcon,
Square,
Trash2,
Upload,
@@ -61,7 +59,7 @@ import { Separator } from '@/components/ui/separator'
import { Progress } from '@/components/ui/progress'
import { ScrollArea } from '@/components/ui/scroll-area'
import { Checkbox } from '@/components/ui/checkbox'
import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs'
import { Tabs, TabsContent } from '@/components/ui/tabs'
import { Empty, EmptyDescription, EmptyMedia, EmptyTitle } from '@/components/ui/empty'
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
@@ -75,11 +73,11 @@ const logger = createLogger('music')
// ===== 模块导航 =====
const activeTab = ref('mymusic')
const tabsListRef = useModuleTabs('music', activeTab, [
useModuleTabs('music', activeTab, [
{ value: 'mymusic', label: '曲库' },
{ value: 'discover', label: '发现音乐' },
{ value: 'settings', label: '设置' }
])
], { alwaysVisible: true })
// ===== 发现音乐:下载目标 =====
const downloadTarget = ref<'local' | 'feiniu'>('local')
@@ -540,7 +538,7 @@ const taskStatusInfo = (
case 'cancelling':
return { label: '取消中', variant: 'outline' }
case 'done':
return { label: '完成', variant: 'outline', class: 'bg-emerald-500/15 text-emerald-700 border-emerald-500/30 dark:text-emerald-400' }
return { label: '完成', variant: 'outline', class: 'bg-success-soft text-success-text border-success/30' }
case 'error':
return { label: '出错', variant: 'destructive' }
case 'cancelled':
@@ -788,7 +786,7 @@ const envBadgeText = computed(() => {
})
const envBadgeClass = computed(() =>
!store.envLoading && store.env?.musicdlOutdated
? 'border-amber-500/40 text-amber-700 dark:text-amber-400'
? 'border-warning/40 text-warning-text'
: ''
)
@@ -801,24 +799,15 @@ const RESULT_GRID = { gridTemplateColumns: '24px 36px minmax(0,1fr) 108px 52px 9
</script>
<template>
<div class="h-full p-6 overflow-hidden flex flex-col">
<div class="min-h-full p-5 flex flex-col">
<Tabs v-model="activeTab" class="min-h-0 flex-1 flex flex-col">
<!-- ===== 模块导航(与其他模块保持一致的 Tabs 写法) ===== -->
<div ref="tabsListRef" class="shrink-0">
<TabsList class="grid w-full max-w-md grid-cols-3 !bg-transparent !p-0 !shadow-none">
<TabsTrigger value="mymusic" class="gap-1.5"><Library class="size-3.5" />曲库</TabsTrigger>
<TabsTrigger value="discover" class="gap-1.5"><Search class="size-3.5" />发现音乐</TabsTrigger>
<TabsTrigger value="settings" class="gap-1.5"><SettingsIcon class="size-3.5" />设置</TabsTrigger>
</TabsList>
</div>
<!-- ===== 曲库 ===== -->
<TabsContent value="mymusic" class="mt-4 min-h-0 flex-1 tab-animate">
<TabsContent value="mymusic" class="min-h-0 flex-1 tab-animate">
<MyMusicLibrary />
</TabsContent>
<!-- ===== 发现音乐 ===== -->
<TabsContent value="discover" class="mt-4 min-h-0 flex-1 flex flex-col tab-animate">
<TabsContent value="discover" class="min-h-0 flex-1 flex flex-col tab-animate">
<!-- 工具栏:搜索主操作留在首行 -->
<header class="flex shrink-0 items-center gap-2 border-b pb-3">
<div ref="searchBoxRef" class="relative min-w-0 flex-1 max-w-md" @focusin="historyOpen = true" @focusout="onHistoryFocusOut">
@@ -1089,7 +1078,7 @@ const RESULT_GRID = { gridTemplateColumns: '24px 36px minmax(0,1fr) 108px 52px 9
</div>
<!-- 结果列表 -->
<ScrollArea class="min-h-0 flex-1">
<div class="min-h-0 flex-1">
<div class="pb-4">
<div v-if="store.searching" class="space-y-1.5 pt-3">
<div v-for="i in 8" :key="i" class="h-11 animate-pulse rounded-md bg-muted/40" />
@@ -1271,13 +1260,13 @@ const RESULT_GRID = { gridTemplateColumns: '24px 36px minmax(0,1fr) 108px 52px 9
</div>
</template>
</div>
</ScrollArea>
</div>
</TabsContent>
<!-- ===== 设置(与其他模块一致的 Card 卡片式布局) ===== -->
<TabsContent value="settings" class="mt-4 min-h-0 flex-1 tab-animate">
<ScrollArea class="h-full pr-3">
<div class="flex max-w-2xl flex-col gap-4 pb-4">
<TabsContent value="settings" class="min-h-0 flex-1 tab-animate">
<div>
<div class="flex flex-col gap-4 pb-4">
<!-- 连接 -->
<Card>
<CardHeader>
@@ -1679,7 +1668,7 @@ const RESULT_GRID = { gridTemplateColumns: '24px 36px minmax(0,1fr) 108px 52px 9
"
:class="
!store.envLoading && store.env?.musicdlOutdated
? 'border-amber-500/40 text-amber-700 dark:text-amber-400'
? 'border-warning/40 text-warning-text'
: ''
"
>
@@ -1695,7 +1684,7 @@ const RESULT_GRID = { gridTemplateColumns: '24px 36px minmax(0,1fr) 108px 52px 9
</Badge>
<span
class="text-[12.5px] tabular-nums"
:class="!store.envLoading && store.env?.musicdlOutdated ? 'text-amber-700 dark:text-amber-400' : ''"
:class="!store.envLoading && store.env?.musicdlOutdated ? 'text-warning-text' : ''"
>
<template v-if="store.envLoading">探测中…</template>
<template v-else-if="!store.env?.musicdlInstalled">—</template>
@@ -1798,7 +1787,7 @@ const RESULT_GRID = { gridTemplateColumns: '24px 36px minmax(0,1fr) 108px 52px 9
</CardContent>
</Card>
</div>
</ScrollArea>
</div>
</TabsContent>
</Tabs>
@@ -177,7 +177,7 @@ onMounted(() => store.refreshConnections())
</div>
</div>
<div class="flex shrink-0 items-center gap-1">
<span v-if="c.loggedIn" class="mr-1 flex items-center gap-1 text-xs text-emerald-600">
<span v-if="c.loggedIn" class="mr-1 flex items-center gap-1 text-xs text-success-text">
<Check class="size-3.5" /> 已登录
</span>
<Button
+2 -2
View File
@@ -43,6 +43,6 @@ export const moduleConfig: ModuleConfig = {
.catch(() => {})
}
},
// 默认排在「代理」之后、整体第二位(proxy=10、clipboard=20)
order: 15
// 默认第一位(音乐是常驻后台的播放器,入口最靠前)
order: 10
}
+316 -435
View File
@@ -1,9 +1,9 @@
<script setup lang="ts">
import {
Globe, Play, Square, RotateCw, Power, Zap, Plus, RefreshCw, Trash2,
Check, AlertCircle, Server, Settings as SettingsIcon, ListChecks,
Upload, Link2, Loader2, Download, Timer, Target, FolderOpen, Copy, DownloadCloud,
Waypoints, ArrowDown, ArrowUp, Activity, X
Play, Square, RotateCw, Zap, Plus, RefreshCw, Trash2,
Check, AlertCircle, Server, Settings as SettingsIcon,
Upload, Link2, Loader2, Download, Target, FolderOpen, Copy, DownloadCloud,
Waypoints, X
} from '@lucide/vue'
import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
import { toast } from 'vue-sonner'
@@ -21,8 +21,7 @@ import { Badge } from '@/components/ui/badge'
import { Switch } from '@/components/ui/switch'
import { Input } from '@/components/ui/input'
import { Label } from '@/components/ui/label'
import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs'
import { ScrollArea } from '@/components/ui/scroll-area'
import { Tabs, TabsContent } from '@/components/ui/tabs'
import { Separator } from '@/components/ui/separator'
import { Accordion, AccordionItem, AccordionTrigger, AccordionContent } from '@/components/ui/accordion'
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
@@ -33,6 +32,7 @@ import {
AlertDialogContent, AlertDialogDescription, AlertDialogFooter,
AlertDialogHeader, AlertDialogTitle
} from '@/components/ui/alert-dialog'
import { InfoGroup, KeyValueRow, StatusBadge } from '@/components/common'
const store = useProxyStore()
const logger = createLogger('proxy')
@@ -80,14 +80,19 @@ const onConfirmOpenChange = (open: boolean) => {
}
const activeTab = ref('overview')
// 浮动标签切换器:注册到 TitleBar,滚动遮挡时自动显示
const tabsListRef = useModuleTabs('proxy', activeTab, [
{ value: 'overview', label: '概览' },
{ value: 'connections', label: '连接' },
{ value: 'proxies', label: '节点' },
{ value: 'profiles', label: '订阅' },
{ value: 'settings', label: '设置' }
])
// 标签切换器注册到 TitleBar 且常驻 —— 模块内不再渲染 Tab 行,把纵向空间还给内容
useModuleTabs(
'proxy',
activeTab,
[
{ value: 'overview', label: '概览' },
{ value: 'connections', label: '连接' },
{ value: 'proxies', label: '节点' },
{ value: 'profiles', label: '订阅' },
{ value: 'settings', label: '设置' }
],
{ alwaysVisible: true }
)
const starting = ref(false)
const stopping = ref(false)
const restarting = ref(false)
@@ -177,11 +182,6 @@ const scopeFilterOptions: { value: 'all' | ConnScope; label: string }[] = [
{ value: 'direct', label: '国内' },
{ value: 'proxy', label: '国外' }
]
/** 顶部下载/上传速率(复用实时流量快照的整体速率) */
const connTotalDownloadSec = computed(() => store.traffic?.downloadSpeed ?? 0)
const connTotalUploadSec = computed(() => store.traffic?.uploadSpeed ?? 0)
/** 命中规则总数 = 活跃连接数(每条连接命中一条规则) */
const ruleHitCount = computed(() => connList.value.length)
/** 按规则聚合当前连接,便于观察哪些规则被频繁命中 */
const ruleHits = computed(() => {
const map = new Map<string, number>()
@@ -455,13 +455,14 @@ const openFolder = async () => {
}
}
// 延迟 Badge 样式(超时用醒目红色)
// 延迟分级样式。四级全部落在规范语义色上,不再直接引 Tailwind 色阶:
// 快=成功 / 中=警告 / 慢=危险浅底 / 超时=危险实心(最醒目)
const delayBadgeClass = (delay: number | undefined) => {
if (delay === undefined) return 'border-transparent bg-muted text-muted-foreground'
if (delay === 0) return 'border-transparent bg-red-500 text-white'
if (delay < 150) return 'border-transparent bg-emerald-100 text-emerald-700'
if (delay < 400) return 'border-transparent bg-amber-100 text-amber-700'
return 'border-transparent bg-orange-100 text-orange-700'
if (delay === undefined) return 'border-transparent bg-neutral-soft text-neutral-text'
if (delay === 0) return 'border-transparent bg-danger text-white'
if (delay < 150) return 'border-transparent bg-success-soft text-success-text'
if (delay < 400) return 'border-transparent bg-warning-soft text-warning-text'
return 'border-transparent bg-danger-soft text-danger-text'
}
const delayText = (delay: number | undefined) => {
@@ -562,12 +563,24 @@ watch(running, async (val, old) => {
await store.waitForApi()
await store.refreshVersion()
await loadProxiesWithError()
// 进程刚起来时如果用户就停在连接页,立刻补一次:否则要等下一轮 3s 轮询,
// 而 mihomo 起来后的头几秒 API 往往还没热身,轮询会连续失败(见 connTimer)
if (activeTab.value === 'connections') await store.refreshConnections()
}
if (!val && old) {
// 进程已停:清掉上一轮快照,否则连接页会一直列着那个已经结束的进程的连接
store.connections = null
}
})
// 切换到节点 Tab 时,加载节点列表并自动测速(10s 节流:快速切换 Tab 时避免重复 IPC 洪峰)
let lastAutoTestAt = 0
watch(activeTab, async (tab) => {
// 连接页:进入即拉,不等 3s 轮询 —— 轮询只在停留期间跑,首次进入的空窗期
// 会让用户以为「没有连接」(实际是还没查过)
if (tab === 'connections' && running.value) {
await store.refreshConnections()
}
if (tab === 'proxies' && running.value) {
if (!Object.keys(store.proxies).length) {
await loadProxiesWithError()
@@ -640,6 +653,9 @@ const onToggleSystemProxy = async (on: boolean) => {
sysProxyLoading.value = true
try {
await store.toggleSystemProxy(on)
// 开启系统代理是「流量开始经过 mihomo」的时刻,立即拉一次连接快照:
// 用户多半接着就去连接页看效果,不该在那里等轮询(也不该看到上一轮的空结果)
if (on) await store.refreshConnections()
} catch (e) {
toast.error('操作失败', { description: String(e) })
} finally {
@@ -777,9 +793,9 @@ const installStageText = computed(() => {
const installStageColor = computed(() => {
const stage = store.installProgress?.stage
if (stage === 'done') return 'text-emerald-500'
if (stage === 'error') return 'text-destructive'
if (stage === 'need_stop') return 'text-amber-500'
if (stage === 'done') return 'text-success'
if (stage === 'error') return 'text-danger'
if (stage === 'need_stop') return 'text-warning'
return 'text-primary'
})
@@ -1148,104 +1164,87 @@ watch(
</script>
<template>
<div class="h-full p-6">
<Tabs v-model="activeTab" class="h-full flex flex-col">
<div ref="tabsListRef">
<TabsList class="grid w-full grid-cols-5 max-w-md !bg-transparent !p-0 !shadow-none">
<TabsTrigger value="overview" class="gap-1.5"><Globe class="size-3.5" />概览</TabsTrigger>
<TabsTrigger value="connections" class="gap-1.5"><Waypoints class="size-3.5" />连接</TabsTrigger>
<TabsTrigger value="proxies" class="gap-1.5"><Server class="size-3.5" />节点</TabsTrigger>
<TabsTrigger value="profiles" class="gap-1.5"><ListChecks class="size-3.5" />订阅</TabsTrigger>
<TabsTrigger value="settings" class="gap-1.5"><SettingsIcon class="size-3.5" />设置</TabsTrigger>
</TabsList>
</div>
<div class="min-h-full p-5">
<Tabs v-model="activeTab" class="flex min-h-full w-full flex-col">
<!-- 概览 -->
<TabsContent value="overview" class="flex-1 mt-4 tab-animate">
<ScrollArea class="h-full pr-3">
<div class="columns-1 md:columns-2 gap-4 [&>*]:mb-4 [&>*]:break-inside-avoid">
<!-- 实时流量 -->
<Card>
<CardHeader>
<CardTitle class="flex items-center justify-between text-base">
<span class="flex items-center gap-2"><Activity class="size-4 text-primary" />实时流量</span>
<Badge v-if="running" variant="outline" class="gap-1 text-xs">
<span class="size-1.5 rounded-full bg-emerald-500" />实时更新
</Badge>
</CardTitle>
</CardHeader>
<CardContent class="space-y-4 text-sm">
<div class="grid grid-cols-2 gap-4">
<div>
<div class="flex items-center gap-1 text-muted-foreground text-xs mb-1">
<ArrowDown class="size-3.5 text-emerald-500" />下载
</div>
<p class="text-lg font-semibold tabular-nums">{{ fmtSpeed(store.traffic?.downloadSpeed ?? 0) }}</p>
<p class="text-xs text-muted-foreground tabular-nums">累计 {{ store.traffic ? fmtBytes(store.traffic.downloadTotal) : '--' }}</p>
<TabsContent value="overview" class="tab-animate">
<div class="flex flex-col gap-4">
<!-- 状态横幅:状态区 → 指标区 → 操作区,一行常驻(UI_DESIGN_SYSTEM §3.4) -->
<Card class="!py-0 !gap-0">
<CardContent class="flex flex-wrap items-center gap-x-6 gap-y-3 px-4 py-4">
<div class="flex items-center gap-2.5">
<span v-if="!store.initialized" class="flex items-center gap-1.5 text-[13px] text-muted-foreground">
<Loader2 class="size-3.5 animate-spin" />加载中
</span>
<template v-else>
<span v-if="running" class="flex items-center gap-1.5 text-[13px] text-success">
<span class="size-2 rounded-full bg-success status-dot-pulse" />运行中
</span>
<span v-else class="flex items-center gap-1.5 text-[13px] text-muted-foreground">
<span class="size-2 rounded-full bg-muted-foreground" />已停止
</span>
</template>
<span class="text-[13px] text-fg-secondary">mihomo</span>
</div>
<div class="flex min-w-20 flex-col gap-0.5">
<span class="text-[11px] text-muted-foreground">内核</span>
<span
class="text-lg font-semibold tabular-nums"
:class="store.kernel?.exists ? 'text-foreground' : 'text-danger'"
>{{ store.kernel?.exists ? versionShort : '未安装' }}</span>
</div>
<div class="flex flex-wrap items-center gap-6">
<div class="flex min-w-24 flex-col gap-0.5">
<span class="text-[11px] text-muted-foreground">下载</span>
<span class="text-lg font-semibold tabular-nums text-data-down">{{ fmtSpeed(store.traffic?.downloadSpeed ?? 0) }}</span>
</div>
<div>
<div class="flex items-center gap-1 text-muted-foreground text-xs mb-1">
<ArrowUp class="size-3.5 text-rose-500" />上传
</div>
<p class="text-lg font-semibold tabular-nums">{{ fmtSpeed(store.traffic?.uploadSpeed ?? 0) }}</p>
<p class="text-xs text-muted-foreground tabular-nums">累计 {{ store.traffic ? fmtBytes(store.traffic.uploadTotal) : '--' }}</p>
<div class="flex min-w-24 flex-col gap-0.5">
<span class="text-[11px] text-muted-foreground">上传</span>
<span class="text-lg font-semibold tabular-nums text-data-up">{{ fmtSpeed(store.traffic?.uploadSpeed ?? 0) }}</span>
</div>
<div class="flex min-w-20 flex-col gap-0.5">
<span class="text-[11px] text-muted-foreground">累计流量</span>
<span class="text-lg font-semibold tabular-nums text-foreground">{{ store.traffic ? fmtBytes((store.traffic.downloadTotal ?? 0) + (store.traffic.uploadTotal ?? 0)) : '—' }}</span>
</div>
<div class="flex min-w-12 flex-col gap-0.5">
<span class="text-[11px] text-muted-foreground">活跃连接</span>
<span class="text-lg font-semibold tabular-nums text-foreground">{{ store.traffic?.activeConnections ?? '—' }}</span>
</div>
</div>
<Separator />
<div class="flex items-center justify-between">
<span class="flex items-center gap-1.5 text-muted-foreground">
<Waypoints class="size-3.5" />活跃连接
</span>
<span class="font-semibold tabular-nums">{{ store.traffic?.activeConnections ?? '--' }}</span>
<div class="ml-auto flex gap-2">
<Button v-if="!running" size="sm" :disabled="starting" @click="handleStart">
<Loader2 v-if="starting" class="size-3.5 animate-spin" />
<Play v-else class="size-3.5" />启动
</Button>
<template v-else>
<Button size="sm" variant="outline" :disabled="restarting" @click="handleRestart">
<Loader2 v-if="restarting" class="size-3.5 animate-spin" />
<RotateCw v-else class="size-3.5" />重启
</Button>
<Button size="sm" variant="destructive" :disabled="stopping" @click="handleStop">
<Loader2 v-if="stopping" class="size-3.5 animate-spin" />
<Square v-else class="size-3.5" />停止
</Button>
</template>
</div>
</CardContent>
</Card>
<div class="columns-1 gap-4 md:columns-2 [&>*]:mb-4 [&>*:last-child]:mb-0 [&>*]:break-inside-avoid">
<!-- 内核状态 -->
<Card>
<CardHeader>
<CardTitle class="flex items-center justify-between text-base">
<span class="flex items-center gap-2"><Server class="size-4 text-primary" />内核</span>
<Button
v-if="store.kernel?.exists"
size="xs" variant="outline"
:disabled="checkingUpdate"
@click="handleCheckUpdate"
>
<Loader2 v-if="checkingUpdate" class="size-3 animate-spin" />
<Download v-else key="icon-download" class="size-3" />检查更新
</Button>
</CardTitle>
</CardHeader>
<CardContent class="space-y-3 text-sm">
<div class="flex items-center justify-between">
<span class="text-muted-foreground">状态</span>
<template v-if="!store.initialized">
<span class="flex items-center gap-1.5 text-xs text-muted-foreground">
<Loader2 class="size-3 animate-spin" />加载中...
</span>
</template>
<template v-else>
<Badge v-if="store.kernel?.exists" variant="default" class="gap-1 bg-emerald-500 hover:bg-emerald-500">
<Check class="size-3" />已安装
</Badge>
<Badge v-else variant="destructive" class="gap-1">
<AlertCircle class="size-3" />未安装
</Badge>
</template>
</div>
<div v-if="store.kernel?.exists" class="flex items-center justify-between">
<span class="text-muted-foreground">当前版本</span>
<Tooltip>
<TooltipTrigger as-child>
<Badge variant="secondary" class="font-mono text-xs cursor-default">
{{ versionShort }}
</Badge>
</TooltipTrigger>
<TooltipContent>{{ store.kernel?.version ?? '' }}</TooltipContent>
</Tooltip>
</div>
<div v-if="kernelUpdateInfo" class="flex items-center justify-between">
<span class="text-muted-foreground">最新版本</span>
<InfoGroup variant="card" title="内核">
<template #action>
<Button
v-if="store.kernel?.exists"
size="xs" variant="outline"
:disabled="checkingUpdate"
@click="handleCheckUpdate"
>
<Loader2 v-if="checkingUpdate" class="size-3 animate-spin" />
<Download v-else key="icon-download" class="size-3" />检查更新
</Button>
</template>
<KeyValueRow v-if="kernelUpdateInfo" label="最新版本">
<span class="font-mono text-xs flex items-center gap-2">
{{ kernelUpdateInfo.latestVersion }}
<Button
@@ -1257,12 +1256,11 @@ watch(
>
<Download key="icon-download" class="size-3" />更新
</Button>
<Check v-else key="icon-updated" class="size-3 text-emerald-500" />
<Check v-else key="icon-updated" class="size-3 text-success" />
</span>
</div>
<div class="flex items-center justify-between gap-3">
<span class="text-muted-foreground shrink-0">路径</span>
<div class="flex items-center gap-1.5 min-w-0">
</KeyValueRow>
<KeyValueRow label="路径">
<span class="flex min-w-0 items-center gap-1.5">
<Tooltip>
<TooltipTrigger as-child>
<span class="font-mono text-xs text-right truncate cursor-default">{{ pathDisplay || pathShort }}</span>
@@ -1287,8 +1285,11 @@ watch(
<TooltipContent>在文件夹中显示</TooltipContent>
</Tooltip>
</template>
</div>
</div>
</span>
</KeyValueRow>
<KeyValueRow label="PID" :value="store.status.pid ?? '—'" mono />
<KeyValueRow label="API 版本" :value="store.version || '—'" mono />
<KeyValueRow label="重启次数" :value="store.status.restartCount" mono />
<!-- 更新内核区块:检查到更新且用户点击"更新"后展开(复用首次安装的下载源选择 UI) -->
<div
@@ -1448,274 +1449,150 @@ watch(
</Button>
</div>
</div>
</CardContent>
</Card>
<!-- 运行状态 -->
<Card>
<CardHeader>
<CardTitle class="flex items-center gap-2 text-base">
<Zap class="size-4 text-primary" />运行状态
</CardTitle>
</CardHeader>
<CardContent class="space-y-3 text-sm">
<div class="flex items-center justify-between">
<span class="text-muted-foreground">mihomo</span>
<template v-if="!store.initialized">
<span class="flex items-center gap-1.5 text-xs text-muted-foreground">
<Loader2 class="size-3 animate-spin" />加载中...
</span>
</template>
<template v-else>
<span v-if="running" class="flex items-center gap-1 text-emerald-500">
<span class="size-2 rounded-full bg-emerald-500" />运行中
</span>
<span v-else class="flex items-center gap-1 text-muted-foreground">
<span class="size-2 rounded-full bg-muted-foreground" />已停止
</span>
</template>
</div>
<div class="flex items-center justify-between">
<span class="text-muted-foreground">PID</span>
<span class="font-mono text-xs">{{ store.status.pid ?? '—' }}</span>
</div>
<div class="flex items-center justify-between">
<span class="text-muted-foreground">API 版本</span>
<span class="font-mono text-xs">{{ store.version || '—' }}</span>
</div>
<div class="flex items-center justify-between">
<span class="text-muted-foreground">重启次数</span>
<span class="font-mono text-xs">{{ store.status.restartCount }}</span>
</div>
<Separator />
<div class="flex gap-2">
<Button v-if="!running" key="btn-start" size="sm" :disabled="starting" @click="handleStart">
<Loader2 v-if="starting" key="starting-loading" class="size-3.5 animate-spin" />
<Play v-else key="starting-icon" class="size-3.5" />启动
</Button>
<template v-else key="btn-stop-group">
<Button size="sm" variant="destructive" :disabled="stopping" @click="handleStop">
<Loader2 v-if="stopping" key="stopping-loading" class="size-3.5 animate-spin" />
<Square v-else key="stopping-icon" class="size-3.5" />停止
</Button>
<Button size="sm" variant="outline" :disabled="restarting" @click="handleRestart">
<Loader2 v-if="restarting" key="restarting-loading" class="size-3.5 animate-spin" />
<RotateCw v-else key="restarting-icon" class="size-3.5" />重启
</Button>
</template>
</div>
</CardContent>
</Card>
<!-- 当前订阅 & 模式 -->
<Card>
<CardHeader>
<CardTitle class="flex items-center gap-2 text-base">
<ListChecks class="size-4 text-primary" />订阅与模式
</CardTitle>
</CardHeader>
<CardContent class="space-y-3 text-sm">
<div class="flex items-center justify-between gap-3">
<span class="text-muted-foreground shrink-0">当前订阅</span>
<span class="text-right truncate">{{ currentProfile?.name ?? '无' }}</span>
</div>
<Separator />
<div class="flex items-center justify-between">
<span class="text-muted-foreground">运行模式</span>
<div class="flex gap-1">
<Button
v-for="m in modeOptions" :key="m.value"
size="xs"
:variant="store.settings?.mode === m.value ? 'default' : 'outline'"
:disabled="!running && store.settings?.mode !== m.value"
@click="changeMode(m.value)"
>{{ m.label }}</Button>
</div>
</div>
</CardContent>
</Card>
</InfoGroup>
<!-- 当前节点 -->
<Card>
<CardHeader>
<CardTitle class="flex items-center gap-2 text-base">
<Target class="size-4 text-primary" />当前节点
</CardTitle>
</CardHeader>
<CardContent class="space-y-3 text-sm">
<template v-if="mainGroupName" key="has-main">
<div class="flex items-center justify-between">
<span class="text-muted-foreground">代理组</span>
<span class="font-medium">{{ mainGroupName }}</span>
</div>
<div class="flex items-center justify-between gap-3">
<span class="text-muted-foreground shrink-0">当前节点</span>
<span class="text-right truncate">{{ mainGroupNow || '—' }}</span>
</div>
<div class="flex items-center justify-between">
<span class="text-muted-foreground">延迟</span>
<Badge variant="outline" :class="delayBadgeClass(currentNodeDelay)">{{ delayText(currentNodeDelay) }}</Badge>
</div>
<Separator />
<div class="space-y-2">
<Label class="text-xs text-muted-foreground">快捷切换</Label>
<Select :model-value="mainGroupNow" @update:model-value="(v) => quickSwitchNode(String(v))">
<SelectTrigger class="w-full">
<SelectValue :placeholder="mainGroupNow || '选择节点'" />
</SelectTrigger>
<SelectContent>
<SelectItem v-for="node in mainGroupNodes" :key="node" :value="node">
{{ node }}
</SelectItem>
</SelectContent>
</Select>
</div>
</template>
<div v-else key="no-main" class="text-center text-muted-foreground py-4 text-xs">
{{ running ? '暂无可选节点,请先导入订阅' : 'mihomo 未运行' }}
<InfoGroup variant="card" title="当前节点">
<KeyValueRow label="代理组" :value="mainGroupName || '—'" />
<KeyValueRow label="当前节点" :value="mainGroupNow || '—'" />
<KeyValueRow label="延迟">
<Badge v-if="mainGroupName" variant="outline" :class="delayBadgeClass(currentNodeDelay)">{{ delayText(currentNodeDelay) }}</Badge>
<span v-else class="text-[13px] text-muted-foreground">—</span>
</KeyValueRow>
<template #footer>
<div class="space-y-2">
<Label class="text-xs text-muted-foreground">快捷切换</Label>
<Select :disabled="!running || !mainGroupName" :model-value="mainGroupNow" @update:model-value="(v) => quickSwitchNode(String(v))">
<SelectTrigger class="w-full">
<SelectValue :placeholder="mainGroupNow || '选择节点'" />
</SelectTrigger>
<SelectContent>
<SelectItem v-for="node in mainGroupNodes" :key="node" :value="node">
{{ node }}
</SelectItem>
</SelectContent>
</Select>
</div>
</CardContent>
</Card>
</template>
</InfoGroup>
<!-- 自动切换 -->
<Card :class="{ 'opacity-60': !running && autoSwitchEnabled }">
<CardHeader>
<CardTitle class="flex items-center justify-between text-base">
<span class="flex items-center gap-2">
<Timer class="size-4 text-primary" />自动切换节点
<!-- 订阅与代理 -->
<InfoGroup variant="card" title="订阅与代理">
<KeyValueRow label="当前订阅" :value="currentProfile?.name ?? '—'" />
<KeyValueRow label="运行模式">
<div class="flex gap-1">
<Button
v-for="m in modeOptions" :key="m.value"
size="xs"
:variant="store.settings?.mode === m.value ? 'default' : 'outline'"
:disabled="!running && store.settings?.mode !== m.value"
@click="changeMode(m.value)"
>{{ m.label }}</Button>
</div>
</KeyValueRow>
<KeyValueRow label="系统代理">
<div class="flex items-center gap-2">
<span class="text-[13px] text-muted-foreground">
{{ store.systemProxy ? `指向 127.0.0.1:${store.settings?.mixedPort ?? 7890}` : '已关闭' }}
</span>
<Switch
:model-value="autoSwitchEnabled"
:disabled="!running"
@update:model-value="onToggleAutoSwitch"
:model-value="store.systemProxy"
:disabled="sysProxyLoading || !running"
@update:model-value="onToggleSystemProxy"
/>
</CardTitle>
</CardHeader>
<CardContent class="space-y-3 text-sm" :class="{ 'pointer-events-none': !autoSwitchEnabled }">
<div class="grid grid-cols-3 gap-3">
<div class="grid gap-1.5">
<Label class="text-xs text-muted-foreground">目标代理组</Label>
<Select :model-value="autoSwitchTargetGroup || '__default__'" @update:model-value="(v) => { autoSwitchTargetGroup = v === '__default__' ? '' : String(v); saveAutoSwitchSettings() }">
<SelectTrigger class="w-full">
<SelectValue placeholder="主代理组" />
</SelectTrigger>
<SelectContent>
<SelectItem value="__default__">主代理组</SelectItem>
<SelectItem v-for="[gname] in selectorGroups" :key="gname" :value="gname">{{ gname }}</SelectItem>
</SelectContent>
</Select>
</div>
<div class="grid gap-1.5">
<Label class="text-xs text-muted-foreground">测试间隔</Label>
<Select :model-value="autoSwitchInterval" @update:model-value="(v) => onAutoSwitchIntervalChange(v)">
<SelectTrigger class="w-full">
<SelectValue placeholder="选择间隔" />
</SelectTrigger>
<SelectContent>
<SelectItem :value="1">每 1 分钟</SelectItem>
<SelectItem :value="5">每 5 分钟</SelectItem>
<SelectItem :value="10">每 10 分钟</SelectItem>
<SelectItem :value="30">每 30 分钟</SelectItem>
</SelectContent>
</Select>
</div>
<div class="grid gap-1.5">
<Label class="text-xs text-muted-foreground">地区筛选</Label>
<Select :model-value="autoSwitchRegion || '__all__'" @update:model-value="(v) => { autoSwitchRegion = v === '__all__' ? '' : String(v); saveAutoSwitchSettings() }">
<SelectTrigger class="w-full">
<SelectValue placeholder="全部地区" />
</SelectTrigger>
<SelectContent>
<SelectItem value="__all__">全部地区</SelectItem>
<SelectItem v-for="r in regionOptions" :key="r" :value="r">{{ r }}</SelectItem>
</SelectContent>
</Select>
</div>
</div>
<p class="text-xs text-muted-foreground leading-relaxed">
</KeyValueRow>
</InfoGroup>
<!-- 自动切换 -->
<InfoGroup variant="card" title="自动切换节点" :class="{ 'opacity-60': !running && autoSwitchEnabled }">
<template #action>
<Switch
:model-value="autoSwitchEnabled"
:disabled="!running"
@update:model-value="onToggleAutoSwitch"
/>
</template>
<div class="space-y-3" :class="{ 'pointer-events-none': !autoSwitchEnabled }">
<div class="grid gap-1.5">
<Label class="text-xs text-muted-foreground">目标代理组</Label>
<Select :model-value="autoSwitchTargetGroup || '__default__'" @update:model-value="(v) => { autoSwitchTargetGroup = v === '__default__' ? '' : String(v); saveAutoSwitchSettings() }">
<SelectTrigger size="sm" class="w-full">
<SelectValue placeholder="主代理组" />
</SelectTrigger>
<SelectContent>
<SelectItem value="__default__">主代理组</SelectItem>
<SelectItem v-for="[gname] in selectorGroups" :key="gname" :value="gname">{{ gname }}</SelectItem>
</SelectContent>
</Select>
</div>
<div class="grid gap-1.5">
<Label class="text-xs text-muted-foreground">测试间隔</Label>
<Select :model-value="autoSwitchInterval" @update:model-value="(v) => onAutoSwitchIntervalChange(v)">
<SelectTrigger size="sm" class="w-full">
<SelectValue placeholder="选择间隔" />
</SelectTrigger>
<SelectContent>
<SelectItem :value="1">每 1 分钟</SelectItem>
<SelectItem :value="5">每 5 分钟</SelectItem>
<SelectItem :value="10">每 10 分钟</SelectItem>
<SelectItem :value="30">每 30 分钟</SelectItem>
</SelectContent>
</Select>
</div>
<div class="grid gap-1.5">
<Label class="text-xs text-muted-foreground">地区筛选</Label>
<Select :model-value="autoSwitchRegion || '__all__'" @update:model-value="(v) => { autoSwitchRegion = v === '__all__' ? '' : String(v); saveAutoSwitchSettings() }">
<SelectTrigger size="sm" class="w-full">
<SelectValue placeholder="全部地区" />
</SelectTrigger>
<SelectContent>
<SelectItem value="__all__">全部地区</SelectItem>
<SelectItem v-for="r in regionOptions" :key="r" :value="r">{{ r }}</SelectItem>
</SelectContent>
</Select>
</div>
</div>
<template #footer>
<p class="text-xs leading-relaxed text-muted-foreground">
定时测试「{{ autoSwitchTargetGroup || mainGroupName || '主代理组' }}」{{ autoSwitchRegion ? `中「${autoSwitchRegion}」地区` : '全部' }}有效节点的延迟,
自动切换至最优节点。当前 {{ filteredNodes.length }} 个节点在候选范围内。
</p>
</CardContent>
</Card>
</template>
</InfoGroup>
<!-- 系统代理 -->
<Card :class="{ 'opacity-60': sysProxyLoading }">
<CardHeader>
<CardTitle class="flex items-center gap-2 text-base">
<Power class="size-4 text-primary" />系统代理
</CardTitle>
</CardHeader>
<CardContent class="flex items-center justify-between">
<div class="space-y-1">
<p class="text-sm">Windows 系统代理</p>
<p class="text-xs text-muted-foreground">
{{ store.systemProxy ? `指向 127.0.0.1:${store.settings?.mixedPort ?? 7890}` : '已关闭' }}
</p>
</div>
<Switch
:model-value="store.systemProxy"
:disabled="sysProxyLoading || !running"
@update:model-value="onToggleSystemProxy"
/>
</CardContent>
</Card>
</div>
</div>
</ScrollArea>
</TabsContent>
<!-- 连接 -->
<TabsContent value="connections" class="flex-1 mt-4 tab-animate">
<div v-if="!running" key="conn-not-running" class="h-full flex flex-col items-center justify-center text-muted-foreground gap-2 pt-10 pr-10">
<Waypoints class="size-12 opacity-30" />
<p class="text-sm">mihomo 未运行,请先在概览页启动</p>
</div>
<div v-else class="h-full flex flex-col gap-4 pr-3">
<!-- 顶部统计 -->
<div class="grid grid-cols-2 md:grid-cols-4 gap-2">
<Card>
<CardContent class="py-3">
<div class="flex items-center gap-1.5 text-muted-foreground text-xs mb-1"><Waypoints class="size-3.5" />活跃连接</div>
<p class="text-xl font-semibold tabular-nums">{{ connList.length }}</p>
</CardContent>
</Card>
<Card>
<CardContent class="py-3">
<div class="flex items-center gap-1.5 text-muted-foreground text-xs mb-1"><ArrowDown class="size-3.5 text-emerald-500" />下载速率</div>
<p class="text-xl font-semibold tabular-nums">{{ fmtSpeed(connTotalDownloadSec) }}</p>
</CardContent>
</Card>
<Card>
<CardContent class="py-3">
<div class="flex items-center gap-1.5 text-muted-foreground text-xs mb-1"><ArrowUp class="size-3.5 text-rose-500" />上传速率</div>
<p class="text-xl font-semibold tabular-nums">{{ fmtSpeed(connTotalUploadSec) }}</p>
</CardContent>
</Card>
<Card>
<CardContent class="py-3">
<div class="flex items-center gap-1.5 text-muted-foreground text-xs mb-1"><Target class="size-3.5" />命中规则</div>
<p class="text-xl font-semibold tabular-nums">{{ ruleHitCount }}</p>
</CardContent>
</Card>
</div>
<!-- 规则命中分布 -->
<Card>
<CardHeader class="pb-2">
<CardTitle class="text-sm flex items-center gap-2"><Target class="size-3.5 text-primary" />规则命中</CardTitle>
</CardHeader>
<CardContent class="pt-0">
<div v-if="!ruleHits.length" class="text-xs text-muted-foreground py-2">暂无连接</div>
<div v-else class="space-y-1.5">
<div v-for="r in ruleHits.slice(0, 6)" :key="r.rule" class="flex items-baseline gap-2 text-xs">
<span class="w-1.5 h-1.5 rounded-full bg-primary shrink-0 self-center" />
<span class="font-medium shrink-0">{{ translateRule(r.rule) }}</span>
<span class="flex-1 min-w-0 truncate text-muted-foreground">
<template v-if="ruleDesc(r.rule)">({{ ruleDesc(r.rule) }})</template>
</span>
<span class="shrink-0 tabular-nums">×{{ r.count }}</span>
</div>
</div>
<TabsContent value="connections" class="tab-animate">
<div class="flex min-h-full flex-col gap-4">
<!-- 指标行:与概览横幅同构;活跃连接后紧跟规则命中 chips,随内容向右延伸 -->
<Card class="!py-0 !gap-0">
<CardContent class="flex flex-wrap items-center gap-x-6 gap-y-3 px-4 py-4">
<div class="flex min-w-12 flex-col gap-0.5">
<span class="text-[11px] text-muted-foreground">活跃连接</span>
<span class="text-lg font-semibold tabular-nums" :class="running ? 'text-foreground' : 'text-muted-foreground'">{{ connList.length }}</span>
</div>
<!-- 规则命中:内联摘要(chips),紧挨活跃连接,命中项变化时向右延伸(超出后块内换行) -->
<div class="flex min-w-0 flex-1 flex-wrap items-center gap-x-3 gap-y-1.5 text-xs">
<span class="flex items-center gap-1.5 font-medium text-fg-secondary">
<Target class="size-3.5" />规则命中
</span>
<template v-if="ruleHits.length">
<span
v-for="r in ruleHits.slice(0, 6)"
:key="r.rule"
class="flex items-center gap-1.5 rounded-sm bg-neutral-soft px-2 py-0.5 text-neutral-text"
:title="ruleDesc(r.rule)"
>
{{ translateRule(r.rule) }}
<span class="tabular-nums opacity-70">×{{ r.count }}</span>
</span>
</template>
<span v-else class="text-muted-foreground">暂无连接</span>
</div>
</CardContent>
</Card>
@@ -1725,7 +1602,7 @@ watch(
<div class="flex items-center justify-between gap-3">
<CardTitle class="text-sm flex items-center gap-2"><Waypoints class="size-3.5 text-primary" />当前连接</CardTitle>
<div class="flex items-center gap-2">
<Input v-model="connFilter" placeholder="按进程/域名/规则过滤" class="h-8 w-56" />
<Input v-model="connFilter" placeholder="按进程/域名/规则过滤" class="h-8 w-56" :disabled="!running" />
<Button size="xs" variant="outline" :disabled="!connList.length" @click="closeAllConnections">
<Square class="size-3" />断开全部
</Button>
@@ -1743,7 +1620,7 @@ watch(
</div>
</CardHeader>
<CardContent class="flex-1 min-h-0 overflow-hidden pt-0">
<ScrollArea class="h-full">
<div>
<table class="w-full text-xs">
<thead class="sticky top-0 z-10 bg-card text-muted-foreground">
<tr class="border-b">
@@ -1756,21 +1633,18 @@ watch(
</tr>
</thead>
<tbody>
<tr v-for="c in filteredConnections" :key="c.id" class="border-b last:border-0 hover:bg-muted/40">
<tr v-for="c in filteredConnections" :key="c.id" class="border-b last:border-0 hover:bg-hover">
<td class="py-2 px-2 align-baseline">
<span class="font-medium truncate block max-w-[140px]">{{ connProcess(c) }}</span>
<span class="text-muted-foreground">{{ connSource(c) }}</span>
</td>
<td class="py-2 px-2 align-baseline">
<div class="flex items-center gap-1.5">
<Badge
<StatusBadge
v-if="connScopeOf(c) === 'direct'"
variant="outline" class="h-4 px-1.5 text-[10px] shrink-0 border-emerald-500 text-emerald-500"
>国内</Badge>
<Badge
v-else
variant="outline" class="h-4 px-1.5 text-[10px] shrink-0 border-sky-500 text-sky-500"
>国外</Badge>
variant="success" size="sm"
>国内</StatusBadge>
<StatusBadge v-else variant="info" size="sm">国外</StatusBadge>
<span class="truncate block max-w-[140px]">{{ connHost(c) }}</span>
</div>
<span class="text-muted-foreground">{{ c.metadata?.network }} / {{ c.metadata?.type }}</span>
@@ -1781,29 +1655,37 @@ watch(
<td class="py-2 px-2 text-right tabular-nums align-baseline">{{ fmtBytes(c.download) }}</td>
<td class="py-2 px-2 text-right tabular-nums align-baseline">{{ fmtBytes(c.upload) }}</td>
<td class="py-2 px-2 text-center align-baseline">
<Button size="icon" variant="ghost" class="size-6" title="断开连接" @click="store.closeConnection(c.id)">
<Button size="icon-sm" variant="ghost" title="断开连接" @click="store.closeConnection(c.id)">
<X class="size-3.5" />
</Button>
</td>
</tr>
<!--
空态分三种,别让用户把「还没查过」当成「没有连接」:
未运行 / 查询中(store.connections 仍为 null)/ 确实为空
-->
<tr v-if="!connList.length">
<td colspan="6" class="text-center text-muted-foreground py-8">暂无活跃连接</td>
<td colspan="6" class="text-center text-muted-foreground py-8">
{{
!running
? 'mihomo 未运行 — 启动后这里会显示经过代理的连接'
: store.connections === null
? '正在读取连接…'
: '暂无活跃连接'
}}
</td>
</tr>
</tbody>
</table>
</ScrollArea>
</div>
</CardContent>
</Card>
</div>
</TabsContent>
<!-- 节点 -->
<TabsContent value="proxies" class="flex-1 mt-4 tab-animate">
<div v-if="!running" key="not-running" class="h-full flex flex-col items-center justify-center text-muted-foreground gap-2 pt-10 pr-10">
<Server class="size-12 opacity-30" />
<p class="text-sm">mihomo 未运行,请先在概览页启动</p>
</div>
<ScrollArea v-else key="proxy-list" class="h-full pr-3">
<TabsContent value="proxies" class="tab-animate">
<div>
<div class="flex items-center justify-between mb-3">
<p v-if="!groups.length" class="text-sm text-muted-foreground">暂无代理组</p>
<p v-else class="text-sm text-muted-foreground">{{ groups.length }} 个代理组</p>
@@ -1828,7 +1710,7 @@ watch(
<AccordionTrigger class="px-4 py-2.5 hover:no-underline">
<div class="flex items-center justify-between w-full pr-2">
<span class="flex items-center gap-2">
<Server class="size-4 text-primary" />
<Server class="size-4 text-fg-secondary" />
<span class="font-medium">{{ gname }}</span>
<span class="text-xs font-normal text-muted-foreground">{{ group.type }}</span>
<span v-if="group.now" class="text-xs text-primary truncate max-w-32">{{ group.now }}</span>
@@ -1851,8 +1733,8 @@ watch(
<button
v-for="node in group.all" :key="node"
type="button"
class="flex items-center justify-between gap-2 rounded-md border px-2.5 py-1.5 text-xs transition-colors hover:bg-accent disabled:opacity-50 disabled:cursor-not-allowed"
:class="group.now === node ? 'border-primary bg-primary/10' : 'border-border'"
class="flex items-center justify-between gap-2 rounded-md border px-2.5 py-1.5 text-xs transition-colors hover:bg-hover disabled:opacity-50 disabled:cursor-not-allowed"
:class="group.now === node ? 'border-primary bg-primary-soft' : 'border-border'"
:disabled="group.type !== 'Selector'"
@click="selectNode(gname, node)"
>
@@ -1866,13 +1748,13 @@ watch(
</AccordionItem>
</Card>
</Accordion>
</ScrollArea>
</div>
</TabsContent>
<!-- 订阅 -->
<TabsContent value="profiles" class="flex-1 mt-4 tab-animate">
<ScrollArea class="h-full pr-3">
<div class="space-y-4 max-w-3xl">
<TabsContent value="profiles" class="flex-1 min-h-0 tab-animate">
<div>
<div class="space-y-4">
<Card>
<CardHeader class="pb-3">
<CardTitle class="flex items-center gap-2 text-base">
@@ -1907,7 +1789,7 @@ watch(
<div
v-for="p in store.settings.profiles" :key="p.id"
class="flex items-center gap-3 rounded-md border p-3"
:class="store.settings.currentProfile === p.id ? 'border-primary bg-primary/5' : 'border-border'"
:class="store.settings.currentProfile === p.id ? 'border-primary bg-primary-soft' : 'border-border'"
>
<div class="flex-1 min-w-0 space-y-1">
<div class="flex items-center gap-2">
@@ -1953,13 +1835,13 @@ watch(
</CardContent>
</Card>
</div>
</ScrollArea>
</div>
</TabsContent>
<!-- 设置 -->
<TabsContent value="settings" class="flex-1 mt-4 tab-animate">
<ScrollArea class="h-full pr-3">
<Card class="max-w-2xl">
<TabsContent value="settings" class="tab-animate">
<div>
<Card>
<CardHeader>
<CardTitle class="flex items-center gap-2 text-base">
<SettingsIcon class="size-4 text-primary" />基础设置
@@ -1967,11 +1849,10 @@ watch(
</CardHeader>
<CardContent class="space-y-4">
<!-- 说明文字(保存按钮已移至顶部标签栏) -->
<p class="text-xs text-muted-foreground rounded-md border border-primary/30 bg-primary/5 p-3">
<p class="rounded-md border border-primary/30 bg-primary-soft p-3 text-xs text-primary-soft-text">
修改端口/接口/密钥/模式后需重启 mihomo 生效。DNS、规则等高级配置请直接编辑订阅文件。
</p>
<Separator />
<div class="grid grid-cols-2 gap-4">
<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
<div class="grid gap-2">
<Label for="mixed-port">混合代理端口</Label>
<Input id="mixed-port" v-model.number="localSettings.mixedPort" type="number" />
@@ -1985,29 +1866,7 @@ watch(
<Label for="secret">API 密钥(留空则不鉴权)</Label>
<Input id="secret" v-model="localSettings.secret" placeholder="可选" />
</div>
<div class="flex items-center justify-between rounded-md border p-3">
<div>
<p class="text-sm">允许局域网连接</p>
<p class="text-xs text-muted-foreground">允许其他设备通过本机代理上网</p>
</div>
<Switch v-model="localSettings.allowLan" />
</div>
<div class="flex items-center justify-between rounded-md border p-3">
<div>
<p class="text-sm">应用启动时自动启动 mihomo</p>
<p class="text-xs text-muted-foreground">软件启动时自动运行内核</p>
</div>
<Switch v-model="localSettings.autoStart" />
</div>
<div class="flex items-center justify-between rounded-md border p-3">
<div>
<p class="text-sm">启动时自动开启系统代理</p>
<p class="text-xs text-muted-foreground">mihomo 启动后自动设置 Windows 系统代理,退出时自动关闭</p>
</div>
<Switch v-model="localSettings.autoSystemProxy" />
</div>
<Separator />
<div class="grid grid-cols-2 gap-4">
<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
<div class="grid gap-2">
<Label for="mode-select">运行模式</Label>
<Select v-model="localSettings.mode">
@@ -2037,9 +1896,31 @@ watch(
</Select>
</div>
</div>
<Separator />
<div class="flex items-center justify-between gap-4">
<div>
<p class="text-sm">允许局域网连接</p>
<p class="text-xs text-muted-foreground">允许其他设备通过本机代理上网</p>
</div>
<Switch v-model="localSettings.allowLan" />
</div>
<div class="flex items-center justify-between gap-4">
<div>
<p class="text-sm">应用启动时自动启动 mihomo</p>
<p class="text-xs text-muted-foreground">软件启动时自动运行内核</p>
</div>
<Switch v-model="localSettings.autoStart" />
</div>
<div class="flex items-center justify-between gap-4">
<div>
<p class="text-sm">启动时自动开启系统代理</p>
<p class="text-xs text-muted-foreground">mihomo 启动后自动设置 Windows 系统代理,退出时自动关闭</p>
</div>
<Switch v-model="localSettings.autoSystemProxy" />
</div>
</CardContent>
</Card>
</ScrollArea>
</div>
</TabsContent>
</Tabs>
+1 -1
View File
@@ -157,5 +157,5 @@ export const moduleConfig: ModuleConfig = {
}
}
},
order: 10
order: 20
}
+18 -14
View File
@@ -10,6 +10,7 @@ import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from '@/comp
import { Switch } from '@/components/ui/switch'
import { aggregateSearch, loadAppIconsForResults, recordHistoryItem, getAllHistoryItems, setFileIndexReady, type QPItem, type QPSubAction } from './providers'
import { EVENTS, STORAGE_KEYS } from '@/lib/constants'
import { applyStoredAccent } from '@/lib/theme'
import HistoryPicker from './HistoryPicker.vue'
// ===== 状态 =====
@@ -23,7 +24,7 @@ const subActionExpanded = ref<number | null>(null)
const subActionIndex = ref(0)
// 待删除确认项(文件/文件夹删除前弹窗确认)
const pendingDelete = ref<{ path: string; isDir: boolean; name: string } | null>(null)
let unlistenFns: UnlistenFn[] = []
const unlistenFns: UnlistenFn[] = []
let searchTimer: ReturnType<typeof setTimeout> | null = null
// ===== 当前目录文件操作(快捷键在资源管理器中按下时检测) =====
@@ -851,18 +852,18 @@ const groupIcon = (group: string) => {
/** 类型 badge 颜色映射(柔和色块风格,跟随亮/暗主题) */
const GROUP_COLORS: Record<string, string> = {
设置: 'bg-indigo-500/15 text-indigo-600 dark:text-indigo-400',
计算: 'bg-amber-500/15 text-amber-600 dark:text-amber-400',
网页: 'bg-rose-500/15 text-rose-600 dark:text-rose-400',
系统: 'bg-slate-500/15 text-slate-600 dark:text-slate-400',
自定义: 'bg-orange-500/15 text-orange-600 dark:text-orange-400',
历史: 'bg-violet-500/15 text-violet-600 dark:text-violet-400',
快捷: 'bg-sky-500/15 text-sky-600 dark:text-sky-400',
换算: 'bg-teal-500/15 text-teal-600 dark:text-teal-400',
目录操作: 'bg-cyan-500/15 text-cyan-600 dark:text-cyan-400',
应用: 'bg-blue-500/15 text-blue-600 dark:text-blue-400',
文件: 'bg-emerald-500/15 text-emerald-600 dark:text-emerald-400',
剪贴板: 'bg-pink-500/15 text-pink-600 dark:text-pink-400',
设置: 'bg-info-soft text-info-text',
计算: 'bg-warning-soft text-warning-text',
网页: 'bg-danger-soft text-danger-text',
系统: 'bg-neutral-soft text-neutral-text',
自定义: 'bg-warning-soft text-warning-text',
历史: 'bg-info-soft text-info-text',
快捷: 'bg-info-soft text-info-text',
换算: 'bg-success-soft text-success-text',
目录操作: 'bg-info-soft text-info-text',
应用: 'bg-info-soft text-info-text',
文件: 'bg-success-soft text-success-text',
剪贴板: 'bg-success-soft text-success-text',
}
function groupBadgeClass(group: string): string {
@@ -915,6 +916,9 @@ async function applyTheme() {
root.classList.add(`effect-${effect}`)
if (isDark) root.classList.add('dark')
// 主题色:与主窗口共用同一份设置。行内变量会压住 .dark 规则,故按当前模式整组重写
applyStoredAccent(root, isDark ? 'dark' : 'light', STORAGE_KEYS.appSettings)
try {
const tauriWin = getCurrentWindow()
await tauriWin.clearEffects()
@@ -1356,7 +1360,7 @@ onUnmounted(() => {
:checked="deleteSelected.has(f.path)"
@change="toggleDeleteSelect(f.path)"
/>
<FolderOpen v-if="f.isDir" class="size-4 text-amber-500 shrink-0" />
<FolderOpen v-if="f.isDir" class="size-4 text-warning shrink-0" />
<FileText v-else class="size-4 text-muted-foreground shrink-0" />
<div class="flex-1 min-w-0">
<p class="text-xs truncate">{{ f.name }}</p>
+6 -6
View File
@@ -293,8 +293,8 @@ async function changeEngine(v: string) {
</script>
<template>
<div class="h-full p-6 overflow-y-auto">
<div class="max-w-2xl space-y-4">
<div class="min-h-full p-5">
<div class="space-y-4">
<!-- 标题与测试 -->
<div class="flex items-center justify-between">
<h2 class="text-lg font-semibold flex items-center gap-2">
@@ -311,7 +311,7 @@ async function changeEngine(v: string) {
<Card>
<CardHeader>
<CardTitle class="text-sm flex items-center gap-2">
<Keyboard class="size-4" />
<Keyboard class="size-4 text-primary" />
唤起快捷键
</CardTitle>
</CardHeader>
@@ -372,7 +372,7 @@ async function changeEngine(v: string) {
<Card>
<CardHeader>
<CardTitle class="text-sm flex items-center gap-2">
<Globe class="size-4" />
<Globe class="size-4 text-primary" />
默认搜索引擎
</CardTitle>
</CardHeader>
@@ -398,7 +398,7 @@ async function changeEngine(v: string) {
<Card>
<CardHeader>
<CardTitle class="text-sm flex items-center gap-2">
<FolderTree class="size-4" />
<FolderTree class="size-4 text-primary" />
文件索引
</CardTitle>
</CardHeader>
@@ -457,7 +457,7 @@ async function changeEngine(v: string) {
<Card>
<CardHeader>
<CardTitle class="text-sm flex items-center gap-2">
<Terminal class="size-4" />
<Terminal class="size-4 text-primary" />
自定义命令
</CardTitle>
</CardHeader>
+1 -1
View File
@@ -66,5 +66,5 @@ export const moduleConfig: ModuleConfig = {
}
}
},
order: 60
order: 90
}
+13 -4
View File
@@ -5,6 +5,7 @@ import { LogicalSize } from '@tauri-apps/api/dpi'
import { emit, listen, type UnlistenFn } from '@tauri-apps/api/event'
import { invoke } from '@tauri-apps/api/core'
import { EVENTS, STORAGE_KEYS } from '@/lib/constants'
import { applyStoredAccent } from '@/lib/theme'
// Rust 端通过 tauri-specta 生成的命令绑定(bindings.ts)
import { commands } from '@/lib/bindings'
import { save } from '@tauri-apps/plugin-dialog'
@@ -931,6 +932,8 @@ function applyTheme() {
else if (theme === 'light') dark = false
else dark = window.matchMedia('(prefers-color-scheme: dark)').matches
root.classList.toggle('dark', dark)
// 主题色:与主窗口共用同一份设置(行内变量压住 .dark 规则,按当前模式整组重写)
applyStoredAccent(root, dark ? 'dark' : 'light', STORAGE_KEYS.appSettings)
}
function onStorageChange(e: StorageEvent) {
@@ -1349,10 +1352,16 @@ onUnmounted(() => {
<p>加载中...</p>
</div>
</div>
<!-- 画布区(ScrollArea:主题化滚动条,纵向 + 横向;w-fit mx-auto 窄图水平居中) -->
<ScrollAreaRoot v-else class="flex-1 min-h-0 bg-background">
<ScrollAreaViewport class="size-full outline-none">
<div class="p-4 w-fit mx-auto">
<!--
画布区(ScrollArea:主题化滚动条,纵向 + 横向;w-fit mx-auto 窄图水平居中)。
内边距必须是内层的(这里是包住画布的 div,属于滚动内容),且底部要留够:
画布的 shadow-2xl 向下投影约 38px,原来 p-4(16px)不够 —— 滚到底时
画布下方那条阴影会被视口裁掉。左右方向 16px 已够(水平投影约 13px)。
-->
<ScrollAreaRoot v-else class="flex-1 min-h-0 bg-background">
<ScrollAreaViewport class="size-full outline-none">
<div class="px-4 pt-4 pb-12 w-fit mx-auto">
<div class="canvas-wrap relative inline-block shadow-2xl">
<canvas
ref="canvasRef"
+92 -29
View File
@@ -8,25 +8,58 @@ import { toast } from 'vue-sonner'
import { open } from '@tauri-apps/plugin-dialog'
import { useScreenshotStore, type RecentCapture } from '@/stores/screenshotStore'
import { useModuleTabs } from '@/lib/use-module-tabs'
import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs'
import { ScrollArea } from '@/components/ui/scroll-area'
import { Tabs, TabsContent } from '@/components/ui/tabs'
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
import { Button } from '@/components/ui/button'
import { Switch } from '@/components/ui/switch'
import { Label } from '@/components/ui/label'
import { Tooltip, TooltipTrigger, TooltipContent } from '@/components/ui/tooltip'
import {
Pagination, PaginationContent, PaginationItem, PaginationEllipsis,
} from '@/components/ui/pagination'
const store = useScreenshotStore()
const activeTab = ref('settings')
const tabsListRef = useModuleTabs('screenshot', activeTab, [
{ value: 'settings', label: '设置' },
/**
* 历史排在第一并作为默认页:截图模块的日常用法是「截完看一眼、复制/另存」,
* 进来先看到最近截图比先看到设置更贴近使用节奏(设置改一次就很少再动)。
* Tab 顺序即使用频率顺序 —— 与其它模块「主用途在前、设置在后」的排法一致。
*/
const activeTab = ref('history')
useModuleTabs('screenshot', activeTab, [
{ value: 'history', label: '历史' },
])
{ value: 'settings', label: '设置' },
], { alwaysVisible: true })
const HISTORY_LIMITS = [24, 48, 96]
const DELAY_OPTIONS = [0, 1, 2, 3, 5]
/**
* 历史分页:一页 9 张(3×3)。
*
* 历史条数上限是 96(HISTORY_LIMITS),若把 96 张缩略图一次性塞进 DOM:
* 解码与内存占用会让「打开历史页」和滚动都变卡。分页把同时存在的 `<img>`
* 限制在 9 个,翻页只重挂这一页的元素。
* 页码是纯前端切片(`store.recent` 本就全在内存里),所以用不着走后端分页 ——
* 与剪贴板那边(后端分页 + `historyTotal`)的取数方式不同,但分页 UI 同一个组件。
*/
const PAGE_SIZE = 9
const currentPage = ref(1)
const totalPages = computed(() => Math.max(1, Math.ceil(store.recent.length / PAGE_SIZE)))
const pagedRecent = computed(() => {
const start = (currentPage.value - 1) * PAGE_SIZE
return store.recent.slice(start, start + PAGE_SIZE)
})
/** 列表变化(新增截图 / 删除 / 清空)后把页码收进有效范围,避免停在空页上 */
watch(totalPages, tp => {
if (currentPage.value > tp) currentPage.value = tp
})
function gotoPage(p: number) {
currentPage.value = Math.min(Math.max(1, p), totalPages.value)
}
function formatTime(t: number): string {
const d = new Date(t)
const pad = (n: number) => String(n).padStart(2, '0')
@@ -208,22 +241,12 @@ onUnmounted(() => {
</script>
<template>
<div class="h-full p-6 overflow-hidden flex flex-col">
<div class="min-h-full p-5 flex flex-col">
<Tabs v-model="activeTab" class="flex-1 min-h-0 flex flex-col">
<div ref="tabsListRef" class="shrink-0">
<TabsList class="grid w-full max-w-md grid-cols-2 !bg-transparent !p-0 !shadow-none">
<TabsTrigger value="settings" class="gap-1.5"><Settings class="size-3.5" />设置</TabsTrigger>
<TabsTrigger value="history" class="gap-1.5">
<ImageIcon class="size-3.5" />历史
<span v-if="store.recent.length" class="text-xs text-muted-foreground">({{ store.recent.length }})</span>
</TabsTrigger>
</TabsList>
</div>
<!-- 截图设置 -->
<TabsContent value="settings" class="flex-1 min-h-0 mt-4">
<ScrollArea class="h-full">
<div class="space-y-4 max-w-3xl">
<TabsContent value="settings" class="flex-1 min-h-0">
<div class="h-full">
<div class="space-y-4">
<!-- 快捷键 -->
<Card>
<CardHeader>
@@ -423,12 +446,12 @@ onUnmounted(() => {
</CardContent>
</Card>
</div>
</ScrollArea>
</div>
</TabsContent>
<!-- 历史记录 -->
<TabsContent value="history" class="flex-1 min-h-0 mt-4">
<ScrollArea class="h-full">
<TabsContent value="history" class="flex-1 min-h-0">
<div class="h-full">
<div>
<!-- 空状态 -->
<div
@@ -440,15 +463,54 @@ onUnmounted(() => {
<p class="text-xs">按 Ctrl + 1 截图并导出后会显示在这里</p>
</div>
<!-- 历史网格 -->
<div v-else class="grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-4 gap-3">
<template v-else>
<!--
分页条:只在多于一页时出现,放在网格上方(翻页后不用滚回去)
-->
<div v-if="totalPages > 1" class="flex items-center gap-3 pb-3">
<Pagination
v-slot="{ page }"
:page="currentPage"
:total="store.recent.length"
:items-per-page="PAGE_SIZE"
:sibling-count="1"
show-edges
@update:page="gotoPage"
class="justify-start"
>
<PaginationContent v-slot="{ items }" class="gap-1">
<template v-for="(item, index) in items" :key="index">
<PaginationItem
v-if="item.type === 'page'"
:value="item.value"
:is-active="item.value === page"
size="icon"
class="size-7 text-xs"
>
{{ item.value }}
</PaginationItem>
<PaginationEllipsis v-else class="size-7" />
</template>
</PaginationContent>
</Pagination>
<span class="ml-auto shrink-0 text-xs text-muted-foreground">
第 {{ currentPage }} / {{ totalPages }} 页 · 共 {{ store.recent.length }} 张
</span>
</div>
<!-- 历史网格:一页 9 张 → 按 3 列排(3×3) -->
<div class="grid grid-cols-2 sm:grid-cols-3 gap-3">
<div
v-for="item in store.recent"
v-for="item in pagedRecent"
:key="item.id"
class="group relative rounded-lg border bg-muted/30 overflow-hidden"
>
<!-- 缩略图 -->
<div class="aspect-video flex items-center justify-center bg-zinc-900">
<!--
缩略图底座:用语义色 bg-muted(随深浅主题切换),而不是写死的
深色 —— 浅色主题下那块黑底非常突兀,且带透明通道的截图在黑底上
看不出边界。
-->
<div class="aspect-video flex items-center justify-center bg-muted">
<img
:src="thumbSrc(item)"
class="max-w-full max-h-full object-contain"
@@ -518,8 +580,9 @@ onUnmounted(() => {
</div>
</div>
</div>
</template>
</div>
</ScrollArea>
</div>
</TabsContent>
</Tabs>
</div>
+16 -12
View File
@@ -4,6 +4,7 @@ import { invoke } from '@tauri-apps/api/core'
import { getCurrentWindow } from '@tauri-apps/api/window'
import { emit, listen, type UnlistenFn } from '@tauri-apps/api/event'
import { EVENTS, STORAGE_KEYS, WINDOWS } from '@/lib/constants'
import { applyStoredAccent } from '@/lib/theme'
// Rust 端通过 tauri-specta 生成的命令绑定(bindings.ts)
import { commands } from '@/lib/bindings'
import {
@@ -309,6 +310,7 @@ const hint = computed(() => {
case 'drawing': return '松开鼠标完成选区'
case 'selected': return '拖动移动选区 · 拖动手柄调整大小 · 选择工具开始标注 · Enter 完成 · Esc 取消'
case 'editing': return '在选区内绘制标注 · 文字工具点击已有文字可编辑 · Ctrl+Enter 完成 · Esc 退出标注'
default: return ''
}
})
@@ -600,8 +602,8 @@ function normRect(a: Point, b: Point): Sel {
function clampSel() {
const s = sel.value
const min = 8
let w = Math.min(Math.max(min, s.w), winW.value)
let h = Math.min(Math.max(min, s.h), winH.value)
const w = Math.min(Math.max(min, s.w), winW.value)
const h = Math.min(Math.max(min, s.h), winH.value)
const x = Math.min(Math.max(0, s.x), winW.value - w)
const y = Math.min(Math.max(0, s.y), winH.value - h)
sel.value = { x, y, w, h }
@@ -1858,6 +1860,8 @@ function applyTheme() {
else if (theme === 'light') isDark = false
else isDark = window.matchMedia('(prefers-color-scheme: dark)').matches
root.classList.toggle('dark', isDark)
// 主题色:与主窗口共用同一份设置(行内变量压住 .dark 规则,按当前模式整组重写)
applyStoredAccent(root, isDark ? 'dark' : 'light', STORAGE_KEYS.appSettings)
// 跟随系统时监听变化
return window.matchMedia('(prefers-color-scheme: dark)')
}
@@ -2465,7 +2469,7 @@ onUnmounted(() => {
padding: 8px 14px;
background: rgba(15, 23, 42, 0.92);
border: 1px solid rgba(239, 68, 68, 0.6);
color: #fecaca;
color: var(--danger);
font-size: 13px;
line-height: 1.4;
border-radius: 6px;
@@ -2487,7 +2491,7 @@ onUnmounted(() => {
/* 窗口识别:框内全透明透出原画面,box-shadow 暗化框外(形成"框内透明、框外变暗") */
.win-highlight {
position: absolute;
border: 2px solid #3b82f6;
border: 2px solid var(--primary);
box-shadow: 0 0 0 9999px rgba(0, 0, 0, 0.45);
pointer-events: none;
z-index: 5;
@@ -2498,7 +2502,7 @@ onUnmounted(() => {
left: -2px;
max-width: 240px;
padding: 1px 6px;
background: #3b82f6;
background: var(--primary);
color: #fff;
font-size: 12px;
border-radius: 3px;
@@ -2510,7 +2514,7 @@ onUnmounted(() => {
/* 拖拽中的选区:透明内部 + 巨大 box-shadow 形成外部遮罩 */
.selection {
position: absolute;
border: 2px solid #3b82f6;
border: 2px solid var(--primary);
box-shadow: 0 0 0 9999px rgba(0, 0, 0, 0.45);
pointer-events: none;
z-index: 5;
@@ -2520,7 +2524,7 @@ onUnmounted(() => {
top: -24px;
left: 0;
padding: 2px 6px;
background: #3b82f6;
background: var(--primary);
color: #fff;
font-size: 12px;
border-radius: 3px;
@@ -2548,7 +2552,7 @@ onUnmounted(() => {
.region-border {
position: absolute;
inset: 0;
border: 2px solid #3b82f6;
border: 2px solid var(--primary);
box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.6);
pointer-events: none;
}
@@ -2559,7 +2563,7 @@ onUnmounted(() => {
width: 9px;
height: 9px;
background: #fff;
border: 2px solid #3b82f6;
border: 2px solid var(--primary);
border-radius: 2px;
transform: translate(-50%, -50%);
z-index: 8;
@@ -2742,14 +2746,14 @@ onUnmounted(() => {
color: #fff;
white-space: nowrap;
}
.sm-mode.auto { background: #2563eb; }
.sm-mode.manual { background: #059669; }
.sm-mode.auto { background: var(--primary); }
.sm-mode.manual { background: var(--success); }
/* 拼接进行中的呼吸点 */
.sm-dot {
width: 7px;
height: 7px;
border-radius: 999px;
background: #22c55e;
background: var(--success);
animation: sm-pulse 1.1s ease-in-out infinite;
flex-shrink: 0;
}
+3
View File
@@ -9,6 +9,7 @@ import { LogicalPosition, LogicalSize } from '@tauri-apps/api/dpi'
import { emit, listen, type UnlistenFn } from '@tauri-apps/api/event'
import { ChevronLeft, ChevronRight, X, Loader2 } from '@lucide/vue'
import { EVENTS, STORAGE_KEYS } from '@/lib/constants'
import { applyStoredAccent } from '@/lib/theme'
// Rust 端通过 tauri-specta 生成的命令绑定(bindings.ts)
import { commands } from '@/lib/bindings'
@@ -220,6 +221,8 @@ function applyTheme() {
isDark = theme === 'dark'
}
root.classList.toggle('dark', isDark)
// 主题色:与主窗口共用同一份设置(行内变量压住 .dark 规则,按当前模式整组重写)
applyStoredAccent(root, isDark ? 'dark' : 'light', STORAGE_KEYS.appSettings)
}
/** 从 localStorage 读取主窗口持久化的截图历史(图片文件在应用数据目录) */
+1 -1
View File
@@ -20,7 +20,7 @@ const height = ref(0)
const status = ref('')
/** 是否已收到最终事件(完成/取消),此后关闭窗口不再触发取消 */
let ended = false
let unlisten: UnlistenFn[] = []
const unlisten: UnlistenFn[] = []
onMounted(async () => {
status.value = auto.value ? '自动向下拼接中…' : '请滚动目标窗口,完成后点「完成」'
+1 -1
View File
@@ -55,5 +55,5 @@ export const moduleConfig: ModuleConfig = {
defaultEnabled: true,
loader: () => import('./ScreenshotModule.vue'),
searchItems,
order: 30
order: 70
}
+158 -6
View File
@@ -1,9 +1,10 @@
<script setup lang="ts">
import { Monitor, Sun, Moon, Sparkles, Layers, LogOut, Package, GripVertical, Info, RefreshCw, Download, Check, Loader2, X } from '@lucide/vue'
import { Monitor, Sun, Moon, Sparkles, Layers, LogOut, Package, GripVertical, Info, RefreshCw, Download, Check, Loader2, X, Palette, RotateCcw } from '@lucide/vue'
import { Switch } from '@/components/ui/switch'
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
import { Label } from '@/components/ui/label'
import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input'
import { Progress } from '@/components/ui/progress'
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
import { useAppStore, type Theme, type EffectType, type ModuleInfo } from '@/stores/appStore'
@@ -20,6 +21,14 @@ import { VueDraggable } from 'vue-draggable-plus'
import { toast } from 'vue-sonner'
import { storeToRefs } from 'pinia'
import { useUpdaterStore } from '@/stores/updaterStore'
import {
ACCENT_PRESETS,
CUSTOM_ACCENT_ID,
DEFAULT_ACCENT_ID,
contrastRatio,
deriveAccent,
parseHex
} from '@/lib/theme'
const appStore = useAppStore()
const searchStore = useSearchStore()
@@ -383,6 +392,8 @@ onMounted(() => {
searchStore.registerAction('settings', 9, () => scrollToCard('settings-card-about'))
searchStore.registerAction('settings', 10, () => scrollToCard('settings-card-about'))
searchStore.registerAction('settings', 11, () => scrollToCard('settings-card-quit'))
// 主题色:追加在 searchItems 末尾(index 12),避免给前面 0–11 重新编号
searchStore.registerAction('settings', 12, () => scrollToCard('settings-card-accent'))
// 主动刷新所有进程状态,确保内核 badge 显示当前真实状态(而非过期缓存)
processStore.refreshAll().catch(() => { /* 忽略:后端可能未就绪 */ })
})
@@ -402,6 +413,65 @@ const effects: Array<{ id: EffectType; name: string; color: string; darkColor: s
// 亚克力仅在"跟随系统"主题下能正确同步深浅色(无深浅枚举,依赖系统级主题广播刷新)
const isAcrylicDisabled = () => appStore.theme !== 'system'
// ===== 主题色 =====
/**
* 色板显示色用**派生后的浅色模式主色**,而不是原始基色 ——
* 用户看到的就是实际会生效的颜色(如青柠会被自动压暗),避免"选的色和界面不一致"。
*/
const accentSwatches = ACCENT_PRESETS.map(preset => ({
...preset,
swatch: deriveAccent(preset.hex, 'light')['--primary']
}))
/** 自定义色块的显示色(同样走派生) */
const customSwatch = computed(() => {
const hex = appStore.accentHex
return hex && parseHex(hex) ? deriveAccent(hex, 'light')['--primary'] : null
})
/** 色块上的对勾颜色:浅色底上用深墨,否则白 */
const checkColor = (hex: string) => (contrastRatio(hex, '#ffffff') >= 3 ? '#ffffff' : '#1d1d1f')
/**
* 自定义色输入框:文本框走草稿 + 回车/失焦提交(逐字符落盘会把 `#00` 这类半成品
* 写进设置),原生取色器则连续 `input` 事件直接生效(改一个颜色写 7 个变量,开销极低)。
*/
const customHexDraft = ref('')
watch(
() => [appStore.accentId, appStore.accentHex] as const,
([id, hex]) => {
customHexDraft.value =
id === CUSTOM_ACCENT_ID && hex
? hex
: (ACCENT_PRESETS.find(p => p.id === id)?.hex ?? '')
},
{ immediate: true }
)
function applyCustomHex(hex: string) {
appStore.setAccent(CUSTOM_ACCENT_ID, hex)
}
function commitCustomHex() {
const hex = customHexDraft.value.trim()
if (!parseHex(hex)) {
// 非法输入回退到当前生效值,不做静默丢弃
customHexDraft.value = appStore.accentHex ?? ''
toast.error('请输入 #RRGGBB 格式的颜色值')
return
}
applyCustomHex(hex.startsWith('#') ? hex : `#${hex}`)
}
/** 原生取色器:连续拖动时逐次生效,实时预览 */
function onCustomPick(e: Event) {
const value = (e.target as HTMLInputElement).value
customHexDraft.value = value
applyCustomHex(value)
}
// 应用当前是否为深色模式(响应式,随主题与系统偏好变化)
const isAppDark = computed(() => {
if (appStore.theme === 'dark') return true
@@ -502,8 +572,8 @@ const onDragEnd = () => {
</script>
<template>
<div class="h-full p-6 overflow-y-auto">
<div class="max-w-3xl mx-auto space-y-6">
<div class="min-h-full p-6">
<div class="space-y-6">
<Card>
<CardHeader>
<CardTitle class="flex items-center gap-2">
@@ -561,7 +631,7 @@ const onDragEnd = () => {
<component
:is="theme.icon"
class="size-8 transition-colors duration-300"
:class="theme.id === 'dark' || (theme.id === 'system' && systemDark) ? 'text-white' : 'text-gray-800'"
:class="theme.id === 'dark' || (theme.id === 'system' && systemDark) ? 'text-white' : 'text-foreground'"
/>
</div>
<div class="h-10 flex items-center justify-center">
@@ -580,6 +650,88 @@ const onDragEnd = () => {
</CardContent>
</Card>
<Card id="settings-card-accent">
<CardHeader>
<CardTitle class="flex items-center gap-2">
<Palette class="size-5 text-primary" />
主题色
</CardTitle>
</CardHeader>
<CardContent class="space-y-4">
<!-- 预设色板 + 自定义取色 -->
<div class="flex flex-wrap items-center gap-2.5">
<button
v-for="preset in accentSwatches"
:key="preset.id"
class="relative size-8 rounded-full border-2 transition-all duration-200"
:class="
appStore.accentId === preset.id
? 'border-primary scale-110 shadow-md'
: 'border-border hover:border-primary/50'
"
:style="{ backgroundColor: preset.swatch }"
:title="preset.name"
@click="appStore.setAccent(preset.id)"
>
<Check
v-if="appStore.accentId === preset.id"
class="absolute inset-0 m-auto size-4"
:style="{ color: checkColor(preset.swatch) }"
/>
</button>
<!-- 自定义:原生取色器(覆盖在色块上,点击即弹系统取色面板) -->
<label
class="relative size-8 rounded-full border-2 border-dashed transition-all duration-200 cursor-pointer"
:class="
appStore.accentId === CUSTOM_ACCENT_ID
? 'border-primary scale-110 shadow-md'
: 'border-border hover:border-primary/50'
"
:style="customSwatch ? { backgroundColor: customSwatch } : undefined"
title="自定义颜色"
>
<input
type="color"
class="absolute inset-0 size-full cursor-pointer opacity-0"
:value="appStore.accentHex ?? '#0066cc'"
@input="onCustomPick"
/>
<Palette
class="absolute inset-0 m-auto size-4"
:style="{ color: customSwatch ? checkColor(customSwatch) : 'var(--muted-foreground)' }"
/>
</label>
</div>
<div class="flex flex-wrap items-center gap-3">
<Label class="text-xs text-muted-foreground">自定义</Label>
<Input
v-model="customHexDraft"
class="h-8 w-28 font-mono text-xs"
placeholder="#0066cc"
spellcheck="false"
@keydown.enter="commitCustomHex"
@blur="commitCustomHex"
/>
<Button
size="sm"
variant="outline"
:disabled="appStore.accentId === DEFAULT_ACCENT_ID"
@click="appStore.setAccent(DEFAULT_ACCENT_ID)"
>
<RotateCcw class="size-3.5" />
恢复默认
</Button>
</div>
<p class="text-xs text-muted-foreground">
深浅模式会自动调整同一个颜色的亮度:浅色下压暗、深色下提亮,
保证按钮文字与选中态在任何色相下都清晰可读。状态色(成功 / 警告 / 危险)不随主题色变化。
</p>
</CardContent>
</Card>
<Card>
<CardHeader>
<CardTitle class="flex items-center gap-2">
@@ -673,7 +825,7 @@ const onDragEnd = () => {
<span
v-if="getProcessStatusText(module.id)"
class="text-xs px-1.5 py-0.5 rounded-full"
:class="module.enabled ? 'bg-green-500/10 text-green-600 dark:text-green-400' : 'bg-muted text-muted-foreground'"
:class="module.enabled ? 'bg-success-soft text-success-text' : 'bg-muted text-muted-foreground'"
>
{{ getProcessStatusText(module.id) }}
</span>
@@ -753,7 +905,7 @@ const onDragEnd = () => {
</div>
</div>
<div v-else class="flex items-center gap-1.5 text-sm text-muted-foreground">
<Check class="size-4 text-green-500" />
<Check class="size-4 text-success" />
已是最新版本
</div>
</div>
+6
View File
@@ -62,6 +62,12 @@ const searchItems: SearchIndexItem[] = [
title: '退出程序',
description: '彻底退出 Thing 应用',
keywords: ['退出', '关闭', 'quit', 'exit', '结束']
},
// 追加在末尾:searchItems 的下标与 GeneralSettings 里 registerAction 的 index 一一对应
{
title: '主题色',
description: '自定义应用强调色(预设色板 / 自定义颜色)',
keywords: ['主题色', '强调色', '配色', '颜色', 'accent', 'color', 'theme']
}
]
+288
View File
@@ -0,0 +1,288 @@
<script setup lang="ts">
/**
* 终端「新建独立窗口」的选择窗口。
*
* # 为什么是「先开窗、再问」
*
* 旧流程是:快捷键 → 主窗口弹选择框 → 选完再开独立窗口。结果是用户按了快捷键
* 之后焦点先被拉到主窗口、选完窗口再跳一次。现在按快捷键**立刻开一个窗口**,
* 选择就发生在这个窗口里 —— 全程不打扰主窗口(它可能在别的显示器上最小化着)。
*
* # 选完之后为什么本窗口会关闭
*
* 会话的独立窗口 label 必须是 `terminal-window-<sessionId>`(Rust 侧 `label_for`),
* 而这个窗口是先于会话创建的,label 只能是临时值 —— 窗口 label 在 Tauri 里不可改。
* 因此选完目标后交给 Rust 用**规范 label** 开真正的会话窗口(`terminal_detach_session`
* 会顺带把会话标记为已分离),本窗口随即关闭。两个窗口都是居中、同尺寸,
* 视觉上是「原地换成会话窗口」。
*
* # 与主窗口的关系
*
* 本窗口是独立入口(main.ts 按 hash 路由),自带 Pinia;会话与设置的真实状态在
* Rust 侧,因此这里 `useTerminalStore().init()` 拿到的列表与主窗口一致。
*/
import { computed, onMounted, onBeforeUnmount, ref } from 'vue'
import { getCurrentWindow } from '@tauri-apps/api/window'
import { Globe, Loader2, Minus, Square, TerminalSquare, X } from '@lucide/vue'
import { toast } from 'vue-sonner'
import { useTerminalStore } from '@/stores/terminalStore'
import { createLogger } from '@/lib/logger'
import { applyStoredAccent } from '@/lib/theme'
import { appIsDark } from '@/lib/terminalThemes'
import { STORAGE_KEYS } from '@/lib/constants'
import { Button } from '@/components/ui/button'
import { Toaster } from '@/components/ui/sonner'
import { ScrollArea } from '@/components/ui/scroll-area'
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
const logger = createLogger('terminal')
const store = useTerminalStore()
const win = getCurrentWindow()
// ===== 主题:与其它独立窗口同一套(只读同一份 localStorage 设置) =====
//
// 不应用 mica/acrylic:本窗口是不透明窗口,没有透明通道承载玻璃效果。
// 本窗口由前端**隐藏创建**(见 openWindow.ts),应用完主题再显示 ——
// 否则深色模式下会先闪一个纯白窗口。
/** 与 style.css 的 `--background` 对齐:浅色 #ffffff / 深色 #16161a */
const WINDOW_BG = { light: '#ffffff', dark: '#16161a' }
function readMainTheme(): string {
try {
const raw = localStorage.getItem(STORAGE_KEYS.appSettings)
if (raw) return (JSON.parse(raw) as { theme?: string }).theme ?? 'system'
} catch {
/* 设置不可读时按跟随系统处理 */
}
return 'system'
}
function resolveIsDark(theme: string): boolean {
if (theme === 'dark') return true
if (theme === 'light') return false
return window.matchMedia('(prefers-color-scheme: dark)').matches
}
async function applyTheme() {
const root = document.documentElement
const theme = readMainTheme()
const isDark = resolveIsDark(theme)
try {
await win.setTheme(theme === 'system' ? null : (theme as 'dark' | 'light'))
} catch {
/* 平台不支持时忽略 */
}
try {
// 底色单独 try:setTheme 失败不该连带跳过底色,否则仍会白底闪一下
await win.setBackgroundColor(isDark ? WINDOW_BG.dark : WINDOW_BG.light)
} catch {
/* 忽略 */
}
root.classList.toggle('dark', isDark)
// 与其它终端窗口保持一致:本窗口不渲染终端,但主题状态是全局约定
appIsDark.value = isDark
applyStoredAccent(root, isDark ? 'dark' : 'light', STORAGE_KEYS.appSettings)
}
const darkMedia = window.matchMedia('(prefers-color-scheme: dark)')
const onThemeChange = () => void applyTheme()
const onStorageChange = (e: StorageEvent) => {
if (e.key === STORAGE_KEYS.appSettings) void applyTheme()
}
// ===== 列表 =====
const ready = ref(false)
const busy = ref(false)
/** 正在创建的目标名(列表上显示 spinner) */
const pending = ref('')
const shells = computed(() => store.shells.filter(s => s.enabled))
const hosts = computed(() =>
[...store.hosts].sort((a, b) => a.config.name.localeCompare(b.config.name, 'zh-CN'))
)
onMounted(async () => {
darkMedia.addEventListener('change', onThemeChange)
window.addEventListener('storage', onStorageChange)
window.addEventListener('keydown', onKeydown, true)
// 主题 → 显示:窗口是隐藏创建的(见 openWindow.ts),这一刻用户才第一次看到它
await applyTheme()
try {
await win.show()
await win.setFocus()
} catch (e) {
logger.warn(`显示选择窗口失败:${String(e)}`)
}
try {
await store.init()
} catch (e) {
logger.error(`选择窗口初始化失败:${String(e)}`)
toast.error(`读取会话列表失败:${String(e)}`)
} finally {
ready.value = true
}
})
onBeforeUnmount(() => {
darkMedia.removeEventListener('change', onThemeChange)
window.removeEventListener('storage', onStorageChange)
window.removeEventListener('keydown', onKeydown, true)
})
/** Esc 关闭本窗口(选择窗口是临时性的,错了直接关掉最省事) */
function onKeydown(e: KeyboardEvent) {
if (e.key === 'Escape') {
e.preventDefault()
void win.close()
}
}
/**
* 建会话 → 交给 Rust 开规范 label 的会话窗口 → 关掉本窗口。
*
* 失败(例如已达独立窗口上限)时**不关窗**:错误提示要留在用户眼前。
*/
async function launch(create: () => Promise<{ id: string }>, name: string) {
if (busy.value) return
busy.value = true
pending.value = name
try {
const info = await create()
await store.detachSession(info.id)
await win.close()
} catch (e) {
toast.error(`打开独立窗口失败:${String(e)}`)
} finally {
busy.value = false
pending.value = ''
}
}
async function minimize() {
await win.minimize()
}
async function toggleMaximize() {
await win.toggleMaximize()
}
async function closeWindow() {
await win.close()
}
</script>
<template>
<TooltipProvider>
<div class="flex flex-col h-screen w-screen overflow-hidden bg-background">
<!-- 控制栏:标题(兼拖拽区)+ 窗口按钮(与终端独立窗口同构) -->
<div class="shrink-0 flex items-center gap-1 h-9 px-1.5 border-b border-border">
<div class="flex h-full min-w-0 flex-1 items-center gap-1.5 px-2" data-tauri-drag-region>
<TerminalSquare class="size-3.5 shrink-0 text-muted-foreground pointer-events-none" />
<span class="truncate text-xs font-medium pointer-events-none">新建终端窗口</span>
<span class="truncate text-[11px] text-muted-foreground pointer-events-none">
选择一个本地 Shell 或已保存的 SSH 主机,会话将在新的独立窗口中打开
</span>
</div>
<Tooltip>
<TooltipTrigger as-child>
<Button variant="ghost" size="icon-sm" @click="minimize">
<Minus class="size-3.5" />
</Button>
</TooltipTrigger>
<TooltipContent side="bottom">最小化</TooltipContent>
</Tooltip>
<Tooltip>
<TooltipTrigger as-child>
<Button variant="ghost" size="icon-sm" @click="toggleMaximize">
<Square class="size-3" />
</Button>
</TooltipTrigger>
<TooltipContent side="bottom">最大化 / 还原</TooltipContent>
</Tooltip>
<Tooltip>
<TooltipTrigger as-child>
<Button
variant="ghost"
size="icon-sm"
class="hover:!bg-destructive hover:!text-destructive-foreground"
@click="closeWindow"
>
<X class="size-3.5" />
</Button>
</TooltipTrigger>
<TooltipContent side="bottom">关闭(Esc)</TooltipContent>
</Tooltip>
</div>
<!-- 列表:居中收窄,避免大屏上一行被拉到很远 -->
<ScrollArea class="flex-1 min-h-0">
<div class="mx-auto w-full max-w-md p-5">
<div v-if="!ready" class="flex items-center justify-center gap-2 py-10 text-xs text-muted-foreground">
<Loader2 class="size-4 animate-spin" /> 正在读取会话列表…
</div>
<template v-else>
<p class="pb-1.5 text-[11px] font-medium tracking-wide text-muted-foreground">本地 Shell</p>
<div class="flex flex-col gap-0.5">
<button
v-for="sh in shells"
:key="sh.id"
type="button"
class="flex items-center gap-2 rounded-md px-2 py-2 text-left text-[13px] transition-colors
hover:bg-accent/60 disabled:pointer-events-none disabled:opacity-50"
:disabled="busy"
@click="launch(() => store.openLocal(sh.id, undefined, 120, 30), sh.name)"
>
<TerminalSquare class="size-3.5 shrink-0 text-muted-foreground" />
<span class="min-w-0 flex-1 truncate">{{ sh.name }}</span>
<Loader2 v-if="pending === sh.name" class="size-3.5 shrink-0 animate-spin" />
</button>
<p v-if="shells.length === 0" class="px-2 py-1 text-[11.5px] text-muted-foreground">
没有可用的 Shell,请到「终端 → 设置 → Shell」重新探测。
</p>
</div>
<p class="px-0 pb-1.5 pt-4 text-[11px] font-medium tracking-wide text-muted-foreground">
SSH 主机
</p>
<div class="flex flex-col gap-0.5">
<button
v-for="h in hosts"
:key="h.config.id"
type="button"
class="flex items-center gap-2 rounded-md px-2 py-2 text-left text-[13px] transition-colors
hover:bg-accent/60 disabled:pointer-events-none disabled:opacity-50"
:disabled="busy"
@click="launch(() => store.openSsh(h.config.id, 120, 30), h.config.name)"
>
<Globe class="size-3.5 shrink-0 text-muted-foreground" />
<span class="min-w-0 flex-1 truncate">{{ h.config.name }}</span>
<span class="shrink-0 text-[11px] text-muted-foreground">
{{ h.config.username ? `${h.config.username}@` : '' }}{{ h.config.host }}
</span>
<Loader2 v-if="pending === h.config.name" class="size-3.5 shrink-0 animate-spin" />
</button>
<p v-if="hosts.length === 0" class="px-2 py-1 text-[11.5px] text-muted-foreground">
还没有保存的 SSH 主机,到「终端 → 主机」新建一台。
</p>
</div>
</template>
</div>
</ScrollArea>
<Toaster position="bottom-right" rich-colors close-button :style="{ zIndex: 99999 }" />
</div>
</TooltipProvider>
</template>
<style scoped>
/* 本窗口无边框,禁止整页滚动与选中,贴近原生窗口行为 */
:global(html),
:global(body) {
overflow: hidden;
margin: 0;
}
</style>
File diff suppressed because it is too large. Load diff
@@ -0,0 +1,112 @@
<script setup lang="ts">
/**
* 终端「新建独立窗口」全局快捷键的宿主(挂在 App.vue)。
*
* # 为什么挂在 App 层
*
* 快捷键是**全局**的(任何窗口前台时都能按),而终端模块的界面是懒加载的 ——
* 用户此刻可能停在下载器或音乐模块上,那时终端模块根本没挂载。宿主必须在常驻组件里。
*
* # 触发后只做一件事:开选择窗口
*
* 选择会话的界面在**独立窗口里**(见 `NewTerminalWindow.vue`),不再经过主窗口弹窗 ——
* 用户按了快捷键就该看到一个终端窗口,而不是主窗口被拉到前台再弹一个框。
*
* # 键位从设置里读
*
* 键位存在终端设置的快捷键表里(设置 → 快捷键 → 会话 → 新建独立窗口,默认 `Ctrl+3`),
* 因此这里是「读设置 → 注册」而不是硬编码:改键后 watch 到变化即重新注册。
* 关掉那一行右侧的开关 = 不注册。
*
* # 注册方式与冲突
*
* 用 `@tauri-apps/plugin-global-shortcut` 的 JS 接口,而不是像剪贴板/快速面板那样
* 在 Rust `setup.rs` 注册:那条路需要为终端新增 Rust 命令并重新生成 `bindings.ts`。
* 代价是绕过了 `crate::shortcut` 的应用内占用表 —— 因此这条例外地在**注册失败时
* 只记日志**(系统或其它应用占用同名热键时静默降级),不弹提示打断启动。
*/
import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
import { isRegistered, register, unregister } from '@tauri-apps/plugin-global-shortcut'
import { useAppStore } from '@/stores/appStore'
import { useTerminalStore } from '@/stores/terminalStore'
import { createLogger } from '@/lib/logger'
import { ACTION_MAP } from '@/lib/terminalActions'
import { openTerminalPickerWindow } from './openWindow'
/** 与 `TERMINAL_ACTIONS` 中的动作 id 一致 */
const ACTION_ID = 'newDetachedWindow'
const logger = createLogger('terminal')
const appStore = useAppStore()
const store = useTerminalStore()
/** 终端模块是否启用(禁用时不该继续占用系统热键) */
const moduleEnabled = computed(() => appStore.modules.find(m => m.id === 'terminal')?.enabled !== false)
/**
* 生效的键位。
*
* 设置还没加载时先用前端默认值(与 Rust `default_shortcuts()` 里的值一致),
* 避免「应用刚启动、快捷键暂时不生效」的空窗期。那一行的开关关掉即为空串(不注册)。
*/
const shortcutKey = computed(() => {
const fallback = ACTION_MAP[ACTION_ID]?.defaultKeys ?? ''
const row = store.settings?.shortcuts?.find(b => b.action === ACTION_ID)
if (!row) return fallback
if (row.enabled === false) return ''
return row.keys || fallback
})
/** 当前已注册的键位(改键时先注销它) */
const registeredKey = ref('')
async function applyShortcut() {
if (registeredKey.value) {
try {
if (await isRegistered(registeredKey.value)) await unregister(registeredKey.value)
} catch (e) {
logger.warn(`注销全局快捷键失败:${String(e)}`)
}
registeredKey.value = ''
}
if (!moduleEnabled.value) return
const key = shortcutKey.value
if (!key) return
try {
await register(key, onShortcut)
registeredKey.value = key
} catch (e) {
// 热键被系统或其它应用占用时静默降级:只记日志,不打断启动
logger.error(`注册终端全局快捷键 ${key} 失败:${String(e)}`)
}
}
function onShortcut(event: { state: 'Pressed' | 'Released' }) {
if (event.state !== 'Pressed') return
void openTerminalPickerWindow().catch(e => logger.error(`打开终端选择窗口失败:${String(e)}`))
}
onMounted(async () => {
// 先把终端设置读进来:否则启动瞬间只能拿前端默认键位注册,
// 用户改过键位的话会有一段时间占着旧键(直到终端模块首次打开才纠正)。
try {
await store.init()
} catch (e) {
logger.warn(`终端设置读取失败:${String(e)}`)
}
await applyShortcut()
})
onBeforeUnmount(() => {
if (registeredKey.value) void unregister(registeredKey.value).catch(() => {})
})
// 键位 / 模块开关变化时同步系统热键
watch([shortcutKey, moduleEnabled], () => void applyShortcut())
</script>
<template>
<!-- 纯逻辑组件:选择界面在自己的窗口里,见 NewTerminalWindow.vue -->
<span />
</template>
+470 -47
View File
@@ -23,17 +23,65 @@
*
* 输出事件是**窗口广播**(Rust 侧 `app.emit` 发到所有窗口),主窗口的监听器
* 管不到本窗口。这正是「独立窗口能收到输出」的实现基础。
*
* # 界面:与终端页同构的「终端卡片」(2026-09-21)
*
* 此前本窗口是一条 h-8 的标题栏 + 画布 + 状态栏,与主窗口里的终端页看起来
* 是两套东西。现在改成与终端页**同一套结构与组件**:
*
* ```
* ┌───────────────────────────────────────────────────────────┐
* │ [图标 会话名 …可拖拽…] │ 搜索 字体 清屏 ⋯ │ ─ □ ✕ │ ← 控制栏 h-9
* ├───────────────────────────────────────────────────────────┤
* │ 画布(xterm) │
* ├───────────────────────────────────────────────────────────┤
* │ 状态栏(与主窗口同一个 TerminalStatusBar) │
* └───────────────────────────────────────────────────────────┘
* ```
*
* 控制栏左端承担原标题栏的两件事:显示「这是哪个会话」与**窗口拖拽区**
* (无边框窗口必须有拖拽区,否则窗口挪不动)。右侧是复用的 `TerminalToolbar`
* (`standalone` 模式:隐藏只对主窗口页内面板有意义的动作)+ 最小化/最大化/关闭。
*
* 窗口绑定单个会话,因此**不渲染标签栏** —— 这保持了「一个会话 ↔ 一个窗口」的
* 语义:主窗口那侧的「已在独立窗口中打开」提示条、标签上的「独立」徽标都以此为准。
*/
import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
import { getCurrentWindow } from '@tauri-apps/api/window'
import { AlertTriangle, Loader2, Menu, Minus, Square, X } from '@lucide/vue'
import {
AlertTriangle,
Globe,
Loader2,
Minus,
Square,
TerminalSquare,
X
} from '@lucide/vue'
import { toast } from 'vue-sonner'
import { useTerminalStore } from '@/stores/terminalStore'
import { useTerminalStream } from '@/composables/useSessionStream'
import { useTerminalKeys } from '@/composables/useTerminalKeys'
import { toggleHistoryPopover, toggleSnippetsPopover } from './useRecordPopovers'
import { createLogger } from '@/lib/logger'
import { applyStoredAccent } from '@/lib/theme'
import { appIsDark } from '@/lib/terminalThemes'
import { STORAGE_KEYS } from '@/lib/constants'
import TerminalPane from './components/TerminalPane.vue'
import TerminalToolbar from './components/TerminalToolbar.vue'
import TerminalStatusBar from './components/TerminalStatusBar.vue'
import TerminalContextMenu from './components/TerminalContextMenu.vue'
import HostKeyPromptDialog from './components/HostKeyPromptDialog.vue'
import AiPanel from './components/AiPanel.vue'
import { Button } from '@/components/ui/button'
import { Toaster } from '@/components/ui/sonner'
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
import {
Dialog,
DialogContent,
DialogFooter,
DialogHeader,
DialogTitle
} from '@/components/ui/dialog'
const logger = createLogger('terminal')
@@ -55,6 +103,12 @@ const { effectiveAppearance, bumpFont, resetFont, bindings, init } = stream
const session = computed(() => store.sessionById(sessionId))
// ===== 控制栏左端:会话身份(同时是窗口拖拽区) =====
const isSsh = computed(() => session.value?.kind === 'ssh')
const sessionLabel = computed(() => store.sessionLabel(session.value) || '终端')
const sessionTarget = computed(() => (isSsh.value ? store.sessionTarget(session.value) : ''))
// ===== 面板引用 =====
const paneRef = ref<InstanceType<typeof TerminalPane> | null>(null)
@@ -64,7 +118,105 @@ const paneRef = ref<InstanceType<typeof TerminalPane> | null>(null)
const ready = ref(false)
const fatal = ref('')
// ===== 主题:跟随主窗口 =====
//
// 独立窗口有自己的 JS 运行时,**不加载 appStore**(见文件头),所以主题不能靠
// 主窗口的 store 传过来。项目里其它独立窗口(快速面板 / 剪贴板 / 下载窗口…)
// 的统一做法是:各自读同一份 `localStorage` 设置 → 切 `dark` class + 应用主题色
// → 监听 `storage` 事件跟随主窗口的改动。这里沿用同一套,只是**不应用窗口效果**
// (mica / acrylic 需要透明通道,本窗口是不透明窗口,见 terminal/window.rs)。
//
// 少了这段时,主窗口是深色而独立窗口仍是浅色 —— 以前窗口里几乎全是 xterm
// (自带配色)所以不明显,控制栏与状态栏搬进来之后就露馅了。
//
// 另外:本窗口由 Rust **隐藏创建**(见 terminal/window.rs),应用完主题才显示 ——
// 否则深色模式下会先闪一个纯白窗口。因此这里除了切 class,还要把**窗口底色**
// 设成主题背景色(`--background`,见 style.css),避免显示瞬间仍是白底。
/** 与 style.css 的 `--background` 对齐:浅色 #ffffff / 深色 #16161a */
const WINDOW_BG = { light: '#ffffff', dark: '#16161a' }
/** 主窗口的主题设置(独立窗口只共享 settings,不共享 store) */
function readMainTheme(): string {
try {
const raw = localStorage.getItem(STORAGE_KEYS.appSettings)
if (raw) {
const s = JSON.parse(raw) as { theme?: string }
return s.theme ?? 'system'
}
} catch {
/* 设置不可读时按跟随系统处理 */
}
return 'system'
}
/** system 模式下用 matchMedia 判断深浅(独立窗口拿不到主窗口的响应式状态) */
function resolveIsDark(theme: string): boolean {
if (theme === 'dark') return true
if (theme === 'light') return false
return window.matchMedia('(prefers-color-scheme: dark)').matches
}
async function applyTheme() {
const root = document.documentElement
const theme = readMainTheme()
const isDark = resolveIsDark(theme)
// 1. 窗口原生主题 + 底色:无边框窗口用它同步 WebView 的 prefers-color-scheme,
// 底色则保证「显示的那一刻」就已经是主题色(而不是 WebView 默认的白)
try {
await win.setTheme(theme === 'system' ? null : (theme as 'dark' | 'light'))
} catch {
/* 平台不支持时忽略 */
}
try {
// 底色单独 try:setTheme 失败不该连带跳过底色,否则仍会白底闪一下
await win.setBackgroundColor(isDark ? WINDOW_BG.dark : WINDOW_BG.light)
} catch {
/* 忽略 */
}
// 2. DOM class(组件里的 bg-background / text-foreground 全靠它切色)
root.classList.toggle('dark', isDark)
// 终端画布的「跟随应用主题」要跟着本窗口的深浅走(见 terminalThemes.ts)
appIsDark.value = isDark
// 3. 主题色:与主窗口共用同一份设置(localStorage 的 accentId / accentHex)
applyStoredAccent(root, isDark ? 'dark' : 'light', STORAGE_KEYS.appSettings)
}
/**
* 显示本窗口。
*
* Rust 侧是隐藏创建的(见文件头说明),所以第一次显示由这里触发;
* 放在 `applyTheme` 之后,用户看到的第一帧就是正确配色。
*/
async function revealWindow() {
try {
await win.show()
await win.setFocus()
} catch (e) {
logger.warn(`显示独立窗口失败:${String(e)}`)
}
}
const onThemeChange = () => void applyTheme()
/** 主窗口改主题时,同源的其它窗口会收到 storage 事件 —— 这就是「跟随」的实现 */
const onStorageChange = (e: StorageEvent) => {
if (e.key === STORAGE_KEYS.appSettings) void applyTheme()
}
const darkMedia = window.matchMedia('(prefers-color-scheme: dark)')
onMounted(async () => {
darkMedia.addEventListener('change', onThemeChange)
window.addEventListener('storage', onStorageChange)
// 主题 → 显示:窗口是隐藏创建的,这一步之后用户才第一次看到它。
// 即使后面初始化失败(会话已结束等),窗口也已经可见 —— 错误提示才看得见。
await applyTheme()
await revealWindow()
if (!sessionId) {
fatal.value = '缺少会话 ID,无法确定要显示哪个会话'
ready.value = true
@@ -84,7 +236,7 @@ onMounted(async () => {
// 把标题设成会话名,方便任务栏与窗口列表识别
const info = store.sessionById(sessionId)
if (info?.title) {
void win.setTitle(`${info.title} · 终端`)
void win.setTitle(`${info.title} · 终端`).catch(() => {})
}
} catch (e) {
logger.error(`独立窗口初始化失败:${String(e)}`)
@@ -105,12 +257,104 @@ onMounted(async () => {
* `invoke` 仍可发出(IPC 通道在窗口销毁前还有效),这是最后一个可靠时机。
*/
onBeforeUnmount(() => {
darkMedia.removeEventListener('change', onThemeChange)
window.removeEventListener('storage', onStorageChange)
if (!sessionId) return
void store.attachSession(sessionId).catch(e => {
logger.warn(`重置 detached 标记失败:${String(e)}`)
})
})
// ===== 控制栏动作(终端页同款,但只保留单会话窗口成立的那些) =====
//
// 与 TerminalWorkspace 的同一组动作是**有意的少量重复**:那边还要管分屏、
// SFTP、模板等页面级状态,抽成共享 composable 会把两边的状态搅在一起。
// 这里只保留读 store 就能完成的部分。
/** 搜索 */
const searching = ref(false)
const searchHint = ref('')
function toggleSearch() {
searching.value = !searching.value
if (!searching.value) {
paneRef.value?.clearSearch?.()
searchHint.value = ''
}
}
function doSearch(keyword: string, back = false) {
const found = back ? paneRef.value?.findPrevious?.(keyword) : paneRef.value?.findNext?.(keyword)
searchHint.value = found === false ? '无匹配' : ''
}
function handleClear() {
const shellKind = store.shells.find(s => s.id === session.value?.targetId)?.kind
// 清屏是「让 shell 执行清屏」而不是「从 xterm 缓冲里删掉」——
// 后者只是视觉上清了,向上滚动仍能看到旧内容,且 shell 的行计数会错乱
void store.clearSession(sessionId, shellKind)
paneRef.value?.clear?.()
}
/** 重命名会话(控制栏没有标签,改的是窗口标题与会话标签共用的那个名称) */
const renameOpen = ref(false)
const renameValue = ref('')
function openRename() {
renameValue.value = session.value?.title ?? ''
renameOpen.value = true
}
async function submitRename() {
const name = renameValue.value.trim()
if (!name) return
try {
await store.renameSession(sessionId, name)
// 窗口标题也保持一致:任务栏/窗口列表里认的是系统标题,不是会话标签
void win.setTitle(`${name} · 终端`).catch(() => {})
toast.success('已重命名')
renameOpen.value = false
} catch (e) {
toast.error(`重命名失败:${String(e)}`)
}
}
/** AI 命令助手:把当前选区作为上下文(与终端页同一口径) */
const aiOpen = ref(false)
function getTerminalContext(): string {
return paneRef.value?.getSelection?.() ?? ''
}
/** 会话日志 */
async function toggleLogging() {
const sess = session.value
if (!sess) return
try {
await store.toggleLogging(sessionId, !sess.logging)
if (!sess.logging) {
const p = await store.logPath(sessionId)
toast.success(p ? `已开始记录会话日志:${p}` : '已开始记录会话日志')
} else {
toast.success('已停止记录会话日志(文件已保留)')
}
} catch (e) {
toast.error(`切换日志记录失败:${String(e)}`)
}
}
async function openLogDir() {
try {
const p = await store.logPath(sessionId)
if (!p) {
toast.info('当前会话未开启日志')
return
}
await store.revealLocalPath(p)
} catch (e) {
toast.error(`打开日志位置失败:${String(e)}`)
}
}
// ===== 快捷键(独立窗口内只保留与本会话相关的动作) =====
useTerminalKeys({
@@ -118,8 +362,8 @@ useTerminalKeys({
onAction: actionId => {
switch (actionId) {
case 'copy': {
const text = paneRef.value?.getSelection?.()
if (text) void navigator.clipboard.writeText(text.replace(/\n+$/, ''))
// 与右键菜单走同一个函数:都遵守「复制时去掉末尾换行」设置
void doCopy()
break
}
case 'paste':
@@ -140,6 +384,17 @@ useTerminalKeys({
case 'fontReset':
resetFont()
break
case 'search':
toggleSearch()
break
// 命令历史 / 片段:控制栏上的两个浮层,独立窗口里同样适用
// (它们只需要当前会话,不依赖终端页的分屏与面板容器)
case 'history':
toggleHistoryPopover()
break
case 'snippets':
toggleSnippetsPopover()
break
// 标签类/分屏类动作在独立窗口里没有意义,静默忽略
default:
break
@@ -147,15 +402,89 @@ useTerminalKeys({
}
})
// ===== 无边框窗口的自定义标题栏 =====
// ===== 右键菜单 =====
//
// 菜单本身与终端页共用同一个组件(`TerminalContextMenu`)。此前这里没有右键处理,
// 而 main.ts 全局 `preventDefault` 掉了浏览器原生菜单 —— 独立窗口里右键毫无反应。
const contextMenu = ref<{ x: number; y: number } | null>(null)
/** 右键菜单的「复制」是否可用(取决于当时是否有选区) */
const contextHasSelection = computed(() => !!paneRef.value?.getSelection?.())
function closeContextMenu() {
contextMenu.value = null
}
/**
* 无边框窗口需要自己实现拖拽与最小化/最大化/关闭。
*
* 但本窗口**不实现拖拽区域**:终端面板占满整个窗口,若在顶部加拖拽条,
* 用户会失去一块垂直空间;而拖拽整个窗口的需求可以通过系统的方式完成
* (Alt+Space、或拖窗口边缘)。这里只保留最小化/最大化/关闭三个按钮。
* 面板右键的统一入口,与终端页同一套三种行为(`selection.rightClick`):
* - `menu`:弹菜单
* - `paste`:直接粘贴
* - `select-word`:先选中右键处的词,再弹菜单(只选中不弹菜单会让用户无法继续操作)
*/
function onPaneContextMenu(payload: { x: number; y: number }) {
const mode = store.settings?.selection?.rightClick ?? 'menu'
if (mode === 'paste') {
void doPaste()
return
}
if (mode === 'select-word') {
paneRef.value?.selectWordAt?.(payload.x, payload.y)
}
contextMenu.value = payload
}
async function doCopy() {
const text = paneRef.value?.getSelection?.()
closeContextMenu()
if (!text) {
toast.info('没有选中内容')
return
}
const trim = store.settings?.selection?.trimTrailingNewline ?? true
const payload = trim && text.endsWith('\n') ? text.replace(/\n+$/, '') : text
try {
await navigator.clipboard.writeText(payload)
} catch (e) {
toast.error(`复制失败:${String(e)}`)
}
}
async function doPaste() {
closeContextMenu()
try {
const text = await navigator.clipboard.readText()
if (!text) return
await store.write(sessionId, text)
} catch (e) {
toast.error(`粘贴失败:${String(e)}`)
}
}
function doSelectAll() {
paneRef.value?.selectAll?.()
closeContextMenu()
}
function doClearFromMenu() {
closeContextMenu()
handleClear()
}
function doRenameFromMenu() {
closeContextMenu()
openRename()
}
async function doCloseFromMenu() {
closeContextMenu()
await store.closeSession(sessionId)
}
// ===== 无边框窗口的窗口按钮 =====
//
// 拖拽区在控制栏左端(见模板),这里只留最小化/最大化/关闭三个按钮。
async function minimize() {
await win.minimize()
}
@@ -168,42 +497,90 @@ async function closeWindow() {
</script>
<template>
<div class="flex flex-col h-screen w-screen overflow-hidden bg-background">
<!-- 标题栏 -->
<div
class="shrink-0 h-8 flex items-center gap-2 px-2 border-b border-border select-none"
data-tauri-drag-region
>
<Menu class="size-3.5 text-muted-foreground shrink-0 pointer-events-none" />
<span class="text-xs truncate flex-1 pointer-events-none">
{{ session?.title || '终端' }}
</span>
<!--
独立窗口是**另一个 WebView 入口**(main.ts 按 hash 路由),不经过 App.vue,
因此这里必须自带 TooltipProvider —— 否则控制栏里的 Tooltip 取不到上下文。
-->
<TooltipProvider>
<div class="flex flex-col h-screen w-screen overflow-hidden bg-background">
<!-- 控制栏:会话身份(拖拽区)+ 控制栏动作 + 窗口按钮 -->
<div class="shrink-0 flex items-center gap-1 h-9 px-1.5 border-b border-border">
<!--
拖拽区:无边框窗口靠它移动。子元素 pointer-events-none,
让 mousedown 的 target 始终落在这块带 data-tauri-drag-region 的容器上。
-->
<div class="flex h-full min-w-0 flex-1 items-center gap-1.5 px-2" data-tauri-drag-region>
<component
:is="isSsh ? Globe : TerminalSquare"
class="size-3.5 shrink-0 text-muted-foreground pointer-events-none"
/>
<span class="truncate text-xs font-medium pointer-events-none">{{ sessionLabel }}</span>
<span
v-if="sessionTarget"
class="truncate text-[11px] text-muted-foreground pointer-events-none"
>
{{ sessionTarget }}
</span>
</div>
<button
class="size-6 flex items-center justify-center rounded hover:bg-accent transition-colors"
title="最小化"
@click="minimize"
>
<Minus class="size-3" />
</button>
<button
class="size-6 flex items-center justify-center rounded hover:bg-accent transition-colors"
title="最大化"
@click="toggleMaximize"
>
<Square class="size-2.5" />
</button>
<button
class="size-6 flex items-center justify-center rounded hover:bg-destructive
hover:text-destructive-foreground transition-colors"
title="关闭窗口(会话保留)"
@click="closeWindow"
>
<X class="size-3.5" />
</button>
<TerminalToolbar
v-if="ready && !fatal"
standalone
:session-id="sessionId"
:session="session"
:searching="searching"
:search-hint="searchHint"
:is-ssh="isSsh"
:sftp-visible="false"
:logging="session?.logging ?? false"
:font-size="effectiveAppearance?.fontSize ?? 14"
@toggle-search="toggleSearch"
@search="doSearch($event)"
@search-next="doSearch($event)"
@search-prev="doSearch($event, true)"
@font="bumpFont($event)"
@font-reset="resetFont"
@clear="handleClear"
@rename="openRename"
@open-ai="aiOpen = true"
@toggle-logging="toggleLogging"
@open-log-dir="openLogDir"
/>
<div class="w-px h-4 bg-border shrink-0" />
<Tooltip>
<TooltipTrigger as-child>
<Button variant="ghost" size="icon-sm" @click="minimize">
<Minus class="size-3.5" />
</Button>
</TooltipTrigger>
<TooltipContent side="bottom">最小化</TooltipContent>
</Tooltip>
<Tooltip>
<TooltipTrigger as-child>
<Button variant="ghost" size="icon-sm" @click="toggleMaximize">
<Square class="size-3" />
</Button>
</TooltipTrigger>
<TooltipContent side="bottom">最大化 / 还原</TooltipContent>
</Tooltip>
<Tooltip>
<TooltipTrigger as-child>
<Button
variant="ghost"
size="icon-sm"
class="hover:!bg-destructive hover:!text-destructive-foreground"
@click="closeWindow"
>
<X class="size-3.5" />
</Button>
</TooltipTrigger>
<TooltipContent side="bottom">关闭窗口(会话保留,回到主窗口)</TooltipContent>
</Tooltip>
</div>
<!-- 主体 -->
<!-- 画布 -->
<div class="flex-1 min-h-0 relative">
<div v-if="!ready" class="absolute inset-0 flex items-center justify-center">
<div class="flex flex-col items-center gap-3">
@@ -225,12 +602,29 @@ async function closeWindow() {
:session-id="sessionId"
:appearance="effectiveAppearance"
:visible="true"
@contextmenu="onPaneContextMenu"
/>
</div>
<!-- 状态栏 -->
<!-- 右键菜单:与终端页同一组件;「重命名」在单会话窗口里叫「重命名会话」 -->
<TerminalContextMenu
v-if="contextMenu"
:x="contextMenu.x"
:y="contextMenu.y"
:can-copy="contextHasSelection"
rename-label="重命名会话"
@copy="doCopy"
@paste="doPaste"
@select-all="doSelectAll"
@clear="doClearFromMenu"
@rename="doRenameFromMenu"
@close="doCloseFromMenu"
/>
<!-- 状态栏:与主窗口终端页同一个组件,高度/字号一致;
显隐同样尊重「显示状态栏」设置(此前这里无条件渲染,关掉设置后窗口里还在) -->
<TerminalStatusBar
v-if="ready && !fatal"
v-if="ready && !fatal && store.settings?.layout?.showStatusBar !== false"
:session="session"
:font-size="effectiveAppearance?.fontSize ?? 14"
:cols="session?.cols"
@@ -239,7 +633,36 @@ async function closeWindow() {
<!-- 主机密钥确认:独立窗口也可能触发(用户直接从这个窗口发起连接时) -->
<HostKeyPromptDialog />
</div>
<!-- AI 命令助手 -->
<AiPanel v-model:open="aiOpen" :session-id="sessionId" :get-context="getTerminalContext" />
<!-- 重命名 -->
<Dialog v-model:open="renameOpen">
<DialogContent class="max-w-sm">
<DialogHeader>
<DialogTitle class="text-base">重命名会话</DialogTitle>
</DialogHeader>
<input
v-model="renameValue"
class="w-full h-8 px-2.5 rounded-md border border-border bg-transparent
text-sm outline-none focus:border-primary/60"
@keydown.enter="submitRename"
/>
<DialogFooter>
<Button variant="outline" size="sm" @click="renameOpen = false">取消</Button>
<Button size="sm" @click="submitRename">保存</Button>
</DialogFooter>
</DialogContent>
</Dialog>
<!--
提示条要自带:Toaster 是**窗口级**的,主窗口那个管不到本窗口 ——
重命名、切换日志、AI 助手的反馈都在这个窗口里发出。
-->
<Toaster position="bottom-right" rich-colors close-button :style="{ zIndex: 99999 }" />
</div>
</TooltipProvider>
</template>
<style scoped>
@@ -249,4 +672,4 @@ async function closeWindow() {
overflow: hidden;
margin: 0;
}
</style>
</style>
+9 -4
View File
@@ -10,7 +10,7 @@
* # 交互与片段库同一套安全语义
*
* 建议默认「填入命令行」(用户自己按回车),「直接执行」是显式第二动作。
* 理由与 SnippetPanel 一致:命令被自动执行与等待用户确认,在心理上完全不同;
* 理由与命令片段(SnippetPopover)一致:命令被自动执行与等待用户确认,在心理上完全不同;
* 而且模型的建议未经本地验证,用户应当有机会先看一眼再回车。
*
* # 上下文
@@ -26,6 +26,7 @@ import { useTerminalStore } from '@/stores/terminalStore'
import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input'
import { Label } from '@/components/ui/label'
import { ScrollArea } from '@/components/ui/scroll-area'
import {
Dialog,
DialogContent,
@@ -135,7 +136,7 @@ function engineLabel(e: AiEngineOption): string {
<template>
<Dialog :open="open" @update:open="v => emit('update:open', v)">
<DialogContent class="max-w-lg">
<DialogContent class="max-w-lg max-h-[85vh]">
<DialogHeader>
<DialogTitle class="flex items-center gap-2 text-base">
<Sparkles class="size-4" />AI 命令助手
@@ -187,8 +188,11 @@ function engineLabel(e: AiEngineOption): string {
<Sparkles class="size-3.5" />{{ generating ? '生成中…' : '生成建议' }}
</Button>
<!-- 建议 -->
<div v-if="suggestions.length > 0" class="space-y-1.5">
<!--
建议:条数由模型决定,可能很多条,必须限高滚动(用 ScrollArea 而非原生滚动条)
-->
<ScrollArea v-if="suggestions.length > 0" class="max-h-[42vh] pr-3">
<div class="space-y-1.5">
<div
v-for="(s, i) in suggestions"
:key="i"
@@ -206,6 +210,7 @@ function engineLabel(e: AiEngineOption): string {
</div>
</div>
</div>
</ScrollArea>
</DialogContent>
</Dialog>
</template>
@@ -23,6 +23,7 @@ import { useTerminalStore } from '@/stores/terminalStore'
import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input'
import { Label } from '@/components/ui/label'
import { ScrollArea } from '@/components/ui/scroll-area'
import {
Dialog,
DialogContent,
@@ -157,7 +158,7 @@ function directionText(f: ForwardView): string {
<template>
<Dialog :open="open" @update:open="v => emit('update:open', v)">
<DialogContent class="max-w-xl">
<DialogContent class="max-w-xl max-h-[85vh]">
<DialogHeader>
<DialogTitle class="flex items-center gap-2 text-base">
<Network class="size-4" />端口转发
@@ -167,7 +168,8 @@ function directionText(f: ForwardView): string {
</DialogDescription>
</DialogHeader>
<!-- ===== 已有规则 ===== -->
<!-- ===== 已有规则(条数不限,限高滚动) ===== -->
<ScrollArea class="max-h-[40vh] pr-3">
<div class="space-y-1.5 min-h-[60px]">
<p v-if="loading" class="text-xs text-muted-foreground">加载中…</p>
<p v-else-if="forwards.length === 0" class="text-xs text-muted-foreground">
@@ -181,7 +183,7 @@ function directionText(f: ForwardView): string {
>
<span
class="shrink-0 rounded px-1.5 py-0.5 text-[10px]"
:class="f.kind === 'local' ? 'bg-primary/10 text-primary' : 'bg-blue-500/10 text-blue-500'"
:class="f.kind === 'local' ? 'bg-primary/10 text-primary' : 'bg-info-soft text-info'"
>
{{ f.kind === 'local' ? '本地' : '远程' }}
</span>
@@ -205,6 +207,7 @@ function directionText(f: ForwardView): string {
</Button>
</div>
</div>
</ScrollArea>
<!-- ===== 新增 ===== -->
<div class="space-y-2 rounded-md border border-border p-3">
@@ -1,443 +0,0 @@
<script setup lang="ts">
/**
* 命令历史面板(浮层)。
*
* # 交互模型:搜索即过滤、单击填入、双击执行
*
* 历史与片段不同:片段是「我准备好要用的」,历史是「我已经用过的」。
* 后者的使用模式是**快速找回**,因此搜索框默认聚焦、输入即过滤、
* 键盘上下键可直接选中。
*
* 单击 = 填入命令行(不执行),双击或 `Enter` = 填入并执行。
* 这个区分的必要性在于:历史里躺着用户过去敲过的所有命令,包括
* `rm -rf`、`DROP TABLE`。默认执行会让「翻历史」变成一件危险的事。
*
* # 为什么「只显示当前会话来源」不做默认
*
* 有人按主机筛选(「那台机器上我跑过什么」),也有人跨主机找同一条命令
* (「上次那条 rsync 参数是怎么写的」)。默认全量 + 可选筛选比反向合理 ——
* 前者只需点一下筛选,后者要清空筛选才能看到全部。
*/
import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
import {
ArrowDownToLine,
Check,
Clock,
Copy,
FolderOpen,
History,
Loader2,
Play,
Search,
Star,
Trash2,
X
} from '@lucide/vue'
import { toast } from 'vue-sonner'
import { useTerminalStore } from '@/stores/terminalStore'
import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input'
import type { CommandHistoryItem, SessionInfo } from '@/types/terminal'
const props = defineProps<{
sessionId: string | null
session: SessionInfo | undefined
}>()
const emit = defineEmits<{
(e: 'close'): void
}>()
const store = useTerminalStore()
// ===== 筛选状态 =====
const keyword = ref('')
const hostFilter = ref('')
const favoritedOnly = ref(false)
/** 选中项(用于键盘导航与详情) */
const selectedId = ref<number | null>(null)
const items = computed(() => store.historyPage.items)
const total = computed(() => store.historyPage.total)
/** 当前会话的来源 id(用于「只看本会话」快捷筛选) */
const currentHostId = computed(() => props.session?.targetId ?? '')
/**
* 加载历史。
*
* `force` 为 false 时不重复请求(浮层首次打开才拉,其余靠筛选变化触发)——
* 浮层每次开关都重拉会让「刚删掉的记录因为重拉又出现」这种错觉出现,
* 而实际是删成功了、只是列表被刷新回旧快照(请求早于删除返回)。
*/
async function reload(force = false) {
try {
await store.loadHistory({
keyword: keyword.value,
hostId: hostFilter.value,
favoritedOnly: favoritedOnly.value
})
if (force) await store.loadHistorySources()
} catch (e) {
toast.error(`加载历史失败:${String(e)}`)
}
}
onMounted(async () => {
await reload(true)
})
// 筛选变化即重查。搜索框用 200ms 防抖:输入过程中每个字符都发请求
// 会让 IPC 通道被无效查询占满(store 里已有请求序号防乱序,但少发总比多发好)。
let searchTimer: ReturnType<typeof setTimeout> | null = null
watch([keyword, favoritedOnly], () => {
if (searchTimer) clearTimeout(searchTimer)
searchTimer = setTimeout(() => void reload(), 200)
})
// 来源筛选是离散选择,无需防抖
watch(hostFilter, () => void reload())
// 卸载时清掉未触发的防抖:面板关掉后定时器仍会发一次无主查询
onBeforeUnmount(() => {
if (searchTimer) clearTimeout(searchTimer)
})
// ===== 操作 =====
/** 把命令填入会话命令行(不执行) */
async function useCommand(item: CommandHistoryItem, submit = false) {
if (!props.sessionId) {
toast.info('当前没有活跃会话')
return
}
try {
const r = await store.runHistory(props.sessionId, item.command, submit)
if (r.ok) {
// 填入成功后关闭浮层:用户的下一步是看命令行并按回车,
// 浮层挡在那里没有价值
if (!submit) emit('close')
else toast.success(r.message)
} else {
toast.error(r.message)
}
} catch (e) {
toast.error(`操作失败:${String(e)}`)
}
}
async function copyCommand(item: CommandHistoryItem) {
try {
await navigator.clipboard.writeText(item.command)
toast.success('已复制到剪贴板')
} catch (e) {
toast.error(`复制失败:${String(e)}`)
}
}
async function toggleFavorite(item: CommandHistoryItem) {
try {
await store.toggleHistoryFavorite(item.id)
} catch (e) {
toast.error(`操作失败:${String(e)}`)
}
}
async function removeItem(item: CommandHistoryItem) {
try {
const r = await store.deleteHistory(item.id)
if (!r.ok) toast.info(r.message)
if (selectedId.value === item.id) selectedId.value = null
} catch (e) {
toast.error(`删除失败:${String(e)}`)
}
}
async function clearAll() {
// 二次确认,且默认只清非收藏 —— 破坏性操作的默认值应当是最保守的那个。
// 用 window.confirm 而不是弹 Dialog:这是浮层里的浮层,
// 嵌一个 Radix Dialog 会带来焦点陷阱与层级(z-index)的两难。
const ok = window.confirm(
'确定清空命令历史吗?\n\n收藏的记录会保留(如需连同收藏一起清空,请先取消收藏)。'
)
if (!ok) return
try {
const r = await store.clearHistory(true)
toast.success(r.message)
} catch (e) {
toast.error(`清空失败:${String(e)}`)
}
}
// ===== 键盘导航 =====
/**
* 上下键移动选中项,Enter 执行。
*
* 只在列表为空时不处理;其余一律 `preventDefault` —— 否则方向键会
* 同时滚动容器,选中项移出可视区。
*/
function onKeydown(e: KeyboardEvent) {
if (e.key === 'Escape') {
emit('close')
return
}
if (items.value.length === 0) return
const idx = items.value.findIndex(i => i.id === selectedId.value)
if (e.key === 'ArrowDown') {
e.preventDefault()
const next = idx < 0 ? 0 : Math.min(items.value.length - 1, idx + 1)
selectedId.value = items.value[next].id
} else if (e.key === 'ArrowUp') {
e.preventDefault()
const next = idx <= 0 ? 0 : idx - 1
selectedId.value = items.value[next].id
} else if (e.key === 'Enter') {
e.preventDefault()
const item = items.value.find(i => i.id === selectedId.value)
if (item) void useCommand(item, false)
}
}
// ===== 展示辅助 =====
/** 相对时间(历史列表里「3 分钟前」比精确时间戳更有信息量) */
function relTime(ts: number): string {
const diff = Date.now() - ts
if (diff < 60_000) return '刚刚'
if (diff < 3_600_000) return `${Math.floor(diff / 60_000)} 分钟前`
if (diff < 86_400_000) return `${Math.floor(diff / 3_600_000)} 小时前`
if (diff < 2_592_000_000) return `${Math.floor(diff / 86_400_000)} 天前`
return new Date(ts).toLocaleDateString('zh-CN')
}
/**
* 目录缩略:只显示最后一级。
*
* 完整路径会占满一行且把命令挤到看不见的位置,而用户分辨「在哪个项目里跑的」
* 只需要最后一级。完整路径放在 `title` 里悬停可看。
*/
function cwdTail(cwd: string): string {
if (!cwd) return ''
const parts = cwd.split(/[\\/]/).filter(Boolean)
return parts.length > 0 ? parts[parts.length - 1] : cwd
}
/** 退出码非 0 时给视觉提示(用户找的常常正是「刚才那条报错的命令」) */
function isFailed(item: CommandHistoryItem): boolean {
return item.exitCode !== null && item.exitCode !== 0
}
</script>
<template>
<!-- 作为模块 Tab 内容渲染(根不再是居中对话框) -->
<div
class="h-full flex flex-col rounded-lg border border-border bg-background overflow-hidden"
@keydown="onKeydown"
>
<!-- ===== 头部:搜索 + 筛选 ===== -->
<div class="shrink-0 border-b border-border">
<div class="flex items-center gap-2 px-3 h-11">
<History class="size-4 text-muted-foreground shrink-0" />
<span class="text-sm font-medium shrink-0">命令历史</span>
<span class="text-xs text-muted-foreground shrink-0">
共 {{ total }} 条{{ hostFilter || favoritedOnly || keyword ? '(已筛选)' : '' }}
</span>
<div class="flex-1" />
<div class="relative">
<Search class="size-3.5 absolute left-2 top-1/2 -translate-y-1/2 text-muted-foreground" />
<Input
v-model="keyword"
placeholder="搜索命令…"
class="h-7 w-[240px] pl-7 text-xs"
autofocus
/>
</div>
<Button
variant="ghost"
size="sm"
class="h-7 text-xs shrink-0"
title="清空历史(保留收藏)"
@click="clearAll"
>
<Trash2 class="size-3.5" />
</Button>
<Button variant="ghost" size="sm" class="h-7 text-xs shrink-0" title="关闭" @click="emit('close')">
<X class="size-3.5" />
</Button>
</div>
<!-- 筛选行 -->
<div class="flex items-center gap-2 px-3 pb-2 text-xs">
<button
class="h-6 px-2 rounded border transition-colors"
:class="hostFilter === '' && !favoritedOnly
? 'border-primary/50 bg-primary/10 text-foreground'
: 'border-border text-muted-foreground hover:bg-accent'"
@click="hostFilter = ''; favoritedOnly = false"
>
全部来源
</button>
<button
v-if="currentHostId"
class="h-6 px-2 rounded border transition-colors"
:class="hostFilter === currentHostId
? 'border-primary/50 bg-primary/10 text-foreground'
: 'border-border text-muted-foreground hover:bg-accent'"
:title="`只看本会话(${store.sessionLabel(session)})`"
@click="hostFilter = currentHostId; favoritedOnly = false"
>
仅本会话
</button>
<button
class="h-6 px-2 rounded border transition-colors inline-flex items-center gap-1"
:class="favoritedOnly
? 'border-primary/50 bg-primary/10 text-foreground'
: 'border-border text-muted-foreground hover:bg-accent'"
@click="favoritedOnly = !favoritedOnly"
>
<Star class="size-3" /> 收藏
</button>
<!-- 其他来源(只列有历史的,避免显示一堆空来源) -->
<div class="flex-1" />
<select
v-if="store.historySources.length > 1"
:value="hostFilter"
class="h-6 px-1 rounded border border-border bg-transparent text-xs max-w-[200px]"
@change="hostFilter = ($event.target as HTMLSelectElement).value"
>
<option value="">按来源筛选…</option>
<option v-for="s in store.historySources" :key="s.hostId" :value="s.hostId">
{{ s.hostName }}({{ s.count }})
</option>
</select>
</div>
</div>
<!-- ===== 列表 ===== -->
<div class="flex-1 min-h-0 overflow-y-auto">
<div v-if="store.historyLoading && items.length === 0" class="flex items-center justify-center h-full">
<Loader2 class="size-5 animate-spin text-muted-foreground" />
</div>
<div v-else-if="items.length === 0" class="flex flex-col items-center justify-center h-full gap-2 text-muted-foreground">
<History class="size-8 opacity-40" />
<span class="text-sm">
{{ keyword || hostFilter || favoritedOnly ? '没有匹配的命令' : '还没有命令历史' }}
</span>
<span v-if="!(keyword || hostFilter || favoritedOnly)" class="text-xs opacity-70 max-w-[320px] text-center">
命令由 shell 集成 hook 上报。新开的会话执行命令后即可在此查看。
</span>
</div>
<div v-else class="divide-y divide-border/60">
<div
v-for="item in items"
:key="item.id"
class="group flex items-start gap-2 px-3 py-2 cursor-pointer transition-colors"
:class="selectedId === item.id ? 'bg-accent' : 'hover:bg-accent/50'"
@click="selectedId = item.id"
@dblclick="useCommand(item, false)"
>
<!-- 收藏 -->
<button
class="shrink-0 mt-0.5 size-4 flex items-center justify-center transition-colors"
:class="item.favorited ? 'text-amber-500' : 'text-muted-foreground/40 hover:text-amber-500'"
:title="item.favorited ? '取消收藏' : '收藏(不参与容量淘汰)'"
@click.stop="toggleFavorite(item)"
>
<Star class="size-3.5" :fill="item.favorited ? 'currentColor' : 'none'" />
</button>
<!-- 主体 -->
<div class="flex-1 min-w-0">
<div class="flex items-center gap-2">
<code
class="text-xs font-mono truncate"
:class="isFailed(item) ? 'text-red-600 dark:text-red-400' : 'text-foreground'"
:title="item.command"
>
{{ item.command }}
</code>
<!-- 执行次数:>1 说明是反复用到的命令,值得优先看 -->
<span
v-if="item.count > 1"
class="shrink-0 text-[10px] px-1 rounded bg-muted text-muted-foreground"
:title="`执行过 ${item.count} 次`"
>
×{{ item.count }}
</span>
</div>
<div class="flex items-center gap-3 mt-0.5 text-[10px] text-muted-foreground">
<span class="inline-flex items-center gap-0.5 shrink-0">
<Clock class="size-2.5" />{{ relTime(item.ts) }}
</span>
<span v-if="item.cwd" class="inline-flex items-center gap-0.5 min-w-0" :title="item.cwd">
<FolderOpen class="size-2.5 shrink-0" />
<span class="truncate max-w-[140px]">{{ cwdTail(item.cwd) }}</span>
</span>
<span class="truncate max-w-[180px]">{{ item.hostName }}</span>
<span v-if="isFailed(item)" class="text-red-600 dark:text-red-400 shrink-0">
退出码 {{ item.exitCode }}
</span>
</div>
</div>
<!-- 行操作(悬停出现,避免列表视觉噪音) -->
<div class="shrink-0 flex items-center gap-0.5 opacity-0 group-hover:opacity-100 transition-opacity">
<button
class="size-6 rounded flex items-center justify-center text-muted-foreground hover:bg-accent hover:text-foreground"
title="填入命令行(不执行)"
@click.stop="useCommand(item, false)"
>
<ArrowDownToLine class="size-3.5" />
</button>
<button
class="size-6 rounded flex items-center justify-center text-muted-foreground hover:bg-accent hover:text-foreground"
title="填入并执行"
@click.stop="useCommand(item, true)"
>
<Play class="size-3.5" />
</button>
<button
class="size-6 rounded flex items-center justify-center text-muted-foreground hover:bg-accent hover:text-foreground"
title="复制"
@click.stop="copyCommand(item)"
>
<Copy class="size-3.5" />
</button>
<button
class="size-6 rounded flex items-center justify-center text-muted-foreground hover:bg-accent hover:text-red-600"
title="删除这条"
@click.stop="removeItem(item)"
>
<Trash2 class="size-3.5" />
</button>
</div>
</div>
</div>
</div>
<!-- ===== 底部提示 ===== -->
<div class="shrink-0 h-7 flex items-center gap-4 px-3 border-t border-border text-[10px] text-muted-foreground">
<span class="inline-flex items-center gap-1">
<ArrowDownToLine class="size-3" /> 单击 / Enter = 填入
</span>
<span class="inline-flex items-center gap-1">
<Play class="size-3" /> 双击 = 填入并执行
</span>
<span class="inline-flex items-center gap-1">
<Check class="size-3" /> 上/下键导航,Esc 关闭
</span>
<div class="flex-1" />
<span v-if="total > items.length">显示 {{ items.length }} / {{ total }} 条</span>
</div>
</div>
</template>
@@ -0,0 +1,471 @@
<script setup lang="ts">
/**
* 命令历史 popover(终端页控制栏的「历史」按钮)。
*
* # 这个组件是「按钮 + 浮层」的整体
*
* 触发器、浮层内容、快捷键用的开合状态都封在这里,控制栏只摆一个标签即可。
* 分开的代价是:填入后自动收起、Esc 关闭这些动作都要跨组件传意图 ——
* 变成「父组件管开、子组件管关」,而它们读写的本来就是同一份状态。
*
* # 与旧「记录」页版本的区别
*
* 逻辑照搬原「记录」页的命令历史面板(搜索即过滤、选中、双击填入、收藏、清空),
* 但**形态**从整页变成 380px 宽的浮层:去掉了页头工具条、分区开关、底部三行
* 提示(换成一行)与整页的筛选行排版。之所以能有这个自信,是因为历史的使用
* 模式本来就是「快速找回一条命令」——用户想看的是列表,不是页面。
*
* # 为什么「填入不执行」为默认,且单击不填入
*
* 历史里躺着用户过去敲过的所有命令,包括 `rm -rf`、`DROP TABLE`。
* 因此:单击只**选中**(便于键盘导航与读清楚),双击或回车才**填入**命令行,
* 执行一律要显式点「执行」按钮。
*
* 「单击不填入」还有一层实际考虑:填入是把文本写进当前 PTY 的命令行,
* 用户可能正在敲一条命令(命令行上有半截输入),单击即填入会把那半截冲掉或拼在
* 一起。选中不动手,填入是明确的意图表达。
*
* # 关闭时机
*
* 填入成功后立即收起浮层:用户的下一步是看着终端按回车,浮层挡在那里没有价值。
* 浮层开合状态由 `useRecordPopovers` 的模块级 ref 持有 —— 快捷键
* (Ctrl+Shift+H)与这里的触发按钮共用的就是它。
*/
import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
import {
ArrowDownToLine,
Clock,
Copy,
FolderOpen,
History,
Play,
Search,
Star,
Trash2
} from '@lucide/vue'
import { toast } from 'vue-sonner'
import { useTerminalStore } from '@/stores/terminalStore'
import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input'
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
import { ScrollArea } from '@/components/ui/scroll-area'
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue
} from '@/components/ui/select'
import { StateBlock } from '@/components/common'
import { historyPopoverOpen, toggleHistoryPopover } from '../useRecordPopovers'
import type { CommandHistoryItem, SessionInfo } from '@/types/terminal'
const props = defineProps<{
/** 当前会话(把命令填给它;为空时动作不可用) */
sessionId: string | null
session: SessionInfo | undefined
}>()
const store = useTerminalStore()
// ===== 筛选 =====
const keyword = ref('')
const hostFilter = ref('')
const favoritedOnly = ref(false)
/** 来源下拉的「全部」哨兵值:reka 的 SelectItem 不接受空串 value */
const ALL_SOURCES = '__all_sources__'
/** 选中项(键盘导航用) */
const selectedId = ref<number | null>(null)
const items = computed(() => store.historyPage.items)
const total = computed(() => store.historyPage.total)
/** 当前会话的来源 id(「仅本会话」快捷筛选的判据) */
const currentHostId = computed(() => props.session?.targetId ?? '')
/**
* 加载。
*
* `force` 为真时连带刷新来源列表 —— 只在浮层首次打开时做(来源集合变化很慢,
* 每敲一个字都拉一遍纯属浪费)。
*/
async function reload(force = false) {
try {
await store.loadHistory({
keyword: keyword.value,
hostId: hostFilter.value,
favoritedOnly: favoritedOnly.value
})
if (force) await store.loadHistorySources()
} catch (e) {
toast.error(`加载历史失败:${String(e)}`)
}
}
onMounted(async () => {
await reload(true)
})
// 输入即过滤,200ms 防抖:让每个字符都发一次 IPC 只会把通道占满
let searchTimer: ReturnType<typeof setTimeout> | null = null
watch([keyword, favoritedOnly], () => {
if (searchTimer) clearTimeout(searchTimer)
searchTimer = setTimeout(() => void reload(), 200)
})
// 来源筛选是离散选择,无需防抖
watch(hostFilter, () => void reload())
// 卸载时清掉未触发的防抖,否则浮层关掉后还会发一次无主查询
onBeforeUnmount(() => {
if (searchTimer) clearTimeout(searchTimer)
})
// ===== 操作 =====
/** 把命令填入会话命令行(`submit` 为真则直接执行) */
async function useCommand(item: CommandHistoryItem, submit = false) {
if (!props.sessionId) {
toast.info('当前没有活跃会话')
return
}
try {
const r = await store.runHistory(props.sessionId, item.command, submit)
if (r.ok) {
if (submit) toast.success(r.message)
else toggleHistoryPopover(false)
} else {
toast.error(r.message)
}
} catch (e) {
toast.error(`操作失败:${String(e)}`)
}
}
async function copyCommand(item: CommandHistoryItem) {
try {
await navigator.clipboard.writeText(item.command)
toast.success('已复制到剪贴板')
} catch (e) {
toast.error(`复制失败:${String(e)}`)
}
}
async function toggleFavorite(item: CommandHistoryItem) {
try {
await store.toggleHistoryFavorite(item.id)
} catch (e) {
toast.error(`操作失败:${String(e)}`)
}
}
async function removeItem(item: CommandHistoryItem) {
try {
const r = await store.deleteHistory(item.id)
if (!r.ok) toast.info(r.message)
if (selectedId.value === item.id) selectedId.value = null
} catch (e) {
toast.error(`删除失败:${String(e)}`)
}
}
async function clearAll() {
// 二次确认,默认只清非收藏 —— 破坏性操作的默认值应当是最保守的那个。
// 用 window.confirm 而不是嵌套 Dialog:这是浮层里的浮层,
// 嵌一个 reka Dialog 会带来焦点陷阱与 z-index 的两难(原实现同款处理)。
const ok = window.confirm(
'确定清空命令历史吗?\n\n收藏的记录会保留(如需连同收藏一起清空,请先取消收藏)。'
)
if (!ok) return
try {
const r = await store.clearHistory(true)
toast.success(r.message)
} catch (e) {
toast.error(`清空失败:${String(e)}`)
}
}
// ===== 键盘导航 =====
/**
* ↑↓ 移动选中项,Enter 填入。
*
* 焦点落在行内按钮/下拉上时让路(它们自己要用方向键与 Enter),
* 搜索框不让路:在搜索框里按 ↑↓ 选条目、Enter 填入是刻意保留的操作方式。
*/
function onKeydown(e: KeyboardEvent) {
if (e.key === 'Escape') {
toggleHistoryPopover(false)
return
}
const target = e.target as HTMLElement | null
if (target?.closest('button,[data-slot="select-trigger"],select,textarea')) return
if (items.value.length === 0) return
const idx = items.value.findIndex(i => i.id === selectedId.value)
if (e.key === 'ArrowDown') {
e.preventDefault()
const next = idx < 0 ? 0 : Math.min(items.value.length - 1, idx + 1)
selectedId.value = items.value[next].id
} else if (e.key === 'ArrowUp') {
e.preventDefault()
const next = idx <= 0 ? 0 : idx - 1
selectedId.value = items.value[next].id
} else if (e.key === 'Enter') {
e.preventDefault()
const item = items.value.find(i => i.id === selectedId.value)
if (item) void useCommand(item, false)
}
}
// ===== 展示辅助 =====
/** 相对时间(「3 分钟前」比精确时间戳更有信息量) */
function relTime(ts: number): string {
const diff = Date.now() - ts
if (diff < 60_000) return '刚刚'
if (diff < 3_600_000) return `${Math.floor(diff / 60_000)} 分钟前`
if (diff < 86_400_000) return `${Math.floor(diff / 3_600_000)} 小时前`
if (diff < 2_592_000_000) return `${Math.floor(diff / 86_400_000)} 天前`
return new Date(ts).toLocaleDateString('zh-CN')
}
/** 目录只显示最后一级(完整路径会挤走命令本身,悬停可看全) */
function cwdTail(cwd: string): string {
if (!cwd) return ''
const parts = cwd.split(/[\\/]/).filter(Boolean)
return parts.length > 0 ? parts[parts.length - 1] : cwd
}
/** 退出码非 0(用户找的常常正是「刚才那条报错的命令」) */
function isFailed(item: CommandHistoryItem): boolean {
return item.exitCode !== null && item.exitCode !== 0
}
/** 是否处于筛选态(决定空态文案:是「没匹配」还是「还没有历史」) */
const isFiltered = computed(() => !!keyword.value || !!hostFilter.value || favoritedOnly.value)
</script>
<template>
<!--
触发器 + 浮层一体。Tooltip 锚在包裹 div 上、Popover 在自己的子树里用 as-child,
两条 as-child 链互不相干(与「更多」菜单同款处理);浮层展开期间禁用提示 ——
鼠标此时还停在按钮上,提示会压在浮层内容上。
-->
<Tooltip :disabled="historyPopoverOpen">
<TooltipTrigger as-child>
<div class="inline-flex shrink-0">
<Popover v-model:open="historyPopoverOpen">
<PopoverTrigger as-child>
<Button variant="ghost" size="icon-sm" class="shrink-0">
<History class="size-3.5" />
</Button>
</PopoverTrigger>
<!-- 内容自带内边距:让开 popover 默认的 w-72 / p-4 -->
<PopoverContent align="start" class="w-auto p-0">
<!-- 键盘事件挂在内容根上:↑↓ / Esc 在浮层内任意位置都应生效 -->
<div class="w-[380px]" @keydown="onKeydown">
<!-- ===== 搜索 + 来源 ===== -->
<div class="flex items-center gap-2 p-2.5 border-b border-border">
<div class="relative flex-1 min-w-0">
<Search
class="size-3.5 absolute left-2 top-1/2 -translate-y-1/2 text-muted-foreground"
/>
<Input v-model="keyword" placeholder="搜索命令…" class="h-7 pl-7 text-xs" autofocus />
</div>
<!-- 只有一个来源时下拉没有筛选意义,纯属噪音 -->
<Select
v-if="store.historySources.length > 1"
:model-value="hostFilter || ALL_SOURCES"
@update:model-value="v => (hostFilter = String(v) === ALL_SOURCES ? '' : String(v))"
>
<SelectTrigger size="sm" class="w-[124px] shrink-0 text-xs">
<SelectValue placeholder="来源" />
</SelectTrigger>
<SelectContent>
<!-- reka 的 SelectItem 不接受空串值,用哨兵值代表「不筛选」 -->
<SelectItem :value="ALL_SOURCES">全部来源</SelectItem>
<SelectItem v-for="s in store.historySources" :key="s.hostId" :value="s.hostId">
{{ s.hostName }}({{ s.count }})
</SelectItem>
</SelectContent>
</Select>
</div>
<!-- ===== 快捷筛选 ===== -->
<div class="flex items-center gap-1.5 px-2.5 py-2 text-xs">
<Button
size="sm"
class="h-6 px-2 text-[11px]"
:variant="hostFilter === '' && !favoritedOnly ? 'default' : 'outline'"
@click="hostFilter = ''; favoritedOnly = false"
>
全部
</Button>
<Button
v-if="currentHostId"
size="sm"
class="h-6 px-2 text-[11px]"
:variant="hostFilter === currentHostId ? 'default' : 'outline'"
:title="`只看本会话(${store.sessionLabel(session)})`"
@click="hostFilter = currentHostId; favoritedOnly = false"
>
仅本会话
</Button>
<Button
size="sm"
class="h-6 px-2 text-[11px]"
:variant="favoritedOnly ? 'default' : 'outline'"
@click="favoritedOnly = !favoritedOnly"
>
<Star class="size-3" />收藏
</Button>
<div class="flex-1" />
<span class="shrink-0 text-[10px] text-muted-foreground">{{ total }} 条</span>
</div>
<!-- ===== 列表 ===== -->
<ScrollArea class="h-[300px] border-t border-border">
<StateBlock
v-if="store.historyLoading && items.length === 0"
variant="loading"
:min-height="180"
/>
<StateBlock
v-else-if="items.length === 0"
variant="empty"
:title="isFiltered ? '没有匹配的命令' : '还没有命令历史'"
:description="
isFiltered ? undefined : '命令由 shell 集成 hook 上报,新开会话执行命令后即可在此查看。'
"
:min-height="180"
/>
<div v-else class="divide-y divide-divider">
<div
v-for="item in items"
:key="item.id"
class="group flex items-start gap-1.5 px-2.5 py-1.5 cursor-pointer transition-colors"
:class="selectedId === item.id ? 'bg-primary-soft' : 'hover:bg-hover'"
@click="selectedId = item.id"
@dblclick="useCommand(item, false)"
>
<!-- 收藏(不参与容量淘汰,因此可以随手留下想留的命令) -->
<button
class="shrink-0 mt-0.5 size-6 flex items-center justify-center transition-colors"
:class="
item.favorited ? 'text-warning' : 'text-muted-foreground/40 hover:text-warning'
"
:title="item.favorited ? '取消收藏' : '收藏(不参与容量淘汰)'"
@click.stop="toggleFavorite(item)"
>
<Star class="size-3.5" :fill="item.favorited ? 'currentColor' : 'none'" />
</button>
<div class="flex-1 min-w-0">
<div class="flex items-center gap-1.5">
<code
class="text-[11px] font-mono truncate"
:class="isFailed(item) ? 'text-danger' : 'text-foreground'"
:title="item.command"
>
{{ item.command }}
</code>
<!-- 执行次数:>1 说明是反复用到的命令,值得优先看 -->
<span
v-if="item.count > 1"
class="shrink-0 text-[10px] text-muted-foreground"
:title="`执行过 ${item.count} 次`"
>
×{{ item.count }}
</span>
</div>
<div class="flex items-center gap-2 mt-0.5 text-[10px] text-muted-foreground">
<span class="inline-flex items-center gap-0.5 shrink-0">
<Clock class="size-2.5" />{{ relTime(item.ts) }}
</span>
<span
v-if="item.cwd"
class="inline-flex items-center gap-0.5 min-w-0"
:title="item.cwd"
>
<FolderOpen class="size-2.5 shrink-0" />
<span class="truncate max-w-[80px]">{{ cwdTail(item.cwd) }}</span>
</span>
<span class="truncate max-w-[90px]">{{ item.hostName }}</span>
<span v-if="isFailed(item)" class="text-danger shrink-0">
退出码 {{ item.exitCode }}
</span>
</div>
</div>
<!-- 行操作:悬停出现,避免列表视觉噪音 -->
<div
class="shrink-0 flex items-center opacity-0 group-hover:opacity-100 transition-opacity"
>
<Button
variant="ghost"
size="icon-sm"
class="size-6 text-muted-foreground hover:text-foreground"
title="填入命令行(不执行)"
@click.stop="useCommand(item, false)"
>
<ArrowDownToLine class="size-3" />
</Button>
<Button
variant="ghost"
size="icon-sm"
class="size-6 text-muted-foreground hover:text-foreground"
title="填入并执行"
@click.stop="useCommand(item, true)"
>
<Play class="size-3" />
</Button>
<Button
variant="ghost"
size="icon-sm"
class="size-6 text-muted-foreground hover:text-foreground"
title="复制"
@click.stop="copyCommand(item)"
>
<Copy class="size-3" />
</Button>
<Button
variant="ghost"
size="icon-sm"
class="size-6 text-muted-foreground hover:text-danger"
title="删除这条"
@click.stop="removeItem(item)"
>
<Trash2 class="size-3" />
</Button>
</div>
</div>
</div>
</ScrollArea>
<!-- ===== 底部:操作提示 + 清空 ===== -->
<div
class="flex items-center gap-2 px-2.5 py-1.5 border-t border-border text-[10px] text-muted-foreground"
>
<span class="truncate">双击 / Enter 填入(不执行)</span>
<div class="flex-1" />
<Button
variant="ghost"
size="sm"
class="h-6 px-2 text-[11px] text-muted-foreground hover:text-destructive"
title="清空历史(保留收藏)"
@click="clearAll"
>
<Trash2 class="size-3" />清空
</Button>
</div>
</div>
</PopoverContent>
</Popover>
</div>
</TooltipTrigger>
<TooltipContent side="bottom">命令历史(Ctrl+Shift+H)</TooltipContent>
</Tooltip>
</template>
@@ -94,7 +94,7 @@ const canAccept = computed(() => !isChanged.value || acknowledged.value)
class="size-9 rounded-full flex items-center justify-center shrink-0"
:class="
isChanged
? 'bg-red-500/15 text-red-600 dark:text-red-400'
? 'bg-danger-soft text-danger-text'
: 'bg-primary/15 text-primary'
"
>
@@ -115,7 +115,7 @@ const canAccept = computed(() => !isChanged.value || acknowledged.value)
<!-- 高危警告:指纹变更几乎只有两种可能 —— 服务器重装,或有人在中间 -->
<div
v-if="isChanged"
class="rounded-md border border-red-500/40 bg-red-500/10 px-3 py-2.5 text-xs leading-relaxed text-red-700 dark:text-red-300"
class="rounded-md border border-danger/40 bg-danger-soft px-3 py-2.5 text-xs leading-relaxed text-danger-text"
>
<p class="font-medium mb-1">这可能意味着有人在窃听你的连接。</p>
<p>
@@ -150,7 +150,7 @@ const canAccept = computed(() => !isChanged.value || acknowledged.value)
class="flex-1 px-2.5 py-2 rounded font-mono text-[12px] break-all select-all leading-relaxed"
:class="
isChanged
? 'bg-red-500/10 border border-red-500/30'
? 'bg-danger-soft border-danger/30'
: 'bg-muted border border-border'
"
>
@@ -163,7 +163,7 @@ const canAccept = computed(() => !isChanged.value || acknowledged.value)
:title="copied ? '已复制' : '复制指纹'"
@click="copyFingerprint"
>
<Check v-if="copied" class="size-3.5 text-emerald-500" />
<Check v-if="copied" class="size-3.5 text-success" />
<Copy v-else class="size-3.5" />
</Button>
</div>
+275 -113
View File
@@ -12,10 +12,25 @@
* 2. **新建时先向要一个 id**。密码按 hostId 存取,若等 save_host 之后再生成 id,
* 用户在新建对话框里填的密码就没有归属。因此用 `terminal_new_host_id`
* 预取 id,使「新建」与「编辑」走完全相同的流程。
*
* # 已知主机(known_hosts)在这里而不是独立页(2026-09-22)
*
* 「这台主机我信任过吗、指纹变过没有」是**浏览主机列表时顺手核对**的信息,
* 此前它占着「凭据」页的一个分区,于是核对信任要跨 tab,而每个 tab 里都只有
* 半张信息。现在三层都落在本页:
*
* - 主机行的**信任徽标**(未连接过 / 已信任 / 变更 N 次)——一眼可见;
* - 徽标点开的 **HostTrustPopover**——各算法指纹、变更历史、「忘记」;
* - 列表末尾的 **OrphanKnownHosts**——没有对应主机配置的记录(配置已删或
* 从未保存过配置),它们照样会拦截连接,不能失去入口。
*
* 整份 known_hosts 的维护动作(导入 / 导出 / 清空)是低频操作,收进工具条的
* 「已知主机」下拉(`KnownHostsMenu`),不占页面主线。
*/
import { computed, ref, watch } from 'vue'
import { open as openDialog, save as saveDialog } from '@tauri-apps/plugin-dialog'
import {
AlertTriangle,
ArrowDown,
ArrowUp,
Download,
@@ -51,14 +66,24 @@ import {
SelectTrigger,
SelectValue
} from '@/components/ui/select'
import { ScrollArea } from '@/components/ui/scroll-area'
import { Card, CardContent } from '@/components/ui/card'
import { StateBlock, StatusBadge } from '@/components/common'
import { createLogger } from '@/lib/logger'
import { blankHost, type SshHost } from './hostForm'
import type { HostView } from '@/types/terminal'
import HostTrustBadge from './HostTrustBadge.vue'
import KnownHostsMenu from './KnownHostsMenu.vue'
import OrphanKnownHosts from './OrphanKnownHosts.vue'
import { addressLabel, groupByAddress, recordsForHost, trustState } from './hostTrust'
import PageToolbar from '@/components/layout/PageToolbar.vue'
import type { HostView, KnownHost } from '@/types/terminal'
const logger = createLogger('terminal')
const store = useTerminalStore()
const emit = defineEmits<{ (e: 'close'): void; (e: 'connect', hostId: string): void }>()
// 只声明 connect:本页现在是模块级 Tabs 的一页,不再需要「返回终端」语义
// (导航由 Tabs 承担),此前声明的 close 事件从未被触发过。
const emit = defineEmits<{ (e: 'connect', hostId: string): void }>()
// ===== 编辑对话框 =====
@@ -237,6 +262,45 @@ async function toggleFavorite(v: HostView) {
/** 可用密钥(供认证方式下拉使用) */
const availableKeys = computed(() => store.keys.filter(k => k.fileExists))
// ===== 主机密钥信任(known_hosts) =====
/**
* 记录按地址归组一次,供本页反复查(每行徽标 + 详情 popover + 顶部提示)。
* 匹配规则与「孤儿」判定共用 `hostTrust.ts` 里的同一套实现 —— 分头实现迟早
* 会出现「徽标说已信任、点开却找不到记录」这类自相矛盾。
*/
const groupedKnownHosts = computed(() => groupByAddress(store.knownHosts))
/** 某台主机对应的指纹记录(可能为空 = 还没成功连过) */
function recordsOf(v: HostView): KnownHost[] {
return recordsForHost(groupedKnownHosts.value, v.config)
}
/** 指纹曾变更过的主机数(顶部风险提示的数据源) */
const changedHostCount = computed(
() => store.hosts.filter(v => trustState(recordsOf(v)) === 'changed').length
)
// ===== 忘记某台主机(信任详情 popover 的破坏性动作) =====
const pendingForget = ref<KnownHost | null>(null)
const forgetBusy = ref(false)
async function submitForget() {
const r = pendingForget.value
if (!r) return
forgetBusy.value = true
try {
await store.forgetHost(r.host, r.port, r.keyType)
toast.success(`已忘记 ${addressLabel(r.host, r.port)}`)
pendingForget.value = null
} catch (e) {
toast.error(`操作失败:${String(e)}`)
} finally {
forgetBusy.value = false
}
}
// ===== 跳板机链(ProxyJump)=====
/**
@@ -280,129 +344,175 @@ function moveHop(i: number, dir: -1 | 1) {
</script>
<template>
<div class="flex flex-col h-full">
<!-- 头部 -->
<div class="shrink-0 flex items-center gap-2 px-4 h-12 border-b border-border">
<Globe class="size-4 text-muted-foreground" />
<h3 class="text-sm font-medium">SSH 主机</h3>
<span class="text-xs text-muted-foreground">({{ store.hosts.length }})</span>
<div class="flex-1" />
<Button variant="outline" size="sm" class="h-7 gap-1.5 text-xs" @click="importHosts">
<div class="flex flex-col h-full overflow-hidden">
<PageToolbar :icon="Globe" title="SSH 主机" :meta="`共 ${store.hosts.length} 台`">
<KnownHostsMenu />
<Button variant="outline" size="sm" @click="importHosts">
<Upload class="size-3.5" />导入备份
</Button>
<Button variant="outline" size="sm" class="h-7 gap-1.5 text-xs" @click="exportHosts">
<Button variant="outline" size="sm" @click="exportHosts">
<Download class="size-3.5" />导出
</Button>
<Button variant="outline" size="sm" class="h-7 gap-1.5 text-xs" @click="importConfig">
<Button variant="outline" size="sm" @click="importConfig">
<Download class="size-3.5" />导入 ~/.ssh/config
</Button>
<Button size="sm" class="h-7 gap-1.5 text-xs" @click="openNew">
<Button size="sm" @click="openNew">
<Plus class="size-3.5" />新建主机
</Button>
</div>
</PageToolbar>
<!-- 列表 -->
<div class="flex-1 min-h-0 overflow-y-auto p-3">
<div v-if="store.hosts.length === 0" class="py-16 text-center">
<Globe class="size-8 mx-auto text-muted-foreground/30 mb-3" />
<p class="text-sm text-muted-foreground mb-1">还没有配置 SSH 主机</p>
<p class="text-xs text-muted-foreground/70 mb-4">
可以手工新建,也可以直接从 <code class="px-1 rounded bg-muted">~/.ssh/config</code> 导入
<!-- 风险提示:有主机指纹变更时始终可见(信任详情 popover 是同一条信息的展开) -->
<div
v-if="changedHostCount > 0"
class="shrink-0 mb-3 flex items-start gap-2 p-2.5 rounded-md
border border-warning/40 bg-warning-soft"
>
<AlertTriangle class="size-3.5 shrink-0 mt-0.5 text-warning" />
<div class="text-[11px] text-warning-text">
<p class="font-medium">{{ changedHostCount }} 台主机曾发生指纹变更</p>
<p class="mt-0.5 opacity-90">
若不是您本人重装或更换了服务器密钥,请联系管理员核实。点主机行的信任徽标可查看详情。
</p>
<div class="flex items-center justify-center gap-2">
<Button size="sm" class="gap-1.5" @click="openNew">
<Plus class="size-3.5" />新建主机
</Button>
<Button variant="outline" size="sm" class="gap-1.5" @click="importConfig">
<Download class="size-3.5" />导入配置
</Button>
</div>
</div>
<div v-else class="space-y-1">
<div
v-for="v in store.hosts"
:key="v.config.id"
class="group flex items-center gap-3 px-3 py-2 rounded-md border border-border
hover:border-primary/40 hover:bg-accent/30 transition-colors"
>
<button
class="shrink-0 size-6 rounded flex items-center justify-center transition-colors"
:class="
v.config.favorited
? 'text-amber-500'
: 'text-muted-foreground/30 hover:text-amber-500'
"
:title="v.config.favorited ? '取消收藏' : '收藏'"
@click="toggleFavorite(v)"
>
<Star class="size-3.5" :class="{ 'fill-current': v.config.favorited }" />
</button>
<div class="min-w-0 flex-1">
<div class="flex items-center gap-2">
<span class="text-sm font-medium truncate">
{{ v.config.name || v.config.host }}
</span>
<span v-if="v.config.group" class="text-[10px] px-1.5 py-0.5 rounded bg-muted shrink-0">
{{ v.config.group }}
</span>
<!-- 不可连接时给出明确原因,而不是让用户点下去才发现失败 -->
<span
v-if="!v.ready"
class="text-[10px] px-1.5 py-0.5 rounded bg-amber-500/15 text-amber-600 dark:text-amber-400 shrink-0"
:title="v.issue ?? ''"
>
{{ v.issue || '配置不完整' }}
</span>
</div>
<div class="text-xs text-muted-foreground truncate mt-0.5">
{{ v.config.username }}@{{ v.config.host
}}<span v-if="v.config.port !== 22">:{{ v.config.port }}</span>
<span class="mx-1.5">·</span>
<span v-if="v.config.authMethod === 'key' && v.config.keyId">
<KeyRound class="inline size-2.5 -mt-0.5" />
{{ store.keys.find(k => k.meta.id === v.config.keyId)?.meta.name ?? '密钥' }}
</span>
<span v-else-if="v.config.authMethod === 'password'">
<!-- 不回显掩码:密码不是 API key,保留前 3 后 4 也是在泄露真实内容;
是否已保存由 hasPassword 表达,明文/掩码一律不出现在列表 -->
{{ v.hasPassword ? '密码已保存' : '密码未保存' }}
</span>
<span v-else>{{ v.config.authMethod }}</span>
</div>
</div>
<div class="shrink-0 flex items-center gap-1 opacity-0 group-hover:opacity-100 transition-opacity">
<Button
size="sm"
class="h-7 text-xs"
:disabled="!v.ready"
:title="v.ready ? '连接' : (v.issue ?? '')"
@click="emit('connect', v.config.id)"
>
连接
</Button>
<Button variant="ghost" size="icon" class="size-7" title="编辑" @click="openEdit(v.config.id)">
<Pencil class="size-3.5" />
</Button>
<Button
variant="ghost"
size="icon"
class="size-7 text-destructive hover:text-destructive"
title="删除"
@click="remove(v)"
>
<Trash2 class="size-3.5" />
</Button>
</div>
</div>
</div>
</div>
<!--
列表:卡片承载(与 proxy 订阅列表同口径),行间距 8px。
`-mx-3` + 内层 `px-3 pb-3`:滚动视口会裁掉超出自身盒子的内容,卡片阴影
(shadow-sm)贴着视口边缘就会被切一半 —— 表现为「终端模块的卡片比别的
页面扁」。负外边距把视口向两侧各外扩 12px、内层等量内缩,卡片位置与宽度
不变却留出了阴影余量。**内边距必须在内层**:根元素上的 pb 不属于滚动内容,
滚到底时最后一张卡片的底部阴影仍会被裁(同一份说明见 TerminalSettingsPanel)。
-->
<ScrollArea class="flex-1 min-h-0 -mx-3">
<div class="px-3 pb-3">
<Card v-if="store.hosts.length === 0">
<CardContent>
<StateBlock
variant="empty"
title="还没有配置 SSH 主机"
description="可以手工新建,也可以直接从 ~/.ssh/config 导入"
:min-height="220"
>
<template #action>
<div class="flex items-center justify-center gap-2">
<Button size="sm" class="gap-1.5" @click="openNew">
<Plus class="size-3.5" />新建主机
</Button>
<Button variant="outline" size="sm" class="gap-1.5" @click="importConfig">
<Download class="size-3.5" />导入配置
</Button>
</div>
</template>
</StateBlock>
</CardContent>
</Card>
<Card v-else>
<CardContent class="space-y-2">
<div
v-for="v in store.hosts"
:key="v.config.id"
class="group flex items-center gap-3 rounded-md border border-border p-3 transition-colors hover:bg-hover"
>
<button
class="shrink-0 size-7 rounded flex items-center justify-center transition-colors"
:class="
v.config.favorited
? 'text-warning'
: 'text-muted-foreground/30 hover:text-warning'
"
:title="v.config.favorited ? '取消收藏' : '收藏'"
@click="toggleFavorite(v)"
>
<Star class="size-3.5" :class="{ 'fill-current': v.config.favorited }" />
</button>
<div class="min-w-0 flex-1">
<div class="flex items-center gap-2">
<span class="text-sm font-medium truncate">
{{ v.config.name || v.config.host }}
</span>
<span v-if="v.config.group" class="shrink-0 text-[11px] text-muted-foreground">
{{ v.config.group }}
</span>
<!-- 不可连接时给出明确原因,而不是让用户点下去才发现失败 -->
<StatusBadge
v-if="!v.ready"
variant="warning"
size="sm"
:title="v.issue ?? ''"
>
{{ v.issue || '配置不完整' }}
</StatusBadge>
<!--
主机密钥信任:徽标即「查看详情」的入口(有记录时才可点),
详情与「忘记」都在 HostTrustBadge 里,行内只传记录集合。
-->
<HostTrustBadge
:label="v.config.name || v.config.host"
:address="addressLabel(v.config.host, v.config.port)"
:records="recordsOf(v)"
@forget="pendingForget = $event"
/>
</div>
<div class="text-xs text-muted-foreground truncate mt-0.5">
{{ v.config.username }}@{{ v.config.host
}}<span v-if="v.config.port !== 22">:{{ v.config.port }}</span>
<span class="mx-1.5">·</span>
<span v-if="v.config.authMethod === 'key' && v.config.keyId">
<KeyRound class="inline size-2.5 -mt-0.5" />
{{ store.keys.find(k => k.meta.id === v.config.keyId)?.meta.name ?? '密钥' }}
</span>
<span v-else-if="v.config.authMethod === 'password'">
<!-- 不回显掩码:密码不是 API key,保留前 3 后 4 也是在泄露真实内容;
是否已保存由 hasPassword 表达,明文/掩码一律不出现在列表 -->
{{ v.hasPassword ? '密码已保存' : '密码未保存' }}
</span>
<span v-else>{{ v.config.authMethod }}</span>
</div>
</div>
<div class="shrink-0 flex items-center gap-1 opacity-0 group-hover:opacity-100 transition-opacity">
<Button
size="sm"
:disabled="!v.ready"
:title="v.ready ? '连接' : (v.issue ?? '')"
@click="emit('connect', v.config.id)"
>
连接
</Button>
<Button variant="ghost" size="icon-sm" title="编辑" @click="openEdit(v.config.id)">
<Pencil class="size-3.5" />
</Button>
<Button
variant="ghost"
size="icon-sm"
class="text-destructive hover:text-destructive"
title="删除"
@click="remove(v)"
>
<Trash2 class="size-3.5" />
</Button>
</div>
</div>
</CardContent>
</Card>
<!--
没有对应主机配置的指纹记录(配置已删 / 从未保存过配置)。
放在主机列表之后的**同一滚动区**里:它属于「同一份 known_hosts 的另一半」,
独立成一屏会让用户在两个位置之间来回找。
-->
<OrphanKnownHosts @forget="pendingForget = $event" />
</div>
</ScrollArea>
<!-- ===== 编辑对话框 ===== -->
<Dialog v-model:open="dialogOpen">
<DialogContent class="max-w-xl max-h-[85vh] overflow-y-auto">
<DialogContent class="max-w-xl max-h-[85vh]">
<DialogHeader>
<DialogTitle>{{ isNew ? '新建 SSH 主机' : '编辑 SSH 主机' }}</DialogTitle>
<DialogDescription class="text-xs">
@@ -410,7 +520,14 @@ function moveHop(i: number, dir: -1 | 1) {
</DialogDescription>
</DialogHeader>
<div v-if="editing" class="space-y-4">
<!--
表单很长(基本信息 + 认证 + 可展开的「高级选项」),必须滚动。
用 ScrollArea 而不是给 DialogContent 加 overflow-y-auto:后者会带上
浏览器原生滚动条(系统样式、与主题不一致),项目其余长对话框
(monitor / downloader)都用 ScrollArea + max-h 的写法。
-->
<ScrollArea class="max-h-[60vh] pr-4">
<div v-if="editing" class="space-y-4">
<!-- 基本信息 -->
<div class="grid grid-cols-2 gap-3">
<div class="space-y-1.5">
@@ -476,7 +593,7 @@ function moveHop(i: number, dir: -1 | 1) {
</SelectContent>
</Select>
<p v-if="errors.keyId" class="text-[11px] text-destructive">{{ errors.keyId }}</p>
<p v-if="availableKeys.length === 0" class="text-[11px] text-amber-600 dark:text-amber-400">
<p v-if="availableKeys.length === 0" class="text-[11px] text-warning">
还没有可用密钥,请先到「密钥管理」生成或导入
</p>
</div>
@@ -637,9 +754,21 @@ function moveHop(i: number, dir: -1 | 1) {
</div>
<Switch v-model="editing.favorited" />
</div>
<div class="flex items-center justify-between gap-3">
<div>
<Label class="text-xs">注入 shell 集成</Label>
<p class="text-[11px] text-muted-foreground">
让远端上报命令与目录,命令历史与 cwd 跟踪才可用(不落盘,只影响本次会话)。
与「登录后执行」里 exec 换 shell 的配置冲突时可关掉
</p>
</div>
<Switch v-model="editing.injectShellIntegration" />
</div>
</div>
</details>
</div>
</div>
</ScrollArea>
<DialogFooter>
<Button variant="outline" size="sm" @click="dialogOpen = false">取消</Button>
@@ -667,5 +796,38 @@ function moveHop(i: number, dir: -1 | 1) {
</DialogFooter>
</DialogContent>
</Dialog>
<!--
===== 忘记主机密钥(指纹记录) =====
对话框放在页级而不是信任 popover 内部:popover 会因失焦关闭,
而确认框是「用户明确同意降低校验强度」的关键一步,不能被关在中间。
-->
<Dialog :open="pendingForget !== null" @update:open="v => !v && (pendingForget = null)">
<DialogContent class="max-w-sm" :show-close-button="false">
<DialogHeader>
<DialogTitle class="text-base">忘记该主机</DialogTitle>
<DialogDescription class="text-xs">
将删除
<span class="font-mono">
{{ pendingForget ? addressLabel(pendingForget.host, pendingForget.port) : '' }}
</span>
的
<span class="font-mono">{{ pendingForget?.keyType }}</span>
指纹记录。下次连接时将重新提示核对。
</DialogDescription>
</DialogHeader>
<div class="flex items-start gap-2 p-2 rounded bg-muted text-[11px] text-muted-foreground">
<AlertTriangle class="size-3.5 shrink-0 mt-0.5" />
<span>仅在确认该主机密钥确实已更换时执行。若出于「连不上就删掉」的动机,请先核实原因。</span>
</div>
<DialogFooter>
<Button variant="outline" size="sm" @click="pendingForget = null">取消</Button>
<Button variant="destructive" size="sm" :disabled="forgetBusy" @click="submitForget">
<Loader2 v-if="forgetBusy" class="size-3.5 mr-1.5 animate-spin" />
忘记
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
</div>
</template>
@@ -0,0 +1,71 @@
<script setup lang="ts">
/**
* 主机行的「主机密钥信任」徽标 + 详情 popover。
*
* # 为什么单独成一个组件
*
* 主机行本身已经很长(收藏、名称、分组、可连接性、认证方式、四个操作按钮)。
* 信任这块要读三样东西(记录集合、状态、变更次数)并渲染两层结构(徽标 +
* popover),塞进主机行的模板会让那一行难以阅读,也会让同一批判断在模板里
* 重复出现好几次。抽出来后,主机行只需要传 `records` 一个 prop。
*
* # 徽标即入口
*
* 有记录时徽标本身可点开(不再额外挂一个盾牌图标按钮):徽标已经表达了状态,
* 再放一个图标是同一件事占两份宽度。没有记录时用中性徽标「未连接过」,
* 且不可点 —— 没有内容可看,可点只会让人白点一次。
*/
import { computed } from 'vue'
import { History, ShieldCheck } from '@lucide/vue'
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
import { StatusBadge } from '@/components/common'
import HostTrustPopover from './HostTrustPopover.vue'
import { changeCount, trustState } from './hostTrust'
import type { KnownHost } from '@/types/terminal'
const props = defineProps<{
/** 主机显示名(配置里 name 为空时传地址) */
label: string
/** 地址:端口 */
address: string
/** 该主机的全部指纹记录(空 = 从未成功连过) */
records: KnownHost[]
}>()
const emit = defineEmits<{ (e: 'forget', record: KnownHost): void }>()
const state = computed(() => trustState(props.records))
const changes = computed(() => changeCount(props.records))
</script>
<template>
<Popover v-if="records.length > 0">
<PopoverTrigger as-child>
<button class="shrink-0" title="查看主机密钥指纹与变更历史">
<StatusBadge :variant="state === 'changed' ? 'warning' : 'success'" size="sm">
<History v-if="state === 'changed'" class="size-2.5" />
<ShieldCheck v-else class="size-2.5" />
{{ state === 'changed' ? `指纹变更 ${changes} 次` : '已信任' }}
</StatusBadge>
</button>
</PopoverTrigger>
<!-- 内容自带内边距:这里把 popover 默认的 w-72 / p-4 让开,避免双重留白 -->
<PopoverContent align="start" class="w-auto p-0">
<HostTrustPopover
:label="label"
:address="address"
:records="records"
@forget="emit('forget', $event)"
/>
</PopoverContent>
</Popover>
<StatusBadge
v-else
variant="neutral"
size="sm"
title="还没有该主机的指纹记录,首次连接时会提示核对"
>
未连接过
</StatusBadge>
</template>
@@ -0,0 +1,148 @@
<script setup lang="ts">
/**
* 单台主机的「信任详情」popover(挂在主机行的盾牌按钮上)。
*
* # 为什么用 popover 而不是新页面
*
* 信任这件事的信息量是「一台主机的几条指纹 + 变更历史」,属于**行级细节**:
* 用户是在浏览主机列表时顺手核对一下「这台我信任过吗、变过没有」。
* 以前它占着「凭据」页的一整个分区,于是「看主机的信任状态」要跨越两个 tab,
* 而每个 tab 里都只有半张信息。现在它与主机挤在同一行上。
*
* # 为什么「忘记」要抛给父组件
*
* 忘记是**破坏性且带安全含义**的操作(删掉指纹后下次连接会在没有校验的情况下
* 重新提示),必须有一个明确的确认对话框。对话框若挂在 popover 内部,
* popover 会先因失焦关闭、再把对话框弹在一个已经不存在的锚点上下文里 ——
* 焦点与层级的边界问题不值得为省一次事件传递而承担。
* 因此这里只负责「选出要忘记的那条记录」,确认与执行由主机页统一处理。
*/
import { computed, ref } from 'vue'
import { AlertTriangle, History, Server, ShieldCheck, Trash2 } from '@lucide/vue'
import { Button } from '@/components/ui/button'
import { StatusBadge } from '@/components/common'
import {
changeCount,
formatDateTime,
keyTypeLabel,
recordKey,
trustState
} from './hostTrust'
import type { KnownHost } from '@/types/terminal'
const props = defineProps<{
/** 主机显示名(配置里的 name,可能为空 → 调用方传地址兜底) */
label: string
/** 地址:端口(非 22 才带端口) */
address: string
/** 该主机的全部 known_hosts 记录(含多种算法) */
records: KnownHost[]
}>()
const emit = defineEmits<{ (e: 'forget', record: KnownHost): void }>()
const state = computed(() => trustState(props.records))
const changes = computed(() => changeCount(props.records))
/** 展开变更历史的记录键(同一时刻只展开一条,popover 空间有限) */
const expanded = ref<string | null>(null)
function toggleHistory(r: KnownHost) {
const k = recordKey(r)
expanded.value = expanded.value === k ? null : k
}
</script>
<template>
<div class="w-[340px] p-3 space-y-3">
<!-- 头部:目标 + 总体状态 -->
<div class="flex items-start gap-2">
<Server class="size-3.5 shrink-0 mt-0.5 text-muted-foreground" />
<div class="min-w-0 flex-1">
<p class="text-xs font-medium truncate" :title="label">{{ label }}</p>
<p class="text-[11px] font-mono text-muted-foreground truncate">{{ address }}</p>
</div>
<StatusBadge v-if="state === 'changed'" variant="warning" size="sm">
<History class="size-2.5" />变更 {{ changes }} 次
</StatusBadge>
<StatusBadge v-else variant="success" size="sm">
<ShieldCheck class="size-2.5" />已信任
</StatusBadge>
</div>
<div v-if="changes > 0" class="flex items-start gap-2 p-2 rounded bg-warning-soft">
<AlertTriangle class="size-3.5 shrink-0 mt-0.5 text-warning" />
<p class="text-[11px] text-warning-text leading-relaxed">
这台主机的主机密钥曾发生变更。若不是您本人重装或更换了服务端密钥,
请联系管理员核实后再继续使用。
</p>
</div>
<!-- 逐算法列出指纹 -->
<div class="space-y-2">
<div
v-for="r in records"
:key="recordKey(r)"
class="rounded-md border border-border p-2"
>
<div class="flex items-center gap-2">
<span class="text-[11px] font-medium">{{ keyTypeLabel(r.keyType) }}</span>
<div class="flex-1" />
<button
v-if="r.history.length > 0"
class="text-[10px] text-warning-text hover:underline shrink-0"
@click="toggleHistory(r)"
>
变更 {{ r.history.length }} 次
{{ expanded === recordKey(r) ? '▴' : '▾' }}
</button>
<Button
variant="ghost"
size="icon-sm"
class="shrink-0 text-muted-foreground hover:text-destructive"
title="忘记该主机(删除这条指纹记录)"
@click="emit('forget', r)"
>
<Trash2 class="size-3" />
</Button>
</div>
<p class="mt-1 text-[11px] font-mono text-muted-foreground break-all">
{{ r.fingerprint }}
</p>
<div class="mt-1 flex items-center gap-3 text-[10px] text-muted-foreground/80">
<span>首次 {{ formatDateTime(r.firstSeen) }}</span>
<span>最近确认 {{ formatDateTime(r.lastConfirmed) }}</span>
</div>
<!-- 变更历史:展开后按时间倒序(后端已是倒序,这里不再排序) -->
<div
v-if="expanded === recordKey(r)"
class="mt-2 pt-2 border-t border-border space-y-1.5"
>
<div v-for="(c, i) in r.history" :key="i" class="flex items-start gap-1.5">
<span
class="shrink-0 mt-0.5 size-1.5 rounded-full"
:class="c.accepted ? 'bg-warning' : 'bg-muted-foreground/40'"
/>
<div class="min-w-0 text-[10px]">
<span class="text-muted-foreground">{{ formatDateTime(c.changedAt) }}</span>
<span class="mx-1">·</span>
<span :class="c.accepted ? 'text-warning-text' : 'text-muted-foreground'">
{{ c.accepted ? '已接受变更' : '已拒绝变更' }}
</span>
<p class="font-mono text-muted-foreground/70 break-all" :title="c.oldFingerprint">
原指纹 {{ c.oldFingerprint }}
</p>
</div>
</div>
</div>
</div>
</div>
<p class="text-[10px] text-muted-foreground/70 leading-relaxed">
核对指纹应与服务器管理员提供的值一致。指纹不同且无法解释时,请不要连接。
</p>
</div>
</template>
@@ -24,7 +24,6 @@ import {
Check,
ClipboardCopy,
Download,
FileKey,
FolderOpen,
KeyRound,
Loader2,
@@ -56,12 +55,20 @@ import {
SelectTrigger,
SelectValue
} from '@/components/ui/select'
import { ScrollArea } from '@/components/ui/scroll-area'
import { Card, CardContent } from '@/components/ui/card'
import { StateBlock, StatusBadge } from '@/components/common'
import { createLogger } from '@/lib/logger'
import PageToolbar from '@/components/layout/PageToolbar.vue'
import type { KeyGenParams, KeyView } from '@/types/terminal'
const logger = createLogger('terminal')
const store = useTerminalStore()
// 本页不再有分区开关:known_hosts(原「已知主机」分区)已并入主机页
// (见 HostManager 的信任徽标与 OrphanKnownHosts),因此这里没有「切到另一半」
// 的语义需要抛给父组件。
// ===== 生成 =====
const genOpen = ref(false)
@@ -182,7 +189,7 @@ async function submitImport() {
if (!text.trim()) e.content = '请粘贴私钥内容'
// 与服务端 `terminal/keys.rs::is_ppk` 的判定保持一致:PPK 头部必须在首行。
// 前端只做「是不是明显不对」的拦截,真正的解析一律交给后端——
// 前端做格式解析迟早会与后端分叉(见 SnippetPanel 里同样的取舍)。
// 前端做格式解析迟早会与后端分叉(见 SnippetPopover 里同样的取舍)。
else if (!text.includes('PRIVATE KEY') && !/^\s*PuTTY-User-Key-File-\d+:/m.test(text)) {
e.content = '内容看起来不是私钥(需为 OpenSSH 私钥或 PuTTY .ppk)'
}
@@ -393,143 +400,142 @@ function formatDate(rfc3339: string): string {
</script>
<template>
<div class="flex flex-col h-full">
<!-- 头部 -->
<div class="shrink-0 flex items-center gap-2 px-4 h-12 border-b border-border">
<KeyRound class="size-4 text-muted-foreground" />
<h3 class="text-sm font-medium">SSH 密钥</h3>
<span class="text-xs text-muted-foreground">({{ store.keys.length }})</span>
<div class="flex-1" />
<Button variant="outline" size="sm" class="h-7 gap-1.5 text-xs" @click="openImport">
<div class="flex flex-col h-full overflow-hidden">
<PageToolbar :icon="KeyRound" title="SSH 密钥" :meta="`共 ${store.keys.length} 个`">
<Button variant="outline" size="sm" @click="openImport">
<Download class="size-3.5" />导入密钥
</Button>
<Button size="sm" class="h-7 gap-1.5 text-xs" @click="openGenerate">
<Button size="sm" @click="openGenerate">
<Plus class="size-3.5" />生成密钥
</Button>
</div>
</PageToolbar>
<!-- 列表 -->
<div class="flex-1 min-h-0 overflow-y-auto p-3">
<div v-if="store.keys.length === 0" class="py-16 text-center">
<FileKey class="size-8 mx-auto text-muted-foreground/30 mb-3" />
<p class="text-sm text-muted-foreground mb-1">还没有 SSH 密钥</p>
<p class="text-xs text-muted-foreground/70 mb-4">
推荐生成 Ed25519 —— 更短、更快、安全性优于同强度的 RSA
</p>
<div class="flex items-center justify-center gap-2">
<Button size="sm" class="gap-1.5" @click="openGenerate">
<Plus class="size-3.5" />生成密钥
</Button>
<Button variant="outline" size="sm" class="gap-1.5" @click="openImport">
<Download class="size-3.5" />导入已有密钥
</Button>
</div>
</div>
<!--
列表:卡片承载(与 proxy 订阅列表同口径)。
<div v-else class="space-y-1.5">
<div
v-for="k in store.keys"
:key="k.meta.id"
class="group rounded-md border border-border px-3 py-2.5
hover:border-primary/40 hover:bg-accent/30 transition-colors"
>
<div class="flex items-start gap-3">
<div class="shrink-0 mt-0.5">
<Lock v-if="k.hasPassphrase" class="size-4 text-emerald-600 dark:text-emerald-400" />
<Unlock v-else class="size-4 text-muted-foreground/50" />
</div>
`-mx-3` + 内层 `px-3 pb-3`:视口左右各外扩 12px 再等量内缩,卡片位置不变,
但两侧与底部的阴影不再被视口裁掉(内边距必须在内层,见 HostManager 同款说明)。
-->
<ScrollArea class="flex-1 min-h-0 -mx-3">
<div class="px-3 pb-3">
<Card v-if="store.keys.length === 0">
<CardContent>
<StateBlock
variant="empty"
title="还没有 SSH 密钥"
description="推荐生成 Ed25519 —— 更短、更快、安全性优于同强度的 RSA"
:min-height="220"
>
<template #action>
<div class="flex items-center justify-center gap-2">
<Button size="sm" class="gap-1.5" @click="openGenerate">
<Plus class="size-3.5" />生成密钥
</Button>
<Button variant="outline" size="sm" class="gap-1.5" @click="openImport">
<Download class="size-3.5" />导入已有密钥
</Button>
</div>
</template>
</StateBlock>
</CardContent>
</Card>
<div class="min-w-0 flex-1">
<div class="flex items-center gap-2 flex-wrap">
<span class="text-sm font-medium truncate">{{ k.meta.name }}</span>
<span class="text-[10px] px-1.5 py-0.5 rounded bg-muted font-mono shrink-0">
{{ algorithmLabel(k.meta.algorithm) }}{{ k.meta.bits ? ` ${k.meta.bits}` : '' }}
</span>
<span
v-if="k.hasPassphrase"
class="text-[10px] px-1.5 py-0.5 rounded bg-emerald-500/15 text-emerald-700 dark:text-emerald-400 shrink-0"
<Card v-else>
<CardContent class="space-y-2">
<div
v-for="k in store.keys"
:key="k.meta.id"
class="group rounded-md border border-border p-3 transition-colors hover:bg-hover"
>
<div class="flex items-start gap-3">
<div class="shrink-0 mt-0.5">
<Lock v-if="k.hasPassphrase" class="size-4 text-success" />
<Unlock v-else class="size-4 text-muted-foreground/50" />
</div>
<div class="min-w-0 flex-1">
<div class="flex items-center gap-2 flex-wrap">
<span class="text-sm font-medium truncate">{{ k.meta.name }}</span>
<span class="shrink-0 text-[11px] font-mono text-muted-foreground">
{{ algorithmLabel(k.meta.algorithm) }}{{ k.meta.bits ? ` ${k.meta.bits}` : '' }}
</span>
<StatusBadge v-if="k.hasPassphrase" variant="success" size="sm">已加密</StatusBadge>
<!-- 私钥文件丢失时明确告警:主机配置还指向它,但已经连不上了 -->
<StatusBadge v-if="!k.fileExists" variant="danger" size="sm">
<AlertTriangle class="size-2.5" />私钥文件缺失
</StatusBadge>
</div>
<div class="mt-1 text-xs text-muted-foreground">
<span class="font-mono truncate block" :title="k.meta.fingerprint">
{{ k.meta.fingerprint }}
</span>
</div>
<div class="mt-1 flex items-center gap-3 text-[11px] text-muted-foreground/80">
<span v-if="k.meta.comment" class="truncate">{{ k.meta.comment }}</span>
<span>创建于 {{ formatDate(k.meta.createdAt) }}</span>
<span v-if="k.meta.fileName" class="font-mono truncate">{{ k.meta.fileName }}</span>
</div>
</div>
<div class="shrink-0 flex items-center gap-1">
<Button
variant="ghost"
size="icon-sm"
:title="copiedId === k.meta.id ? '已复制' : '复制公钥'"
@click="copyPublic(k)"
>
已加密
</span>
<!-- 私钥文件丢失时明确告警:主机配置还指向它,但已经连不上了 -->
<span
v-if="!k.fileExists"
class="text-[10px] px-1.5 py-0.5 rounded bg-destructive/15 text-destructive inline-flex items-center gap-0.5 shrink-0"
<Check v-if="copiedId === k.meta.id" class="size-3.5 text-success" />
<ClipboardCopy v-else class="size-3.5" />
</Button>
<Button
variant="ghost"
size="icon-sm"
class="opacity-0 group-hover:opacity-100 transition-opacity"
title="复制为 authorized_keys 单行格式"
@click="copyForAuthorizedKeys(k)"
>
<AlertTriangle class="size-2.5" />私钥文件缺失
</span>
<ShieldCheck class="size-3.5" />
</Button>
<Button
variant="ghost"
size="icon-sm"
class="opacity-0 group-hover:opacity-100 transition-opacity"
title="修改 passphrase"
@click="openPassphrase(k)"
>
<Lock class="size-3.5" />
</Button>
<Button
variant="ghost"
size="icon-sm"
class="opacity-0 group-hover:opacity-100 transition-opacity"
title="重命名"
@click="openRename(k)"
>
<Pencil class="size-3.5" />
</Button>
<Button
variant="ghost"
size="icon-sm"
class="opacity-0 group-hover:opacity-100 transition-opacity text-destructive hover:text-destructive"
title="删除"
@click="pendingDelete = k"
>
<Trash2 class="size-3.5" />
</Button>
</div>
<div class="mt-1 text-xs text-muted-foreground">
<span class="font-mono truncate block" :title="k.meta.fingerprint">
{{ k.meta.fingerprint }}
</span>
</div>
<div class="mt-1 flex items-center gap-3 text-[11px] text-muted-foreground/80">
<span v-if="k.meta.comment" class="truncate">{{ k.meta.comment }}</span>
<span>创建于 {{ formatDate(k.meta.createdAt) }}</span>
<span v-if="k.meta.fileName" class="font-mono truncate">{{ k.meta.fileName }}</span>
</div>
</div>
<div class="shrink-0 flex items-center gap-1">
<Button
variant="ghost"
size="icon"
class="size-7"
:title="copiedId === k.meta.id ? '已复制' : '复制公钥'"
@click="copyPublic(k)"
>
<Check v-if="copiedId === k.meta.id" class="size-3.5 text-emerald-600" />
<ClipboardCopy v-else class="size-3.5" />
</Button>
<Button
variant="ghost"
size="icon"
class="size-7 opacity-0 group-hover:opacity-100 transition-opacity"
title="复制为 authorized_keys 单行格式"
@click="copyForAuthorizedKeys(k)"
>
<ShieldCheck class="size-3.5" />
</Button>
<Button
variant="ghost"
size="icon"
class="size-7 opacity-0 group-hover:opacity-100 transition-opacity"
title="修改 passphrase"
@click="openPassphrase(k)"
>
<Lock class="size-3.5" />
</Button>
<Button
variant="ghost"
size="icon"
class="size-7 opacity-0 group-hover:opacity-100 transition-opacity"
title="重命名"
@click="openRename(k)"
>
<Pencil class="size-3.5" />
</Button>
<Button
variant="ghost"
size="icon"
class="size-7 opacity-0 group-hover:opacity-100 transition-opacity
text-destructive hover:text-destructive"
title="删除"
@click="pendingDelete = k"
>
<Trash2 class="size-3.5" />
</Button>
</div>
</div>
</div>
</CardContent>
</Card>
</div>
</div>
</ScrollArea>
<!-- ===== 生成 ===== -->
<Dialog v-model:open="genOpen">
<DialogContent class="max-w-md">
<DialogContent class="max-w-md max-h-[85vh]">
<DialogHeader>
<DialogTitle>生成 SSH 密钥</DialogTitle>
<DialogDescription class="text-xs">
@@ -537,6 +543,8 @@ function formatDate(rfc3339: string): string {
</DialogDescription>
</DialogHeader>
<!-- 表单较长,用 ScrollArea 滚动(见 HostManager 的编辑对话框同款说明) -->
<ScrollArea class="max-h-[60vh] pr-4">
<div class="space-y-3">
<div class="space-y-1.5">
<Label class="text-xs">名称</Label>
@@ -597,6 +605,7 @@ function formatDate(rfc3339: string): string {
</p>
</div>
</div>
</ScrollArea>
<DialogFooter>
<Button variant="outline" size="sm" @click="genOpen = false">取消</Button>
@@ -610,7 +619,7 @@ function formatDate(rfc3339: string): string {
<!-- ===== 导入 ===== -->
<Dialog v-model:open="importOpen">
<DialogContent class="max-w-lg">
<DialogContent class="max-w-lg max-h-[85vh]">
<DialogHeader>
<DialogTitle>导入 SSH 私钥</DialogTitle>
<DialogDescription class="text-xs">
@@ -619,6 +628,8 @@ function formatDate(rfc3339: string): string {
</DialogDescription>
</DialogHeader>
<!-- 含多行私钥文本域,容易超过视口高度,用 ScrollArea 滚动 -->
<ScrollArea class="max-h-[60vh] pr-4">
<div class="space-y-3">
<div class="space-y-1.5">
<Label class="text-xs">名称</Label>
@@ -659,6 +670,7 @@ function formatDate(rfc3339: string): string {
</p>
</div>
</div>
</ScrollArea>
<DialogFooter>
<Button variant="outline" size="sm" @click="importOpen = false">取消</Button>
@@ -718,7 +730,7 @@ function formatDate(rfc3339: string): string {
<!-- 移除加密是有实际风险的操作,给一次明确提示 -->
<div
v-if="passTarget?.hasPassphrase && !newPass"
class="flex items-start gap-2 p-2 rounded bg-amber-500/10 text-[11px] text-amber-700 dark:text-amber-400"
class="flex items-start gap-2 p-2 rounded bg-warning-soft text-[11px] text-warning-text"
>
<AlertTriangle class="size-3.5 shrink-0 mt-0.5" />
<span>新 passphrase 留空将移除加密,此后该私钥以明文形式存放在磁盘上。</span>
@@ -0,0 +1,226 @@
<script setup lang="ts">
/**
* 已知主机记录的维护入口(主机页工具条右侧的下拉菜单)。
*
* # 为什么这些动作挂在主机页而不是独立分区
*
* 「导入 / 导出 / 清空」都是**低频的维护性动作**,作用于整份 known_hosts 文件,
* 与「某台主机是否可信」这条主线无关(后者已经落到主机行的信任徽标与详情
* popover 上)。它们此前和列表一起占着「凭据」页的一个分区,代价是让
* 「看一眼主机信任状态」变成一个跨 tab 的动作。
*
* 现在收进主机页工具条的下拉里:页面主线是主机,维护动作在旁边待命。
* 这与主机/密钥页既有的「高频外露、低频入菜单」取舍一致。
*
* # 为什么清空要输入确认词
*
* 清空之后所有主机密钥校验都要重新人工核对,而**在核对之前连接不会报错**
* ——用户会以为一切正常。这是「静默降低安全性」的操作,必须让手指慢下来。
*/
import { ref } from 'vue'
import {
ChevronDown,
ClipboardPaste,
Check,
Download,
Loader2,
ShieldCheck,
Trash2
} from '@lucide/vue'
import { toast } from 'vue-sonner'
import { useTerminalStore } from '@/stores/terminalStore'
import { createLogger } from '@/lib/logger'
import { Button } from '@/components/ui/button'
import { Textarea } from '@/components/ui/textarea'
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger
} from '@/components/ui/dropdown-menu'
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle
} from '@/components/ui/dialog'
const logger = createLogger('terminal')
const store = useTerminalStore()
// ===== 导入 / 导出 =====
/** 刚复制过的短暂反馈(按钮文案变成「已导出」,给出「确实生效了」的确认) */
const copied = ref(false)
let copiedTimer: ReturnType<typeof setTimeout> | null = null
async function copyAll() {
try {
const text = await store.exportKnownHosts()
if (!text.trim()) {
toast.info('没有可导出的记录')
return
}
await navigator.clipboard.writeText(text)
copied.value = true
if (copiedTimer) clearTimeout(copiedTimer)
copiedTimer = setTimeout(() => (copied.value = false), 1800)
toast.success('已复制到剪贴板')
} catch (e) {
toast.error(`导出失败:${String(e)}`)
}
}
const importOpen = ref(false)
const importText = ref('')
const importBusy = ref(false)
function openImport() {
importText.value = ''
importOpen.value = true
}
async function submitImport() {
const text = importText.value.trim()
if (!text) {
toast.error('请粘贴 known_hosts 内容')
return
}
importBusy.value = true
try {
const r = await store.importKnownHosts(text)
if (r.ok) {
toast.success(r.message)
importOpen.value = false
} else {
toast.error(r.message)
}
} catch (e) {
logger.error(`导入 known_hosts 失败:${String(e)}`)
toast.error(`导入失败:${String(e)}`)
} finally {
importBusy.value = false
}
}
// ===== 清空 =====
const clearOpen = ref(false)
const clearBusy = ref(false)
const clearConfirmText = ref('')
const CLEAR_KEYWORD = '清空'
async function submitClear() {
if (clearConfirmText.value.trim() !== CLEAR_KEYWORD) return
clearBusy.value = true
try {
await store.clearKnownHosts()
toast.success('已清空全部已知主机')
clearOpen.value = false
clearConfirmText.value = ''
} catch (e) {
toast.error(`清空失败:${String(e)}`)
} finally {
clearBusy.value = false
}
}
</script>
<template>
<DropdownMenu>
<DropdownMenuTrigger as-child>
<Button variant="outline" size="sm" class="gap-1.5">
<ShieldCheck class="size-3.5" />已知主机<ChevronDown class="size-3" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end" class="w-56">
<DropdownMenuItem @click="openImport">
<ClipboardPaste class="size-4" />导入 known_hosts…
</DropdownMenuItem>
<DropdownMenuItem :disabled="store.knownHosts.length === 0" @click="copyAll">
<Check v-if="copied" class="size-4 text-success" />
<Download v-else class="size-4" />
{{ copied ? '已复制到剪贴板' : '导出到剪贴板' }}
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem
class="text-destructive"
:disabled="store.knownHosts.length === 0"
@click="clearOpen = true"
>
<Trash2 class="size-4" />清空全部已知主机
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
<!-- ===== 导入(粘贴 known_hosts 文本) ===== -->
<Dialog v-model:open="importOpen">
<DialogContent class="max-w-lg">
<DialogHeader>
<DialogTitle>导入 known_hosts</DialogTitle>
<DialogDescription class="text-xs">
粘贴 <span class="font-mono">~/.ssh/known_hosts</span> 的内容,或从其它设备导出的记录。
</DialogDescription>
</DialogHeader>
<Textarea
v-model="importText"
placeholder="example.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAA…"
class="font-mono text-xs min-h-[180px] resize-y"
/>
<DialogFooter>
<Button variant="outline" size="sm" @click="importOpen = false">取消</Button>
<Button size="sm" :disabled="importBusy" @click="submitImport">
<Loader2 v-if="importBusy" class="size-3.5 mr-1.5 animate-spin" />
导入
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
<!-- ===== 清空全部(需输入确认词) ===== -->
<Dialog v-model:open="clearOpen">
<DialogContent class="max-w-sm" :show-close-button="false">
<DialogHeader>
<DialogTitle class="text-base text-destructive">清空全部已知主机</DialogTitle>
<DialogDescription class="text-xs">
将删除全部 {{ store.knownHosts.length }} 条记录。
</DialogDescription>
</DialogHeader>
<div class="rounded-md border border-destructive/40 bg-destructive/5 p-2.5">
<p class="text-[11px] text-destructive font-medium mb-1">这会降低连接安全性</p>
<p class="text-[11px] text-muted-foreground">
清空后,所有主机的密钥校验都需要重新人工核对。在核对前,
连接可能被中间人攻击劫持而您不会收到提示。
</p>
</div>
<div class="space-y-1.5">
<p class="text-xs text-muted-foreground">
请输入 <span class="font-mono font-semibold text-foreground">{{ CLEAR_KEYWORD }}</span> 以确认
</p>
<input
v-model="clearConfirmText"
class="w-full h-8 px-2.5 rounded-md border border-border bg-transparent
text-sm outline-none focus:border-destructive/60"
/>
</div>
<DialogFooter>
<Button variant="outline" size="sm" @click="clearOpen = false">取消</Button>
<Button
variant="destructive"
size="sm"
:disabled="clearBusy || clearConfirmText.trim() !== CLEAR_KEYWORD"
@click="submitClear"
>
<Loader2 v-if="clearBusy" class="size-3.5 mr-1.5 animate-spin" />
清空全部
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
</template>
@@ -1,453 +0,0 @@
<script setup lang="ts">
/**
* known_hosts 管理。
*
* # 设计立场
*
* 这个面板的存在理由只有一个:**让「忘记某台主机」这件事变得容易**。
*
* 主机密钥校验是 SSH 抵御中间人的核心机制,但它的最大敌人不是攻击者,
* 而是用户自己被卡住时的挫败感 ——「指纹变了,连不上,怎么办?」。
* 如果这时唯一的出路是去翻文档、找 known_hosts 文件、手工删行,
* 用户就会转向「关闭校验」这种彻底破坏安全性的做法。
*
* 所以这里提供两条路:
* - 单条遗忘(服务器重装后重新握手)——正常流程。
* - 全部清空(最后手段,带明确警告)。
*
* # 指纹变更历史为什么单独展示
*
* 一条**已接受**的变更(服务器重装、管理员换密钥)和一条**刚发生**的变更,
* 对用户的意义完全不同。只显示「最新指纹」会丢掉这个上下文,
* 让用户误以为「这台机器一直没问题」——而实际上它已经换过密钥。
*/
import { computed, ref } from 'vue'
import {
AlertTriangle,
Check,
ClipboardPaste,
Download,
History,
Loader2,
Server,
ShieldCheck,
Trash2
} from '@lucide/vue'
import { toast } from 'vue-sonner'
import { useTerminalStore } from '@/stores/terminalStore'
import { Button } from '@/components/ui/button'
import { Textarea } from '@/components/ui/textarea'
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle
} from '@/components/ui/dialog'
import { createLogger } from '@/lib/logger'
import type { KnownHost } from '@/types/terminal'
const logger = createLogger('terminal')
const store = useTerminalStore()
const search = ref('')
const filtered = computed(() => {
const q = search.value.trim().toLowerCase()
if (!q) return store.knownHosts
return store.knownHosts.filter(
h =>
h.host.toLowerCase().includes(q) ||
h.fingerprint.toLowerCase().includes(q) ||
h.keyType.toLowerCase().includes(q)
)
})
/** 曾发生过指纹变更的主机数量(用于顶部的风险提示) */
const changedCount = computed(() => store.knownHosts.filter(h => h.history.length > 0).length)
/** 展开查看变更历史的主机 key */
const expanded = ref<string | null>(null)
function hostKey(h: KnownHost): string {
return `${h.host}:${h.port}/${h.keyType}`
}
function toggleExpand(h: KnownHost) {
const k = hostKey(h)
expanded.value = expanded.value === k ? null : k
}
// ===== 单条遗忘 =====
const pendingForget = ref<KnownHost | null>(null)
const forgetBusy = ref(false)
async function submitForget() {
const h = pendingForget.value
if (!h) return
forgetBusy.value = true
try {
await store.forgetHost(h.host, h.port, h.keyType)
toast.success(`已忘记 ${h.host}:${h.port}`)
pendingForget.value = null
} catch (e) {
toast.error(`操作失败:${String(e)}`)
} finally {
forgetBusy.value = false
}
}
// ===== 全部清空 =====
const clearOpen = ref(false)
const clearBusy = ref(false)
/** 清空是破坏性操作:要求用户输入确认词,避免误点 */
const clearConfirmText = ref('')
const CLEAR_KEYWORD = '清空'
async function submitClear() {
if (clearConfirmText.value.trim() !== CLEAR_KEYWORD) return
clearBusy.value = true
try {
await store.clearKnownHosts()
toast.success('已清空全部已知主机')
clearOpen.value = false
clearConfirmText.value = ''
} catch (e) {
toast.error(`清空失败:${String(e)}`)
} finally {
clearBusy.value = false
}
}
// ===== 导入 / 导出 =====
const copied = ref(false)
let copiedTimer: ReturnType<typeof setTimeout> | null = null
async function copyAll() {
try {
const text = await store.exportKnownHosts()
if (!text.trim()) {
toast.info('没有可导出的记录')
return
}
await navigator.clipboard.writeText(text)
copied.value = true
if (copiedTimer) clearTimeout(copiedTimer)
copiedTimer = setTimeout(() => (copied.value = false), 1800)
toast.success('已复制到剪贴板')
} catch (e) {
toast.error(`导出失败:${String(e)}`)
}
}
const importOpen = ref(false)
const importText = ref('')
const importBusy = ref(false)
function openImport() {
importText.value = ''
importOpen.value = true
}
async function submitImport() {
const text = importText.value.trim()
if (!text) {
toast.error('请粘贴 known_hosts 内容')
return
}
importBusy.value = true
try {
const r = await store.importKnownHosts(text)
if (r.ok) {
toast.success(r.message)
importOpen.value = false
} else {
toast.error(r.message)
}
} catch (e) {
logger.error(`导入 known_hosts 失败:${String(e)}`)
toast.error(`导入失败:${String(e)}`)
} finally {
importBusy.value = false
}
}
// ===== 展示辅助 =====
function formatDate(rfc3339: string): string {
if (!rfc3339) return '—'
const d = new Date(rfc3339)
if (Number.isNaN(d.getTime())) return rfc3339
return d.toLocaleString('zh-CN', {
year: 'numeric',
month: '2-digit',
day: '2-digit',
hour: '2-digit',
minute: '2-digit'
})
}
function keyTypeLabel(t: string): string {
const map: Record<string, string> = {
'ssh-ed25519': 'Ed25519',
'ssh-rsa': 'RSA',
'ecdsa-sha2-nistp256': 'ECDSA 256',
'ecdsa-sha2-nistp384': 'ECDSA 384',
'ecdsa-sha2-nistp521': 'ECDSA 521',
'ssh-dss': 'DSA'
}
return map[t] ?? t
}
</script>
<template>
<div class="flex flex-col h-full">
<!-- 头部 -->
<div class="shrink-0 flex items-center gap-2 px-4 h-12 border-b border-border">
<ShieldCheck class="size-4 text-muted-foreground" />
<h3 class="text-sm font-medium">已知主机</h3>
<span class="text-xs text-muted-foreground">({{ store.knownHosts.length }})</span>
<div class="flex-1" />
<Button variant="outline" size="sm" class="h-7 gap-1.5 text-xs" @click="openImport">
<ClipboardPaste class="size-3.5" />导入
</Button>
<Button variant="outline" size="sm" class="h-7 gap-1.5 text-xs" @click="copyAll">
<Check v-if="copied" class="size-3.5 text-emerald-600" />
<Download v-else class="size-3.5" />
导出
</Button>
<Button
variant="outline"
size="sm"
class="h-7 gap-1.5 text-xs text-destructive hover:text-destructive"
:disabled="store.knownHosts.length === 0"
@click="clearOpen = true"
>
<Trash2 class="size-3.5" />清空
</Button>
</div>
<!-- 风险提示:有变更历史时始终可见 -->
<div
v-if="changedCount > 0"
class="shrink-0 mx-3 mt-3 flex items-start gap-2 p-2.5 rounded-md
border border-amber-500/40 bg-amber-500/10"
>
<AlertTriangle class="size-3.5 shrink-0 mt-0.5 text-amber-600 dark:text-amber-400" />
<div class="text-[11px] text-amber-700 dark:text-amber-400">
<p class="font-medium">{{ changedCount }} 台主机曾发生指纹变更</p>
<p class="mt-0.5 opacity-90">
若不是您本人重装或更换了服务器密钥,请联系管理员核实。
</p>
</div>
</div>
<!-- 搜索 -->
<div v-if="store.knownHosts.length > 0" class="shrink-0 px-3 pt-3">
<input
v-model="search"
placeholder="搜索主机、指纹或类型…"
class="w-full h-7 px-2.5 rounded-md border border-border bg-transparent
text-xs outline-none focus:border-primary/50 placeholder:text-muted-foreground"
/>
</div>
<!-- 列表 -->
<div class="flex-1 min-h-0 overflow-y-auto p-3">
<div v-if="store.knownHosts.length === 0" class="py-16 text-center">
<ShieldCheck class="size-8 mx-auto text-muted-foreground/30 mb-3" />
<p class="text-sm text-muted-foreground mb-1">还没有已知主机记录</p>
<p class="text-xs text-muted-foreground/70">
首次连接某台 SSH 主机时,会请您核对并保存其密钥指纹
</p>
</div>
<div v-else-if="filtered.length === 0" class="py-12 text-center">
<p class="text-sm text-muted-foreground">没有匹配「{{ search }}」的记录</p>
</div>
<div v-else class="space-y-1.5">
<div
v-for="h in filtered"
:key="hostKey(h)"
class="group rounded-md border border-border overflow-hidden
hover:border-primary/40 transition-colors"
:class="h.history.length > 0 ? 'border-amber-500/40' : ''"
>
<div class="flex items-start gap-3 px-3 py-2.5">
<Server class="size-4 shrink-0 mt-0.5 text-muted-foreground" />
<div class="min-w-0 flex-1">
<div class="flex items-center gap-2 flex-wrap">
<span class="text-sm font-medium font-mono truncate">
{{ h.host }}<span v-if="h.port !== 22" class="text-muted-foreground">:{{ h.port }}</span>
</span>
<span class="text-[10px] px-1.5 py-0.5 rounded bg-muted shrink-0">
{{ keyTypeLabel(h.keyType) }}
</span>
<button
v-if="h.history.length > 0"
class="text-[10px] px-1.5 py-0.5 rounded bg-amber-500/15 text-amber-700
dark:text-amber-400 shrink-0 inline-flex items-center gap-0.5
hover:bg-amber-500/25 transition-colors"
@click="toggleExpand(h)"
>
<History class="size-2.5" />
变更过 {{ h.history.length }} 次
</button>
</div>
<div
class="mt-1 text-xs font-mono text-muted-foreground truncate"
:title="h.fingerprint"
>
{{ h.fingerprint }}
</div>
<div class="mt-1 flex items-center gap-3 text-[11px] text-muted-foreground/80">
<span>首次 {{ formatDate(h.firstSeen) }}</span>
<span>最近确认 {{ formatDate(h.lastConfirmed) }}</span>
</div>
</div>
<Button
variant="ghost"
size="icon"
class="size-7 shrink-0 opacity-0 group-hover:opacity-100 transition-opacity
text-destructive hover:text-destructive"
title="忘记该主机"
@click="pendingForget = h"
>
<Trash2 class="size-3.5" />
</Button>
</div>
<!-- 变更历史 -->
<div
v-if="expanded === hostKey(h)"
class="border-t border-border bg-muted/30 px-3 py-2 space-y-1.5"
>
<p class="text-[10px] uppercase tracking-wide text-muted-foreground">指纹变更历史</p>
<div
v-for="(c, i) in h.history"
:key="i"
class="flex items-start gap-2 text-[11px]"
>
<span
class="shrink-0 mt-0.5 size-1.5 rounded-full"
:class="c.accepted ? 'bg-amber-500' : 'bg-muted-foreground/40'"
/>
<div class="min-w-0">
<span class="text-muted-foreground">{{ formatDate(c.changedAt) }}</span>
<span class="mx-1.5">·</span>
<span :class="c.accepted ? 'text-amber-700 dark:text-amber-400' : 'text-muted-foreground'">
{{ c.accepted ? '已接受变更' : '已拒绝变更' }}
</span>
<div class="font-mono text-muted-foreground/70 truncate" :title="c.oldFingerprint">
原指纹 {{ c.oldFingerprint }}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- ===== 忘记单条 ===== -->
<Dialog :open="pendingForget !== null" @update:open="v => !v && (pendingForget = null)">
<DialogContent class="max-w-sm" :show-close-button="false">
<DialogHeader>
<DialogTitle class="text-base">忘记该主机</DialogTitle>
<DialogDescription class="text-xs">
将删除 <span class="font-mono">{{ pendingForget?.host }}:{{ pendingForget?.port }}</span>
的密钥指纹记录。下次连接时将重新提示核对。
</DialogDescription>
</DialogHeader>
<div class="flex items-start gap-2 p-2 rounded bg-muted text-[11px] text-muted-foreground">
<AlertTriangle class="size-3.5 shrink-0 mt-0.5" />
<span>仅在确认该主机密钥确实已更换时执行。若出于「连不上就删掉」的动机,请先核实原因。</span>
</div>
<DialogFooter>
<Button variant="outline" size="sm" @click="pendingForget = null">取消</Button>
<Button variant="destructive" size="sm" :disabled="forgetBusy" @click="submitForget">
忘记
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
<!-- ===== 清空全部 ===== -->
<Dialog v-model:open="clearOpen">
<DialogContent class="max-w-sm" :show-close-button="false">
<DialogHeader>
<DialogTitle class="text-base text-destructive">清空全部已知主机</DialogTitle>
<DialogDescription class="text-xs">
将删除全部 {{ store.knownHosts.length }} 条记录。
</DialogDescription>
</DialogHeader>
<div class="rounded-md border border-destructive/40 bg-destructive/5 p-2.5">
<p class="text-[11px] text-destructive font-medium flex items-center gap-1 mb-1">
<AlertTriangle class="size-3" />这会降低连接安全性
</p>
<p class="text-[11px] text-muted-foreground">
清空后,所有主机的密钥校验都需要重新人工核对。在核对前,
连接可能被中间人攻击劫持而您不会收到提示。
</p>
</div>
<div class="space-y-1.5">
<p class="text-xs text-muted-foreground">
请输入 <span class="font-mono font-semibold text-foreground">{{ CLEAR_KEYWORD }}</span> 以确认
</p>
<input
v-model="clearConfirmText"
class="w-full h-8 px-2.5 rounded-md border border-border bg-transparent
text-sm outline-none focus:border-destructive/60"
/>
</div>
<DialogFooter>
<Button variant="outline" size="sm" @click="clearOpen = false">取消</Button>
<Button
variant="destructive"
size="sm"
:disabled="clearBusy || clearConfirmText.trim() !== CLEAR_KEYWORD"
@click="submitClear"
>
<Loader2 v-if="clearBusy" class="size-3.5 mr-1.5 animate-spin" />
清空全部
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
<!-- ===== 导入 ===== -->
<Dialog v-model:open="importOpen">
<DialogContent class="max-w-lg">
<DialogHeader>
<DialogTitle>导入 known_hosts</DialogTitle>
<DialogDescription class="text-xs">
粘贴 <span class="font-mono">~/.ssh/known_hosts</span> 的内容,或从其它设备导出的记录。
</DialogDescription>
</DialogHeader>
<Textarea
v-model="importText"
placeholder="example.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAA…"
class="font-mono text-xs min-h-[180px] resize-y"
/>
<DialogFooter>
<Button variant="outline" size="sm" @click="importOpen = false">取消</Button>
<Button size="sm" :disabled="importBusy" @click="submitImport">
<Loader2 v-if="importBusy" class="size-3.5 mr-1.5 animate-spin" />
导入
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
</div>
</template>
@@ -0,0 +1,99 @@
<script setup lang="ts">
/**
* 孤儿 known_hosts 记录(主机页列表末尾的区块)。
*
* # 什么是孤儿
*
* 记有指纹、但主机配置列表里找不到对应「地址 + 端口」的记录。典型来源:
* - 用户直接 `ssh user@addr` 连过一次,从未在终端里保存过这台主机;
* - 主机配置被删除,而指纹记录留在 known_hosts 里。
*
* # 为什么必须单独显示,而不是只统计个数
*
* 这些记录**照样会拦住连接**:指纹变了会弹主机密钥确认框,用户被卡住时
* 需要找到「是哪条记录在挡路」才能删掉它。若因为「没有对应主机」就把它们
* 藏起来,用户会陷入「报错说指纹变了,但列表里找不到这台主机」的死角 ——
* 而这恰好是 known_hosts 管理界面存在的头号理由(见模块早期设计说明)。
*
* 因此这里不做任何匹配推断(例如「同 IP 不同端口算同一台」),
* 只按字面地址判定,宁可多列出一条,也不让一条记录失去入口。
*/
import { computed } from 'vue'
import { AlertTriangle, History, Server, Trash2 } from '@lucide/vue'
import { useTerminalStore } from '@/stores/terminalStore'
import { Button } from '@/components/ui/button'
import { Card, CardContent } from '@/components/ui/card'
import { StatusBadge } from '@/components/common'
import {
addressLabel,
formatDateTime,
keyTypeLabel,
orphanRecords,
recordKey
} from './hostTrust'
import type { KnownHost } from '@/types/terminal'
const emit = defineEmits<{ (e: 'forget', record: KnownHost): void }>()
const store = useTerminalStore()
/** 未被任何主机配置引用的记录 */
const orphans = computed(() => orphanRecords(store.knownHosts, store.hosts))
</script>
<template>
<Card v-if="orphans.length > 0" class="mt-3 border-warning/40">
<CardContent class="space-y-2">
<div class="flex items-start gap-2">
<AlertTriangle class="size-3.5 shrink-0 mt-0.5 text-warning" />
<div class="min-w-0 flex-1">
<p class="text-xs font-medium">未被任何主机引用的记录({{ orphans.length }})</p>
<p class="mt-0.5 text-[11px] text-muted-foreground leading-relaxed">
这些指纹来自「连过但没有保存为配置」或「配置已删除」的主机。
它们同样会参与连接时的密钥校验,指纹变更时也会拦截连接。
</p>
</div>
</div>
<div class="divide-y divide-divider">
<div
v-for="r in orphans"
:key="recordKey(r)"
class="group flex items-center gap-2 py-2"
>
<Server class="size-3.5 shrink-0 text-muted-foreground/60" />
<div class="min-w-0 flex-1">
<div class="flex items-center gap-2 flex-wrap">
<span class="text-xs font-mono truncate">
{{ addressLabel(r.host, r.port) }}
</span>
<span class="shrink-0 text-[11px] text-muted-foreground">
{{ keyTypeLabel(r.keyType) }}
</span>
<StatusBadge v-if="r.history.length > 0" variant="warning" size="sm">
<History class="size-2.5" />变更 {{ r.history.length }} 次
</StatusBadge>
</div>
<div class="mt-0.5 flex items-center gap-3 text-[10px] text-muted-foreground/80">
<span class="font-mono truncate max-w-[220px]" :title="r.fingerprint">
{{ r.fingerprint }}
</span>
<span class="shrink-0">最近确认 {{ formatDateTime(r.lastConfirmed) }}</span>
</div>
</div>
<Button
variant="ghost"
size="icon-sm"
class="shrink-0 text-muted-foreground hover:text-destructive"
title="忘记该主机"
@click="emit('forget', r)"
>
<Trash2 class="size-3.5" />
</Button>
</div>
</div>
</CardContent>
</Card>
</template>
+13 -7
View File
@@ -462,9 +462,15 @@ onBeforeUnmount(() => {
<template>
<div class="flex flex-col h-full min-h-0 bg-background">
<!-- ===== 头部 ===== -->
<div class="shrink-0 flex items-center gap-2 px-2.5 h-9 border-b border-border">
<HardDrive class="size-3.5 text-muted-foreground shrink-0" />
<!--
===== 头部 =====
高度与终端页上下两条栏(控制栏 / 状态栏,均 h-9)保持一致:本面板落在
终端卡片内部,头部与它们同属一块屏幕的横向分隔线,等高才不显得突兀
(2026-09-21 控制栏从 h-11 收进卡片并降到 h-9 后同步调整;
更早的约定是「与卡片外的工具条行 h-11 连成一条线」,那层已不存在)。
-->
<div class="shrink-0 flex items-center gap-2 px-3 h-9 border-b border-border">
<HardDrive class="size-4 text-muted-foreground shrink-0" />
<span class="text-xs font-medium truncate" :title="sessionLabel">{{ sessionLabel }}</span>
<span class="text-[10px] text-muted-foreground font-mono truncate">
{{ remoteCwd || '—' }}
@@ -473,14 +479,14 @@ onBeforeUnmount(() => {
<Button
variant="ghost"
size="sm"
class="h-6 px-1.5 text-[11px]"
class="h-7 px-1.5 text-[11px]"
:disabled="!terminalCwd"
title="定位到终端当前目录"
@click="followTerminalCwd"
>
跟随终端
</Button>
<Button variant="ghost" size="sm" class="h-6 w-6 p-0" title="关闭面板" @click="emit('close')">
<Button variant="ghost" size="sm" class="h-7 w-7 p-0" title="关闭面板" @click="emit('close')">
<X class="size-3.5" />
</Button>
</div>
@@ -701,7 +707,7 @@ onBeforeUnmount(() => {
<component
:is="entryIcon(e)"
class="size-3 shrink-0"
:class="e.kind === 'dir' ? 'text-amber-500' : 'text-muted-foreground'"
:class="e.kind === 'dir' ? 'text-warning' : 'text-muted-foreground'"
/>
<template v-if="renaming && selectedRemote?.path === e.path">
<input
@@ -794,7 +800,7 @@ onBeforeUnmount(() => {
<template v-if="t.state === 'running'">
{{ t.total > 0 ? `${humanSize(t.transferred)} / ${humanSize(t.total)}` : humanSize(t.transferred) }}
</template>
<span v-else-if="t.state === 'done'" class="text-emerald-600">完成</span>
<span v-else-if="t.state === 'done'" class="text-success">完成</span>
<span v-else-if="t.state === 'failed'" class="text-destructive" :title="t.error ?? ''">失败</span>
<span v-else>{{ t.state }}</span>
</span>
@@ -0,0 +1,195 @@
<script setup lang="ts">
/**
* 命令片段的编辑对话框(新建 / 编辑共用)。
*
* # 为什么从列表里拆出来
*
* 片段的编辑表单有七个字段(名称、命令、说明、分组、适用 shell、三个开关),
* 外加一段「危险命令」的说明块。它此前是片段页右栏的常态视图,占了半屏;
* 现在片段列表搬进控制栏的 popover(宽 400px),表单再内联进去就没法用了。
* 拆成对话框后,popover 保持「列表 + 取用」的单一职责,表单按需弹出。
*
* # 校验放在提交时而不是输入时
*
* 与项目里其它表单一致:失焦/输入时就报红会在用户还没填完时不断报错。
* 这里只拦两件真正会导致保存失败的事(名称为空、命令为空),
* 其余交给后端(`save_snippet`)。
*/
import { ref, watch } from 'vue'
import { ShieldAlert } from '@lucide/vue'
import { toast } from 'vue-sonner'
import { useTerminalStore } from '@/stores/terminalStore'
import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input'
import { Textarea } from '@/components/ui/textarea'
import { Checkbox } from '@/components/ui/checkbox'
import { ScrollArea } from '@/components/ui/scroll-area'
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle
} from '@/components/ui/dialog'
import type { CommandSnippet } from '@/types/terminal'
const props = defineProps<{
open: boolean
/** 待编辑的片段(null = 新建) */
snippet: CommandSnippet | null
}>()
const emit = defineEmits<{
(e: 'update:open', v: boolean): void
/** 保存成功,把名称交回去供列表定位到该条 */
(e: 'saved', name: string): void
}>()
const store = useTerminalStore()
const draft = ref<CommandSnippet | null>(null)
const saving = ref(false)
function blank(): CommandSnippet {
return {
id: '',
name: '',
command: '',
description: '',
group: '',
defaults: {},
shellKinds: [],
sshOnly: false,
confirm: false,
pinned: false,
createdAt: 0
}
}
/**
* 打开时才准备草稿:对话框关闭期间不保留半填的表单,
* 每次打开要么是「编辑某条」(从入参深拷贝,改动不污染列表)要么是空白新建。
*/
watch(
() => [props.open, props.snippet] as const,
([open]) => {
if (!open) return
draft.value = props.snippet
? { ...props.snippet, defaults: { ...props.snippet.defaults }, shellKinds: [...props.snippet.shellKinds] }
: blank()
},
{ immediate: true }
)
async function submit() {
const d = draft.value
if (!d) return
if (!d.name.trim()) {
toast.error('名称不能为空')
return
}
if (!d.command.trim()) {
toast.error('命令内容不能为空')
return
}
saving.value = true
try {
await store.saveSnippet({ ...d, name: d.name.trim() })
toast.success('已保存')
emit('saved', d.name.trim())
emit('update:open', false)
} catch (e) {
toast.error(`保存失败:${String(e)}`)
} finally {
saving.value = false
}
}
</script>
<template>
<Dialog :open="open" @update:open="v => emit('update:open', v)">
<DialogContent class="max-w-lg max-h-[85vh]">
<DialogHeader>
<DialogTitle>{{ snippet?.id ? '编辑片段' : '新建片段' }}</DialogTitle>
<DialogDescription class="text-xs">
命令里的 <span class="font-mono">${name}</span> 是占位符,取用时逐个填写;
需要字面量时写 <span class="font-mono">$${name}</span>。
</DialogDescription>
</DialogHeader>
<!-- 表单较长(七个字段 + 危险提示),用 ScrollArea 滚动(见 HostManager 同款说明) -->
<ScrollArea class="max-h-[60vh] pr-4">
<div v-if="draft" class="space-y-3">
<label class="block space-y-1">
<span class="text-[11px] text-muted-foreground">名称</span>
<Input v-model="draft.name" class="h-8 text-sm" placeholder="如:查找大文件" />
</label>
<label class="block space-y-1">
<span class="text-[11px] text-muted-foreground">命令</span>
<Textarea
v-model="draft.command"
class="min-h-16 text-xs font-mono"
placeholder="find ${dir} -type f -size +${size}"
/>
</label>
<label class="block space-y-1">
<span class="text-[11px] text-muted-foreground">说明(讲清做什么、有什么前提)</span>
<Input v-model="draft.description" class="h-8 text-sm" />
</label>
<div class="grid grid-cols-2 gap-3">
<label class="block space-y-1">
<span class="text-[11px] text-muted-foreground">分组</span>
<Input v-model="draft.group" class="h-8 text-sm" placeholder="如:文件 / 运维" />
</label>
<label class="block space-y-1">
<span class="text-[11px] text-muted-foreground">适用 shell(逗号分隔,留空为全部)</span>
<Input
:model-value="draft.shellKinds.join(',')"
class="h-8 text-sm"
placeholder="powershell,bash"
@update:model-value="
v => draft && (draft.shellKinds = String(v).split(',').map(x => x.trim()).filter(Boolean))
"
/>
</label>
</div>
<div class="flex flex-wrap items-center gap-4 text-[11px]">
<label class="flex items-center gap-1.5 cursor-pointer select-none">
<Checkbox v-model="draft.sshOnly" />
仅 SSH 会话可用
</label>
<label class="flex items-center gap-1.5 cursor-pointer select-none">
<Checkbox v-model="draft.confirm" />
执行前需确认(危险命令)
</label>
<label class="flex items-center gap-1.5 cursor-pointer select-none">
<Checkbox v-model="draft.pinned" />
置顶
</label>
</div>
<div
v-if="draft.confirm"
class="flex items-start gap-2 p-2 rounded border border-destructive/40 bg-destructive/5"
>
<ShieldAlert class="size-3.5 text-destructive shrink-0 mt-0.5" />
<p class="text-[11px] text-muted-foreground leading-relaxed">
标记为「需确认」的片段默认只会**填入命令行**,不会自动执行 ——
用户需要自己按回车。这避免了参数误填时立刻造成破坏。
</p>
</div>
</div>
</ScrollArea>
<DialogFooter>
<Button variant="outline" size="sm" @click="emit('update:open', false)">取消</Button>
<Button size="sm" :disabled="saving" @click="submit">保存</Button>
</DialogFooter>
</DialogContent>
</Dialog>
</template>
@@ -1,573 +0,0 @@
<script setup lang="ts">
/**
* 命令片段面板(浮层)。
*
* # 交互模型:先填参数、再决定是否执行
*
* 带占位符的片段走「填写 → 预览 → 执行」三步。预览这一步不是装饰:
* 用户能在这里看到**渲染后的真实命令**,而执行按钮分两个——
* 「填入命令行」(不回车)与「直接执行」。危险片段(`confirm` 为 true)
* 默认只做前者:让用户自己按回车,与命令被自动执行在心理上完全不同。
*
* # 为什么占位符列表来自后端
*
* 解析规则(`$${x}` 转义、`${VAR:-default}` 排除、名称字符集)由 Rust 的
* `snippet_placeholders` 单独实现一份。前端若自己写正则,两边在边界情况上
* 迟早分叉 —— 而「预览显示的命令」与「实际执行的命令」不一致是最坏的结果。
*/
import { computed, ref } from 'vue'
import { open as openDialog } from '@tauri-apps/plugin-dialog'
import {
BookMarked,
Play,
Pin,
Plus,
RotateCcw,
Search,
ShieldAlert,
Terminal,
Trash2,
X
} from '@lucide/vue'
import { toast } from 'vue-sonner'
import { useTerminalStore } from '@/stores/terminalStore'
import { createLogger } from '@/lib/logger'
import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input'
import type { CommandSnippet, SessionInfo, SnippetView } from '@/types/terminal'
const props = defineProps<{
sessionId: string | null
session: SessionInfo | undefined
}>()
const emit = defineEmits<{
(e: 'close'): void
}>()
const logger = createLogger('terminal')
const store = useTerminalStore()
const filter = ref('')
const selected = ref<SnippetView | null>(null)
/** 会话是 SSH 还是本地(决定哪些片段可见) */
const sessionKind = computed<'local' | 'ssh'>(() => props.session?.kind ?? 'local')
/** 本地会话对应的 shell kind(用于 `shellKinds` 过滤) */
const shellKind = computed(() => store.shellOf(props.session)?.kind)
/** 当前会话可用的片段 */
const available = computed(() => store.snippetsForSession(sessionKind.value, shellKind.value))
const filtered = computed(() => {
const kw = filter.value.trim().toLowerCase()
if (!kw) return available.value
return available.value.filter(
s =>
s.name.toLowerCase().includes(kw) ||
s.command.toLowerCase().includes(kw) ||
s.description.toLowerCase().includes(kw)
)
})
/** 按分组归类(保持 store 的排序:置顶优先 + 名称序) */
const grouped = computed(() => {
const map = new Map<string, SnippetView[]>()
for (const s of filtered.value) {
const g = s.group.trim() || '未分组'
if (!map.has(g)) map.set(g, [])
map.get(g)!.push(s)
}
return [...map.entries()]
})
// ===== 参数填写 =====
/** 占位符名 → 当前填写值 */
const values = ref<Record<string, string>>({})
/** 渲染后的命令(每次 preview 后更新) */
const preview = ref('')
const rendering = ref(false)
function select(s: SnippetView) {
selected.value = s
preview.value = ''
// 预填默认值:大多数情况下用户只需要改其中一两个
const v: Record<string, string> = {}
for (const k of s.placeholders) v[k] = s.defaults[k] ?? ''
values.value = v
}
const missing = computed(() => {
const s = selected.value
if (!s) return []
return s.placeholders.filter(k => !(values.value[k] ?? '').trim())
})
async function doRender() {
const s = selected.value
if (!s) return
if (missing.value.length > 0) {
toast.error(`还有 ${missing.value.length} 个占位符未填写`)
return
}
rendering.value = true
try {
preview.value = await store.renderSnippet(s.id, values.value)
} catch (e) {
toast.error(String(e))
preview.value = ''
} finally {
rendering.value = false
}
}
/**
* 执行片段。
*
* `submit = true` 直接回车执行;否则只写到命令行上。
* 危险片段(`confirm`)在界面上不提供「直接执行」按钮,
* 但这里仍做一层兜底——见下面对 `mustConfirm` 的判断。
*/
async function run(submit: boolean) {
const s = selected.value
if (!s || !props.sessionId) {
toast.info('请先打开一个会话')
return
}
if (missing.value.length > 0) {
toast.error('请先填写全部占位符')
return
}
// 先确保预览与实际一致:渲染在命令层统一做,前端不自己拼
try {
const rendered = await store.renderSnippet(s.id, values.value)
preview.value = rendered
} catch (e) {
toast.error(String(e))
return
}
try {
const r = await store.runSnippet(props.sessionId, s.id, values.value, submit)
if (submit) toast.success(r.message)
else toast.info(r.message)
} catch (e) {
toast.error(`执行失败:${String(e)}`)
}
}
/** 危险片段强制执行一次确认(界面已限制,这是兜底) */
function confirmThenRun() {
const s = selected.value
if (!s) return
if (s.confirm && !window.confirm(`「${s.name}」被标记为需要确认的命令,确定执行?`)) return
void run(true)
}
// ===== 编辑 =====
const editing = ref(false)
const draft = ref<CommandSnippet | null>(null)
function newSnippet() {
draft.value = {
id: '',
name: '',
command: '',
description: '',
group: '',
defaults: {},
shellKinds: [],
sshOnly: false,
confirm: false,
pinned: false,
createdAt: 0
}
editing.value = true
}
function editSelected() {
const s = selected.value
if (!s) return
// 去掉后端附加的 placeholders 字段 —— 它不是 CommandSnippet 的一部分,
// 带着它回传会在 save 时触发未知字段告警(serde 默认忽略,但没必要)
const { placeholders: _p, ...rest } = s
draft.value = { ...rest }
editing.value = true
}
async function submitDraft() {
const d = draft.value
if (!d) return
if (!d.name.trim()) {
toast.error('名称不能为空')
return
}
if (!d.command.trim()) {
toast.error('命令内容不能为空')
return
}
try {
await store.saveSnippet(d)
editing.value = false
toast.success('已保存')
// 保存后刷新选中项(占位符可能变了)
const fresh = store.snippets.find(s => s.id === (d.id || store.snippets[store.snippets.length - 1]?.id))
if (fresh) select(fresh)
} catch (e) {
toast.error(`保存失败:${String(e)}`)
}
}
async function removeSelected() {
const s = selected.value
if (!s) return
if (!window.confirm(`确定删除片段「${s.name}」?`)) return
try {
await store.deleteSnippet(s.id)
selected.value = null
toast.success('已删除')
} catch (e) {
toast.error(`删除失败:${String(e)}`)
}
}
async function togglePin() {
const s = selected.value
if (!s) return
try {
const { placeholders: _p, ...rest } = s
await store.saveSnippet({ ...rest, pinned: !s.pinned })
const fresh = store.snippets.find(x => x.id === s.id)
if (fresh) select(fresh)
} catch (e) {
toast.error(`操作失败:${String(e)}`)
}
}
async function restoreDefaults() {
if (!window.confirm('将补回缺失的内置片段(不会覆盖你已有的条目),继续?')) return
try {
await store.restoreDefaultSnippets()
toast.success('已恢复内置片段')
} catch (e) {
toast.error(`恢复失败:${String(e)}`)
}
}
/** 从本地文件导入命令文本(省去逐字敲长命令) */
async function importFromFile() {
try {
const picked = await openDialog({
multiple: false,
directory: false,
filters: [{ name: '文本/脚本', extensions: ['txt', 'sh', 'bash', 'zsh', 'ps1', 'cmd', 'bat'] }]
})
if (typeof picked !== 'string') return
// 前端不直接读文件(CSP 下 WebView 读本地文件受限),
// 让用户把内容粘进来 —— 这个流程在 P2 会改为走后端读文件。
draft.value = {
id: '',
name: picked.replace(/\\/g, '/').split('/').pop() ?? '导入的片段',
command: '',
description: `待粘贴内容(来源:${picked})`,
group: '导入',
defaults: {},
shellKinds: [],
sshOnly: false,
confirm: true,
pinned: false,
createdAt: 0
}
editing.value = true
toast.info('请把命令内容粘贴到「命令」框中')
void logger
} catch (e) {
toast.error(`导入失败:${String(e)}`)
}
}
</script>
<template>
<!-- 作为模块 Tab 内容渲染(根不再是全屏浮层) -->
<div class="flex flex-col h-full">
<!-- ===== 头部 ===== -->
<div class="shrink-0 flex items-center gap-2 px-3 h-9 border-b border-border">
<Button variant="ghost" size="sm" class="h-7 text-xs" @click="emit('close')">返回终端</Button>
<div class="w-px h-4 bg-border" />
<BookMarked class="size-3.5 text-muted-foreground" />
<span class="text-xs font-medium">命令片段</span>
<span class="text-[10px] text-muted-foreground">
{{ session ? `作用于 ${store.sessionLabel(session)}` : '未选择会话' }}
</span>
<div class="flex-1" />
<Button variant="outline" size="sm" class="h-7 text-xs gap-1.5" @click="importFromFile">
从文件导入
</Button>
<Button variant="outline" size="sm" class="h-7 text-xs gap-1.5" @click="restoreDefaults">
<RotateCcw class="size-3" />恢复内置
</Button>
<Button size="sm" class="h-7 text-xs gap-1.5" @click="newSnippet">
<Plus class="size-3" />新建片段
</Button>
</div>
<div class="flex-1 min-h-0 flex">
<!-- ===== 左:列表 ===== -->
<section class="w-[300px] shrink-0 border-r border-border flex flex-col">
<div class="shrink-0 p-2 border-b border-border">
<div class="relative">
<Search class="absolute left-2 top-1/2 -translate-y-1/2 size-3 text-muted-foreground" />
<Input v-model="filter" placeholder="搜索片段…" class="h-7 pl-7 text-xs" />
</div>
</div>
<div class="flex-1 min-h-0 overflow-auto">
<div v-if="filtered.length === 0" class="p-4 text-center">
<p class="text-[11px] text-muted-foreground/70">
{{ available.length === 0 ? '当前会话没有可用的片段' : '无匹配项' }}
</p>
</div>
<template v-else>
<div v-for="[group, list] in grouped" :key="group">
<div class="px-2.5 py-1 text-[10px] font-medium text-muted-foreground bg-muted/40 sticky top-0">
{{ group }}
</div>
<button
v-for="s in list"
:key="s.id"
class="w-full text-left px-2.5 py-1.5 hover:bg-accent border-l-2 transition-colors"
:class="selected?.id === s.id ? 'bg-accent border-primary' : 'border-transparent'"
@click="select(s)"
>
<div class="flex items-center gap-1.5">
<Pin v-if="s.pinned" class="size-2.5 text-amber-500 shrink-0" />
<span class="text-[11px] font-medium truncate">{{ s.name }}</span>
<ShieldAlert v-if="s.confirm" class="size-2.5 text-destructive shrink-0" />
</div>
<div class="text-[10px] text-muted-foreground truncate font-mono mt-0.5">
{{ s.command }}
</div>
</button>
</div>
</template>
</div>
</section>
<!-- ===== 右:详情 / 参数填写 / 编辑 ===== -->
<section class="flex-1 min-w-0 flex flex-col overflow-auto">
<!-- ---------- 编辑态 ---------- -->
<div v-if="editing && draft" class="p-4 space-y-3 max-w-2xl">
<h3 class="text-sm font-medium">{{ draft.id ? '编辑片段' : '新建片段' }}</h3>
<label class="block space-y-1">
<span class="text-[11px] text-muted-foreground">名称</span>
<Input v-model="draft.name" class="h-7 text-xs" placeholder="如:查找大文件" />
</label>
<label class="block space-y-1">
<span class="text-[11px] text-muted-foreground">
命令(用 <code class="font-mono">${name}</code> 表示占位符;
需要字面量时写 <code class="font-mono">$${name}</code>)
</span>
<textarea
v-model="draft.command"
rows="3"
class="w-full px-2 py-1.5 rounded-md border border-border bg-transparent
text-xs font-mono outline-none focus:border-primary/60 resize-y"
placeholder="find ${dir} -type f -size +${size}"
/>
</label>
<label class="block space-y-1">
<span class="text-[11px] text-muted-foreground">说明(讲清做什么、有什么前提)</span>
<Input v-model="draft.description" class="h-7 text-xs" />
</label>
<div class="grid grid-cols-2 gap-3">
<label class="block space-y-1">
<span class="text-[11px] text-muted-foreground">分组</span>
<Input v-model="draft.group" class="h-7 text-xs" placeholder="如:文件 / 运维" />
</label>
<label class="block space-y-1">
<span class="text-[11px] text-muted-foreground">
适用 shell(逗号分隔,留空表示全部)
</span>
<Input
:model-value="draft.shellKinds.join(',')"
class="h-7 text-xs"
placeholder="powershell,bash"
@update:model-value="v => draft && (draft.shellKinds = String(v).split(',').map(x => x.trim()).filter(Boolean))"
/>
</label>
</div>
<div class="flex items-center gap-4 text-[11px]">
<label class="flex items-center gap-1.5 cursor-pointer select-none">
<input v-model="draft.sshOnly" type="checkbox" class="size-3 accent-primary" />
仅 SSH 会话可用
</label>
<label class="flex items-center gap-1.5 cursor-pointer select-none">
<input v-model="draft.confirm" type="checkbox" class="size-3 accent-primary" />
执行前需确认(危险命令)
</label>
<label class="flex items-center gap-1.5 cursor-pointer select-none">
<input v-model="draft.pinned" type="checkbox" class="size-3 accent-primary" />
置顶
</label>
</div>
<div
v-if="draft.confirm"
class="flex items-start gap-2 p-2 rounded border border-destructive/40 bg-destructive/5"
>
<ShieldAlert class="size-3.5 text-destructive shrink-0 mt-0.5" />
<p class="text-[11px] text-muted-foreground leading-relaxed">
标记为「需确认」的片段默认只会**填入命令行**,不会自动执行 ——
用户需要自己按回车。这避免了参数误填时立刻造成破坏。
</p>
</div>
<div class="flex items-center gap-2 pt-1">
<Button size="sm" class="h-7 text-xs" @click="submitDraft">保存</Button>
<Button variant="outline" size="sm" class="h-7 text-xs" @click="editing = false">取消</Button>
</div>
</div>
<!-- ---------- 详情态 ---------- -->
<div v-else-if="selected" class="p-4 space-y-3 max-w-2xl">
<div class="flex items-center gap-2">
<h3 class="text-sm font-medium">{{ selected.name }}</h3>
<button
class="text-muted-foreground hover:text-foreground"
:title="selected.pinned ? '取消置顶' : '置顶'"
@click="togglePin"
>
<Pin class="size-3.5" :class="selected.pinned ? 'text-amber-500' : ''" />
</button>
<div class="flex-1" />
<Button variant="ghost" size="sm" class="h-6 text-[11px]" @click="editSelected">编辑</Button>
<Button
variant="ghost"
size="sm"
class="h-6 text-[11px] text-destructive"
@click="removeSelected"
>
<Trash2 class="size-3" />
</Button>
</div>
<p v-if="selected.description" class="text-[11px] text-muted-foreground leading-relaxed">
{{ selected.description }}
</p>
<div class="rounded-md border border-border bg-muted/30 p-2">
<div class="text-[10px] text-muted-foreground mb-1">命令模板</div>
<pre class="text-[11px] font-mono whitespace-pre-wrap break-all">{{ selected.command }}</pre>
</div>
<!-- 占位符填写 -->
<div v-if="selected.placeholders.length > 0" class="space-y-2">
<div class="text-[11px] font-medium">参数</div>
<div
v-for="p in selected.placeholders"
:key="p"
class="flex items-center gap-2"
>
<span class="text-[11px] font-mono text-muted-foreground w-24 shrink-0 truncate" :title="p">
${ {{ p }} }
</span>
<Input
v-model="values[p]"
class="h-7 text-xs font-mono flex-1"
:placeholder="selected.defaults[p] || '(必填)'"
@keydown.enter="doRender"
/>
</div>
</div>
<!-- 预览 -->
<div class="space-y-1.5">
<div class="flex items-center gap-2">
<span class="text-[11px] font-medium">预览</span>
<Button
variant="outline"
size="sm"
class="h-6 text-[11px]"
:disabled="rendering"
@click="doRender"
>
生成预览
</Button>
<span v-if="missing.length > 0" class="text-[10px] text-amber-600">
还有 {{ missing.length }} 个未填写
</span>
</div>
<pre
v-if="preview"
class="rounded-md border border-border bg-muted/30 p-2 text-[11px] font-mono
whitespace-pre-wrap break-all"
>{{ preview }}</pre>
<p v-else class="text-[11px] text-muted-foreground/60">点「生成预览」查看实际会执行的命令</p>
</div>
<!-- 执行 -->
<div class="flex items-center gap-2 pt-1">
<Button
variant="outline"
size="sm"
class="h-7 text-xs gap-1.5"
:disabled="!sessionId"
@click="run(false)"
>
<Terminal class="size-3" />填入命令行
</Button>
<Button
size="sm"
class="h-7 text-xs gap-1.5"
:disabled="!sessionId || selected.confirm"
:title="selected.confirm ? '该片段被标记为需确认,请用「确认并执行」' : ''"
@click="run(true)"
>
<Play class="size-3" />直接执行
</Button>
<Button
v-if="selected.confirm"
variant="destructive"
size="sm"
class="h-7 text-xs gap-1.5"
:disabled="!sessionId"
@click="confirmThenRun"
>
<ShieldAlert class="size-3" />确认并执行
</Button>
</div>
</div>
<!-- ---------- 空态 ---------- -->
<div v-else class="flex-1 flex items-center justify-center">
<div class="text-center">
<BookMarked class="size-10 text-muted-foreground/20 mx-auto mb-3" />
<p class="text-xs text-muted-foreground mb-1">从左侧选择一个片段</p>
<p class="text-[11px] text-muted-foreground/60">
或点「新建片段」加入自己的常用命令
</p>
</div>
</div>
</section>
</div>
<!-- 悬浮关闭按钮(右上角已有「返回终端」,这里给键盘外的第二入口) -->
<button
class="absolute top-2 right-2 size-6 rounded flex items-center justify-center
text-muted-foreground hover:text-foreground"
title="关闭"
@click="emit('close')"
>
<X class="size-3.5" />
</button>
</div>
</template>
@@ -0,0 +1,542 @@
<script setup lang="ts">
/**
* 命令片段 popover(终端页控制栏的「片段」按钮)。
*
* # 这个组件是「按钮 + 浮层」的整体
*
* 触发器、浮层内容、快捷键用的开合状态,以及编辑对话框都封在这里,控制栏只摆
* 一个标签。编辑对话框是 `<Popover>` 的**兄弟节点**而非内容的一部分 ——
* 浮层会因外部交互收起,挂在内容子树里的对话框会被一起卸载
* (表现是「点新建片段,窗口闪一下就没了」)。
*
* # 两个视图:列表 → 详情
*
* 浮层只有 420px 宽,放不下「左列表 + 右详情」的双栏(旧片段页用的就是双栏)。
* 改成两级:列表按分组列出可用片段,点一条进入详情(占位符填写 → 预览 → 填入/执行),
* 左上角返回。这不是功能删减 —— 详情里该有的都在,只是把并排改成了先后。
*
* # 占位符与预览的三步为什么保留
*
* 预览这一步不是装饰:用户在这里看到的必须是**实际会执行的命令**。渲染规则
* (`$${x}` 转义、`${VAR:-default}` 排除、名称字符集)由后端 `snippet_placeholders`
* 与 `terminal_render_snippet` 实现,前端不自己拼字符串 —— 「预览的命令」与
* 「执行的命令」不一致是最坏的结果。
*
* # 危险片段(`confirm`)
*
* 标记了「需确认」的片段界面上不提供「直接执行」按钮,只有「填入命令行」与
* 「确认并执行」(后者再弹一次 `window.confirm` 兜底)。让用户自己按回车,
* 与命令被自动执行在心理上完全不同。
*
* # 编辑走对话框
*
* 表单(七个字段 + 危险提示)在 `SnippetEditorDialog` 里,本组件只负责列表与
* 取用,以及「新建 / 编辑 / 恢复内置 / 导入」四个入口的分发。
*/
import { computed, ref } from 'vue'
import { open as openDialog } from '@tauri-apps/plugin-dialog'
import {
ArrowLeft,
BookMarked,
Pencil,
Pin,
Play,
Plus,
RotateCcw,
Search,
ShieldAlert,
Terminal,
Trash2
} from '@lucide/vue'
import { toast } from 'vue-sonner'
import { useTerminalStore } from '@/stores/terminalStore'
import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input'
import { ScrollArea } from '@/components/ui/scroll-area'
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
import SnippetEditorDialog from './SnippetEditorDialog.vue'
import { snippetsPopoverOpen, toggleSnippetsPopover } from '../useRecordPopovers'
import type { CommandSnippet, SessionInfo, SnippetView } from '@/types/terminal'
const props = defineProps<{
/** 当前会话(片段按它的类型过滤;执行也落到它身上) */
sessionId: string | null
session: SessionInfo | undefined
}>()
const store = useTerminalStore()
// ===== 列表 =====
const filter = ref('')
const selected = ref<SnippetView | null>(null)
/** 会话是 SSH 还是本地(决定哪些片段可见) */
const sessionKind = computed<'local' | 'ssh'>(() => props.session?.kind ?? 'local')
/** 本地会话对应的 shell kind(用于 `shellKinds` 过滤) */
const shellKind = computed(() => store.shellOf(props.session)?.kind)
const available = computed(() => store.snippetsForSession(sessionKind.value, shellKind.value))
const filtered = computed(() => {
const kw = filter.value.trim().toLowerCase()
if (!kw) return available.value
return available.value.filter(
s =>
s.name.toLowerCase().includes(kw) ||
s.command.toLowerCase().includes(kw) ||
s.description.toLowerCase().includes(kw)
)
})
/** 按分组归类(保持 store 的排序:置顶优先 + 名称序) */
const grouped = computed(() => {
const map = new Map<string, SnippetView[]>()
for (const s of filtered.value) {
const g = s.group.trim() || '未分组'
if (!map.has(g)) map.set(g, [])
map.get(g)!.push(s)
}
return [...map.entries()]
})
// ===== 详情:参数填写与预览 =====
/** 占位符名 → 当前填写值 */
const values = ref<Record<string, string>>({})
/** 渲染后的命令(每次预览/执行前刷新) */
const preview = ref('')
const rendering = ref(false)
function select(s: SnippetView) {
selected.value = s
preview.value = ''
// 预填默认值:大多数情况下用户只需要改其中一两个
const v: Record<string, string> = {}
for (const k of s.placeholders) v[k] = s.defaults[k] ?? ''
values.value = v
}
/** 未填写的占位符(决定预览与执行是否放行) */
const missing = computed(() => {
const s = selected.value
if (!s) return []
return s.placeholders.filter(k => !(values.value[k] ?? '').trim())
})
async function doRender() {
const s = selected.value
if (!s) return
if (missing.value.length > 0) {
toast.error(`还有 ${missing.value.length} 个占位符未填写`)
return
}
rendering.value = true
try {
preview.value = await store.renderSnippet(s.id, values.value)
} catch (e) {
toast.error(String(e))
preview.value = ''
} finally {
rendering.value = false
}
}
/**
* 取用片段。
*
* `submit = false` 只写到命令行上;两种结果都收起浮层 —— 用户的下一步都在终端里
* (自己按回车,或看输出),浮层挡着没有价值。
*/
async function run(submit: boolean) {
const s = selected.value
if (!s || !props.sessionId) {
toast.info('请先打开一个会话')
return
}
if (missing.value.length > 0) {
toast.error('请先填写全部占位符')
return
}
// 先确保预览与实际一致:渲染统一交给后端
try {
preview.value = await store.renderSnippet(s.id, values.value)
} catch (e) {
toast.error(String(e))
return
}
try {
const r = await store.runSnippet(props.sessionId, s.id, values.value, submit)
if (submit) toast.success(r.message)
else toast.info(r.message)
toggleSnippetsPopover(false)
} catch (e) {
toast.error(`执行失败:${String(e)}`)
}
}
/** 危险片段强制执行一次确认(界面已限制,这是兜底) */
function confirmThenRun() {
const s = selected.value
if (!s) return
if (s.confirm && !window.confirm(`「${s.name}」被标记为需要确认的命令,确定执行?`)) return
void run(true)
}
// ===== 片段维护(新建 / 编辑 / 置顶 / 删除 / 恢复内置 / 导入) =====
const editorOpen = ref(false)
/** 待编辑的片段(null = 新建) */
const editing = ref<CommandSnippet | null>(null)
function newSnippet() {
editing.value = null
editorOpen.value = true
}
function editSelected() {
const s = selected.value
if (!s) return
// 去掉后端附加的 placeholders 字段 —— 它不是 CommandSnippet 的一部分,
// 带着它回传会在 save 时触发未知字段告警(serde 默认忽略,但没必要)
const { placeholders: _p, ...rest } = s
editing.value = { ...rest }
editorOpen.value = true
}
/**
* 保存后刷新选中项:占位符可能变了,详情视图必须跟着变。
* 按名称定位(新建时后端会分配 id,前端拿不到,只能靠刚提交的名称找);
* 找不到则退回列表 —— 至少不会停在一条已经不存在的数据上。
*/
function onSaved(name: string) {
const fresh = store.snippets.find(s => s.name === name)
if (fresh) select(fresh)
else selected.value = null
}
async function togglePin() {
const s = selected.value
if (!s) return
try {
const { placeholders: _p, ...rest } = s
await store.saveSnippet({ ...rest, pinned: !s.pinned })
const fresh = store.snippets.find(x => x.id === s.id)
if (fresh) select(fresh)
} catch (e) {
toast.error(`操作失败:${String(e)}`)
}
}
async function removeSelected() {
const s = selected.value
if (!s) return
if (!window.confirm(`确定删除片段「${s.name}」?`)) return
try {
await store.deleteSnippet(s.id)
// 删除后回到列表:详情视图已经指向一条不存在的片段
selected.value = null
toast.success('已删除')
} catch (e) {
toast.error(`删除失败:${String(e)}`)
}
}
async function restoreDefaults() {
if (!window.confirm('将补回缺失的内置片段(不会覆盖你已有的条目),继续?')) return
try {
await store.restoreDefaultSnippets()
toast.success('已恢复内置片段')
} catch (e) {
toast.error(`恢复失败:${String(e)}`)
}
}
/**
* 从本地文件导入命令文本(省去逐字敲长命令)。
*
* 前端不直接读文件(CSP 下 WebView 读本地文件受限),只把**文件名**作为初值
* 填进新建表单,由用户把内容粘进来。
*/
async function importFromFile() {
try {
const picked = await openDialog({
multiple: false,
directory: false,
filters: [{ name: '文本/脚本', extensions: ['txt', 'sh', 'bash', 'zsh', 'ps1', 'cmd', 'bat'] }]
})
if (typeof picked !== 'string') return
editing.value = {
id: '',
name: picked.replace(/\\/g, '/').split('/').pop() ?? '导入的片段',
command: '',
description: `待粘贴内容(来源:${picked})`,
group: '导入',
defaults: {},
shellKinds: [],
sshOnly: false,
confirm: true,
pinned: false,
createdAt: 0
}
editorOpen.value = true
toast.info('请把命令内容粘贴到「命令」框中')
} catch (e) {
toast.error(`导入失败:${String(e)}`)
}
}
/** 底部提示按视图切换(列表:怎么取用;详情:预览的可靠性) */
const hint = computed(() =>
selected.value
? '预览与实际执行的是同一条命令(由后端渲染)'
: '点条目进入详情,可填参数、预览并填入命令行'
)
</script>
<template>
<!--
触发器 + 浮层一体(与 HistoryPopover 同款结构)。Tooltip 锚在包裹 div 上、
Popover 在自己的子树里用 as-child;浮层展开期间禁用提示,避免提示压在内容上。
-->
<Tooltip :disabled="snippetsPopoverOpen">
<TooltipTrigger as-child>
<div class="inline-flex shrink-0">
<Popover v-model:open="snippetsPopoverOpen">
<PopoverTrigger as-child>
<Button variant="ghost" size="icon-sm" class="shrink-0">
<BookMarked class="size-3.5" />
</Button>
</PopoverTrigger>
<!-- 内容自带内边距:让开 popover 默认的 w-72 / p-4 -->
<PopoverContent align="start" class="w-auto p-0">
<div class="w-[420px]">
<!-- ========== 列表视图 ========== -->
<template v-if="!selected">
<div class="flex items-center gap-2 p-2.5 border-b border-border">
<div class="relative flex-1 min-w-0">
<Search
class="size-3.5 absolute left-2 top-1/2 -translate-y-1/2 text-muted-foreground"
/>
<Input v-model="filter" placeholder="搜索片段…" class="h-7 pl-7 text-xs" autofocus />
</div>
<span class="shrink-0 text-[10px] text-muted-foreground">
{{ session ? store.sessionLabel(session) : '未选择会话' }}
</span>
</div>
<ScrollArea class="h-[320px]">
<div v-if="filtered.length === 0" class="p-4 text-center">
<p class="text-[11px] text-muted-foreground/70">
{{ available.length === 0 ? '当前会话没有可用的片段' : '无匹配项' }}
</p>
</div>
<template v-else>
<div v-for="[group, list] in grouped" :key="group">
<div
class="px-2.5 py-1 text-[10px] font-medium text-muted-foreground bg-muted/40 sticky top-0"
>
{{ group }}
</div>
<button
v-for="s in list"
:key="s.id"
class="w-full text-left px-2.5 py-1.5 hover:bg-accent border-l-2 border-transparent transition-colors"
@click="select(s)"
>
<div class="flex items-center gap-1.5">
<Pin v-if="s.pinned" class="size-2.5 text-warning shrink-0" />
<span class="text-[11px] font-medium truncate">{{ s.name }}</span>
<ShieldAlert v-if="s.confirm" class="size-2.5 text-destructive shrink-0" />
</div>
<div class="text-[10px] text-muted-foreground truncate font-mono mt-0.5">
{{ s.command }}
</div>
</button>
</div>
</template>
</ScrollArea>
<div class="flex items-center gap-1 px-2.5 py-1.5 border-t border-border">
<Button
variant="ghost"
size="sm"
class="h-6 px-1.5 text-[11px] text-muted-foreground"
@click="importFromFile"
>
<BookMarked class="size-3" />从文件导入
</Button>
<Button
variant="ghost"
size="sm"
class="h-6 px-1.5 text-[11px] text-muted-foreground"
@click="restoreDefaults"
>
<RotateCcw class="size-3" />恢复内置
</Button>
<div class="flex-1" />
<Button size="sm" class="h-6 px-2 text-[11px]" @click="newSnippet">
<Plus class="size-3" />新建片段
</Button>
</div>
</template>
<!-- ========== 详情视图 ========== -->
<template v-else>
<div class="flex items-center gap-1.5 p-2.5 border-b border-border">
<Button
variant="ghost"
size="icon-sm"
class="size-6 shrink-0"
title="返回列表"
@click="selected = null"
>
<ArrowLeft class="size-3.5" />
</Button>
<span class="text-xs font-medium truncate">{{ selected.name }}</span>
<button
class="shrink-0 text-muted-foreground hover:text-warning"
:title="selected.pinned ? '取消置顶' : '置顶'"
@click="togglePin"
>
<Pin class="size-3.5" :class="selected.pinned ? 'text-warning' : ''" />
</button>
<div class="flex-1" />
<Button
variant="ghost"
size="icon-sm"
class="size-6"
title="编辑"
@click="editSelected"
>
<Pencil class="size-3" />
</Button>
<Button
variant="ghost"
size="icon-sm"
class="size-6 text-muted-foreground hover:text-destructive"
title="删除片段"
@click="removeSelected"
>
<Trash2 class="size-3" />
</Button>
</div>
<ScrollArea class="h-[320px]">
<div class="p-3 space-y-3">
<p
v-if="selected.description"
class="text-[11px] text-muted-foreground leading-relaxed"
>
{{ selected.description }}
</p>
<div class="rounded-md border border-border bg-muted/30 p-2">
<div class="text-[10px] text-muted-foreground mb-1">命令模板</div>
<pre class="text-[11px] font-mono whitespace-pre-wrap break-all">{{
selected.command
}}</pre>
</div>
<!-- 占位符填写 -->
<div v-if="selected.placeholders.length > 0" class="space-y-2">
<div class="text-[11px] font-medium">参数</div>
<div v-for="p in selected.placeholders" :key="p" class="flex items-center gap-2">
<span
class="text-[11px] font-mono text-muted-foreground w-24 shrink-0 truncate"
:title="p"
>
${ {{ p }} }
</span>
<Input
v-model="values[p]"
class="h-7 text-xs font-mono flex-1"
:placeholder="selected.defaults[p] || '(必填)'"
@keydown.enter="doRender"
/>
</div>
</div>
<!-- 预览 -->
<div class="space-y-1.5">
<div class="flex items-center gap-2">
<span class="text-[11px] font-medium">预览</span>
<Button
variant="outline"
size="sm"
class="h-6 px-2 text-[11px]"
:disabled="rendering"
@click="doRender"
>
生成预览
</Button>
<span v-if="missing.length > 0" class="text-[10px] text-warning">
还有 {{ missing.length }} 个未填写
</span>
</div>
<pre
v-if="preview"
class="rounded-md border border-border bg-muted/30 p-2 text-[11px] font-mono
whitespace-pre-wrap break-all"
>{{ preview }}</pre>
<p v-else class="text-[11px] text-muted-foreground/60">
点「生成预览」查看实际会执行的命令
</p>
</div>
</div>
</ScrollArea>
<div class="flex items-center gap-1.5 p-2.5 border-t border-border">
<Button
variant="outline"
size="sm"
class="h-7 text-xs gap-1.5"
:disabled="!sessionId"
@click="run(false)"
>
<Terminal class="size-3" />填入命令行
</Button>
<Button
size="sm"
class="h-7 text-xs gap-1.5"
:disabled="!sessionId || selected.confirm"
:title="selected.confirm ? '该片段被标记为需确认,请用「确认并执行」' : ''"
@click="run(true)"
>
<Play class="size-3" />直接执行
</Button>
<Button
v-if="selected.confirm"
variant="destructive"
size="sm"
class="h-7 text-xs gap-1.5"
:disabled="!sessionId"
@click="confirmThenRun"
>
<ShieldAlert class="size-3" />确认并执行
</Button>
</div>
</template>
<!-- 底部提示:两种视图各一句,说明当前视图下最需要知道的事 -->
<div class="px-2.5 pb-2 text-[10px] text-muted-foreground/70 truncate">
{{ hint }}
</div>
</div>
</PopoverContent>
</Popover>
</div>
</TooltipTrigger>
<TooltipContent side="bottom">命令片段(Ctrl+Shift+S)</TooltipContent>
</Tooltip>
<!--
编辑对话框是 `<Popover>` 的**兄弟节点**,不在浮层内容里:
浮层会因外部交互收起,若对话框挂在内容子树里,收起时会把它一起卸载 ——
表现是「点新建片段,窗口闪一下就没了」。放在同级,浮层开合与对话框无关。
-->
<SnippetEditorDialog v-model:open="editorOpen" :snippet="editing" @saved="onSaved" />
</template>
@@ -22,6 +22,7 @@ import { useTerminalStore } from '@/stores/terminalStore'
import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input'
import { Label } from '@/components/ui/label'
import { ScrollArea } from '@/components/ui/scroll-area'
import {
Dialog,
DialogContent,
@@ -41,7 +42,7 @@ const props = defineProps<{
const emit = defineEmits<{
(e: 'update:open', v: boolean): void
/** 用户点击「拉起」:交出模板,由 TerminalModule 执行开会话 + 布局 */
/** 用户点击「拉起」:交出模板,由 TerminalWorkspace 执行开会话 + 布局 */
(e: 'apply', template: SessionTemplate): void
}>()
@@ -123,7 +124,7 @@ function entryLabel(t: SessionTemplate): string {
<template>
<Dialog :open="open" @update:open="v => emit('update:open', v)">
<DialogContent class="max-w-lg">
<DialogContent class="max-w-lg max-h-[85vh]">
<DialogHeader>
<DialogTitle class="flex items-center gap-2 text-base">
<LayoutTemplate class="size-4" />会话模板
@@ -133,7 +134,8 @@ function entryLabel(t: SessionTemplate): string {
</DialogDescription>
</DialogHeader>
<!-- ===== 模板列表 ===== -->
<!-- ===== 模板列表(条数不限,限高滚动) ===== -->
<ScrollArea class="max-h-[45vh] pr-3">
<div class="space-y-1.5 min-h-[60px]">
<p v-if="templates.length === 0" class="text-xs text-muted-foreground">
还没有模板。先摆好想要的分屏布局,然后在下方保存为模板。
@@ -161,6 +163,7 @@ function entryLabel(t: SessionTemplate): string {
</Button>
</div>
</div>
</ScrollArea>
<!-- ===== 保存当前布局 ===== -->
<div class="space-y-2 rounded-md border border-border p-3">
@@ -0,0 +1,72 @@
<script setup lang="ts">
/**
* 会话画布的右键菜单。
*
* 抽成组件是因为有**两个宿主**:终端页(`TerminalWorkspace`,多标签 / 分屏)与
* 终端独立窗口(`TerminalWindow`,单会话)。此前菜单只是终端页里的一段内联标记,
* 独立窗口没有它 —— 而 `main.ts` 全局 `preventDefault` 掉了浏览器原生右键菜单,
* 于是独立窗口里右键**完全没反应**。菜单外观与条目现在只有这一份,
* 新增条目不会再漏掉某个宿主。
*
* 动作本身仍由各自宿主执行(独立窗口没有标签栏,动作实现不同)。
*/
withDefaults(
defineProps<{
/** 右键位置(视口坐标) */
x: number
y: number
/** 右键的会话是否有选区(决定「复制」是否可用) */
canCopy: boolean
/** 「重命名」条目的文案:终端页叫「重命名标签」,独立窗口叫「重命名会话」 */
renameLabel?: string
}>(),
{ renameLabel: '重命名标签' }
)
const emit = defineEmits<{
copy: []
paste: []
'select-all': []
clear: []
rename: []
close: []
}>()
</script>
<template>
<div
class="fixed z-50 min-w-[168px] py-1 rounded-md border border-border bg-popover shadow-lg text-xs"
:style="{ left: `${x}px`, top: `${y}px` }"
@click.stop
>
<button
class="w-full px-3 py-1.5 text-left hover:bg-accent flex items-center justify-between
disabled:opacity-40 disabled:pointer-events-none"
:disabled="!canCopy"
@click="emit('copy')"
>
复制
<span class="text-muted-foreground text-[10px] font-mono">Ctrl+Shift+C</span>
</button>
<button
class="w-full px-3 py-1.5 text-left hover:bg-accent flex items-center justify-between"
@click="emit('paste')"
>
粘贴
<span class="text-muted-foreground text-[10px] font-mono">Ctrl+Shift+V</span>
</button>
<button class="w-full px-3 py-1.5 text-left hover:bg-accent" @click="emit('select-all')">全选</button>
<div class="my-1 h-px bg-border" />
<button class="w-full px-3 py-1.5 text-left hover:bg-accent" @click="emit('clear')">清屏</button>
<button class="w-full px-3 py-1.5 text-left hover:bg-accent" @click="emit('rename')">
{{ renameLabel }}
</button>
<div class="my-1 h-px bg-border" />
<button
class="w-full px-3 py-1.5 text-left hover:bg-accent text-destructive"
@click="emit('close')"
>
关闭会话
</button>
</div>
</template>
@@ -12,9 +12,11 @@
* 或 shell 自己退出。把组件生命周期与会话生命周期绑定,会导致切标签就断连。
*/
import { computed, onMounted, ref, toRef, watch, nextTick } from 'vue'
import { toast } from 'vue-sonner'
import { useTerminalStore } from '@/stores/terminalStore'
import { useXterm } from '@/composables/useXterm'
import { resolveTheme } from '@/lib/terminalThemes'
import { resolveTheme, themeWithOpacity } from '@/lib/terminalThemes'
import { StatusBadge } from '@/components/common'
import type { AppearanceSettings } from '@/types/terminal'
const props = defineProps<{
@@ -94,24 +96,71 @@ function onContextMenu(e: MouseEvent) {
emit('contextmenu', { sessionId: props.sessionId, x: e.clientX, y: e.clientY })
}
/** 状态徽标文案与配色 */
const stateBadge = computed(() => {
/** 选中行为设置(copyOnSelect / middleClickPaste / trimTrailingNewline) */
const behavior = computed(() => store.settings?.selection ?? null)
/**
* 中键粘贴(X11 习惯,默认关)。
*
* 两个动作缺一不可:
* - `preventDefault()`:Chromium/Windows 下中键会进入「自动滚动」模式
* (屏幕上冒出滚动圆点),不阻止的话一按中键页面就进入滚动状态;
* - 捕获阶段 `stopPropagation()`:让 xterm 完全看不到这次中键 ——
* 它的鼠标状态机(选区辅助逻辑)与未知的按键处理不该被一次粘贴搅动。
*
* 因为事件在捕获阶段就被吞掉,冒泡阶段的 `onMouseDown` 不会触发,
* 焦点得自己 emit(粘贴的目标是「发出中键的那块面板」)。
*/
function onMiddleDown(e: MouseEvent) {
if (!(behavior.value?.middleClickPaste ?? false)) return
if (isReadonly.value) return
e.preventDefault()
e.stopPropagation()
// 捕获阶段吞掉后,冒泡阶段的 onMouseDown 不会再触发 → 焦点得自己给
emit('focus', props.sessionId)
void navigator.clipboard
.readText()
.then(text => (text ? store.write(props.sessionId, text) : undefined))
.catch(e => toast.error(`粘贴失败:${String(e)}`))
}
/**
* 选中即复制(X11 习惯,默认关)。
*
* 放在 mouseup 而不是 `onSelectionChange`:后者在拖动过程中每次都触发,
* 会把整个拖选过程切成几十次剪贴板写入(既卡顿又污染剪贴板历史);
* 松开鼠标才是「选完了」这一意图的终点。
*
* 只认左键:中键有粘贴、右键有菜单,各自有专门路径。
*/
function onMouseUp(e: MouseEvent) {
if (e.button !== 0) return
if (!(behavior.value?.copyOnSelect ?? false)) return
const text = getSelection()
if (!text) return
const trim = behavior.value?.trimTrailingNewline ?? true
const payload = trim && text.endsWith('\n') ? text.replace(/\n+$/, '') : text
void navigator.clipboard.writeText(payload).catch(err => toast.error(`复制失败:${String(err)}`))
}
/** 状态徽标文案与语义色(底色/文字由 StatusBadge 按 variant 取 token) */
const stateBadge = computed<{ text: string; variant: 'success' | 'warning' | 'danger' | 'neutral' }>(() => {
const s = sessionInfo.value?.state
switch (s) {
case 'connecting':
return { text: '连接中', cls: 'bg-amber-500/15 text-amber-600 dark:text-amber-400' }
return { text: '连接中', variant: 'warning' }
case 'authenticating':
return { text: '认证中', cls: 'bg-amber-500/15 text-amber-600 dark:text-amber-400' }
return { text: '认证中', variant: 'warning' }
case 'established':
return { text: '已连接', cls: 'bg-emerald-500/15 text-emerald-600 dark:text-emerald-400' }
return { text: '已连接', variant: 'success' }
case 'degraded':
return { text: '不稳定', cls: 'bg-orange-500/15 text-orange-600 dark:text-orange-400' }
return { text: '不稳定', variant: 'warning' }
case 'closed':
return { text: '已结束', cls: 'bg-muted text-muted-foreground' }
return { text: '已结束', variant: 'neutral' }
case 'failed':
return { text: '失败', cls: 'bg-red-500/15 text-red-600 dark:text-red-400' }
return { text: '失败', variant: 'danger' }
default:
return { text: '空闲', cls: 'bg-muted text-muted-foreground' }
return { text: '空闲', variant: 'neutral' }
}
})
@@ -127,7 +176,12 @@ const errorText = computed(() => sessionInfo.value?.error ?? '')
* 露出的部分与屏幕同色,视觉上无缝。
*/
const paneBackground = computed(() => {
const theme = resolveTheme(props.appearance?.theme ?? 'vscode-dark')
// 带上「背景不透明度」:否则终端屏幕半透明、而容器底色不透明,
// xterm 四周那几像素取整边缘会变成一圈明显更实的底色。
const theme = themeWithOpacity(
resolveTheme(props.appearance?.theme ?? 'vscode-dark'),
props.appearance?.opacity ?? 100
)
return theme.background ?? '#1e1e1e'
})
@@ -153,6 +207,8 @@ defineExpose({
class="relative h-full w-full overflow-hidden"
:style="{ backgroundColor: paneBackground }"
@mousedown="onMouseDown"
@mousedown.capture.middle="onMiddleDown"
@mouseup="onMouseUp"
@contextmenu="onContextMenu"
>
<!-- xterm 挂载点。不加 padding:xterm 自己会算内边距,
@@ -171,20 +227,21 @@ defineExpose({
<p class="text-xs text-muted-foreground">
{{ sessionInfo.state === 'failed' ? '连接失败' : '正在建立连接…' }}
</p>
<p v-if="errorText" class="max-w-md text-xs text-red-500 leading-relaxed">
<p v-if="errorText" class="max-w-md text-xs text-danger leading-relaxed">
{{ errorText }}
</p>
</div>
</div>
<!-- 会话已结束的角标(保留回放内容,提示这是因为进程退出而非断线) -->
<div
<StatusBadge
v-if="isReadonly && hasOutput"
class="absolute top-2 right-2 px-2 py-0.5 rounded text-[10px] pointer-events-none"
:class="stateBadge.cls"
:variant="stateBadge.variant"
size="sm"
class="absolute top-2 right-2 pointer-events-none"
>
{{ stateBadge.text }}
</div>
</StatusBadge>
</div>
</template>
@@ -1,4 +1,4 @@
<script setup lang="ts">
<script setup lang="ts">
/**
* 终端设置面板。
*
@@ -64,6 +64,9 @@ import {
DialogHeader,
DialogTitle
} from '@/components/ui/dialog'
import { ScrollArea } from '@/components/ui/scroll-area'
import { Card, CardContent } from '@/components/ui/card'
import { SettingGroup, SettingRow, StateBlock, StatusBadge } from '@/components/common'
import { createLogger } from '@/lib/logger'
import { ACTION_GROUPS, ACTION_MAP, eventToShortcut, TERMINAL_ACTIONS } from '@/lib/terminalActions'
import { TERMINAL_THEME_OPTIONS } from '@/lib/terminalThemes'
@@ -98,7 +101,7 @@ const SECTIONS: Array<{ id: Section; label: string; icon: unknown }> = [
// 每次拖滑块都会发一次 IPC。这里用本地草稿 + 显式保存按钮(滑块用防抖)。
const appearance = reactive<AppearanceSettings>({
theme: 'vscode-dark',
theme: 'system',
followAppTheme: true,
fontFamily: '',
fontSize: 14,
@@ -114,15 +117,13 @@ const appearance = reactive<AppearanceSettings>({
const layout = reactive<LayoutSettings>({
confirmCloseRunning: true,
inheritCwd: false,
sidebarOpen: true,
sidebarWidth: 240,
showStatusBar: true,
maxPanes: 1
})
const selection = reactive<SelectionSettings>({
copyOnSelect: false,
middleClickPaste: true,
middleClickPaste: false,
rightClick: 'menu',
trimTrailingNewline: true
})
@@ -396,114 +397,131 @@ const fontFamilyValue = computed({
</script>
<template>
<div class="flex h-full">
<!-- 分区导航 -->
<aside class="w-40 shrink-0 border-r border-border py-2">
<button
v-for="s in SECTIONS"
:key="s.id"
class="w-full flex items-center gap-2 px-3 py-2 text-xs text-left transition-colors"
:class="
section === s.id
? 'bg-accent text-accent-foreground font-medium'
: 'text-muted-foreground hover:bg-accent/50 hover:text-foreground'
"
@click="section = s.id"
>
<component :is="s.icon" class="size-3.5 shrink-0" />
{{ s.label }}
</button>
<div class="flex h-full min-h-0">
<!--
左:分区导航 + 右:分区设置内容 —— 结构对齐音乐模块「曲库」页。
页头(PageToolbar)已移除:模块 Tabs 上写着「设置」,页内再叠一条标题条
只会白占一屏高度;页面标题改由左栏的分组标题承载。
-->
<aside class="flex w-[168px] shrink-0 flex-col border-r">
<ScrollArea class="min-h-0 flex-1">
<div class="flex flex-col p-2">
<p class="px-2 pb-1.5 pt-0.5 text-[11px] font-medium tracking-wide text-muted-foreground">
终端设置
</p>
<!-- 分区导航:选中态是浮起胶囊(与曲库左栏、模块 Tabs 同一口径) -->
<div class="flex flex-col gap-0.5">
<button
v-for="s in SECTIONS"
:key="s.id"
type="button"
class="flex h-8 items-center gap-1.5 rounded-md px-2 text-[13px] transition-colors duration-150"
:class="
section === s.id
? 'bg-background font-medium text-foreground shadow-sm ring-1 ring-border'
: 'text-muted-foreground hover:bg-accent/60 hover:text-foreground'
"
@click="section = s.id"
>
<component :is="s.icon" class="size-3.5 shrink-0" />
<span class="min-w-0 flex-1 truncate text-left">{{ s.label }}</span>
</button>
</div>
</div>
</ScrollArea>
</aside>
<!-- 分区内容 -->
<div class="flex-1 min-w-0 overflow-y-auto p-5">
<!--
分区内容:key 随分区变化 → 重挂时复用全局 tab-animate(与曲库换视图同一口径)。
p-5 必须加在**滚动内容**上(内层 wrapper),不能加在 ScrollArea 根上:
根上的内边距不属于滚动内容,滚到底时最后一张卡片的底部阴影正好压在
视口下边缘上,会被裁掉一条(外观页的「外观」分组卡片就是这种现象)。
-->
<ScrollArea :key="section" class="tab-animate flex-1 min-w-0">
<div class="p-5">
<!-- ===== 外观 ===== -->
<div v-if="section === 'appearance'" class="space-y-5 max-w-2xl">
<div>
<h3 class="text-sm font-medium mb-1">外观</h3>
<p class="text-xs text-muted-foreground">控制终端的配色、字体与渲染方式。</p>
</div>
<div v-if="section === 'appearance'" class="max-w-3xl">
<SettingGroup title="外观" description="控制终端的配色、字体与渲染方式。">
<!-- 表单类(下拉/滑杆/输入)按「label 在上 + 控件全宽」纵排,不塞进 SettingRow -->
<div class="space-y-1.5 py-3">
<Label class="text-xs">配色主题</Label>
<Select v-model="appearance.theme">
<SelectTrigger class="h-8 text-sm"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem v-for="t in TERMINAL_THEME_OPTIONS" :key="t.value" :value="t.value">
{{ t.label }}
</SelectItem>
</SelectContent>
</Select>
</div>
<div class="space-y-1.5">
<Label class="text-xs">配色主题</Label>
<Select v-model="appearance.theme">
<SelectTrigger class="h-8 text-sm"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem v-for="t in TERMINAL_THEME_OPTIONS" :key="t.value" :value="t.value">
{{ t.label }}
</SelectItem>
</SelectContent>
</Select>
<div class="flex items-center justify-between pt-1.5">
<div>
<Label class="text-xs">跟随应用主题</Label>
<p class="text-[11px] text-muted-foreground">
应用切换到浅色/深色时,终端自动跟随(选择「跟随系统」时生效)
</p>
</div>
<SettingRow
label="跟随应用主题"
description="应用切到浅色/深色时,终端自动换成对应侧的配色(所选主题只作取色基准;Dracula 这类只有深色的主题在浅色下回落为 VS Code 浅色)"
>
<Switch v-model="appearance.followAppTheme" />
</SettingRow>
<div class="space-y-1.5 py-3">
<Label class="text-xs">字体</Label>
<Select v-model="fontFamilyValue">
<SelectTrigger class="h-8 text-sm"><SelectValue placeholder="系统默认" /></SelectTrigger>
<SelectContent>
<SelectItem v-for="f in FONT_PRESETS" :key="f.label" :value="f.value">
{{ f.label }}
</SelectItem>
</SelectContent>
</Select>
<p class="text-[11px] text-muted-foreground font-mono truncate">
{{ appearance.fontFamily || '(系统默认等宽字体)' }}
</p>
</div>
</div>
<div class="space-y-1.5">
<Label class="text-xs">字体</Label>
<Select v-model="fontFamilyValue">
<SelectTrigger class="h-8 text-sm"><SelectValue placeholder="系统默认" /></SelectTrigger>
<SelectContent>
<SelectItem v-for="f in FONT_PRESETS" :key="f.label" :value="f.value">
{{ f.label }}
</SelectItem>
</SelectContent>
</Select>
<p class="text-[11px] text-muted-foreground font-mono truncate">
{{ appearance.fontFamily || '(系统默认等宽字体)' }}
</p>
</div>
<div class="space-y-1.5">
<div class="flex items-center justify-between">
<Label class="text-xs">字号</Label>
<span class="text-xs font-mono text-muted-foreground">{{ appearance.fontSize }} px</span>
<div class="space-y-1.5 py-3">
<div class="flex items-center justify-between">
<Label class="text-xs">字号</Label>
<span class="text-xs font-mono text-muted-foreground">{{ appearance.fontSize }} px</span>
</div>
<Slider
:model-value="[appearance.fontSize]"
:min="8"
:max="40"
:step="1"
@update:model-value="(v: any) => { appearance.fontSize = Array.isArray(v) ? v[0] : Number(v) }"
/>
</div>
<Slider
:model-value="[appearance.fontSize]"
:min="6"
:max="48"
:step="1"
@update:model-value="(v: any) => { appearance.fontSize = Array.isArray(v) ? v[0] : Number(v) }"
/>
</div>
<div class="space-y-1.5">
<div class="flex items-center justify-between">
<Label class="text-xs">行高</Label>
<span class="text-xs font-mono text-muted-foreground">{{ appearance.lineHeight.toFixed(2) }}</span>
<div class="space-y-1.5 py-3">
<div class="flex items-center justify-between">
<Label class="text-xs">行高</Label>
<span class="text-xs font-mono text-muted-foreground">{{ appearance.lineHeight.toFixed(2) }}</span>
</div>
<Slider
:model-value="[appearance.lineHeight]"
:min="1"
:max="2"
:step="0.05"
@update:model-value="(v: any) => { appearance.lineHeight = Array.isArray(v) ? v[0] : Number(v) }"
/>
</div>
<Slider
:model-value="[appearance.lineHeight]"
:min="1"
:max="2"
:step="0.05"
@update:model-value="(v: any) => { appearance.lineHeight = Array.isArray(v) ? v[0] : Number(v) }"
/>
</div>
<div class="space-y-1.5">
<div class="flex items-center justify-between">
<Label class="text-xs">字间距</Label>
<span class="text-xs font-mono text-muted-foreground">{{ appearance.letterSpacing }} px</span>
<div class="space-y-1.5 py-3">
<div class="flex items-center justify-between">
<Label class="text-xs">字间距</Label>
<span class="text-xs font-mono text-muted-foreground">{{ appearance.letterSpacing }} px</span>
</div>
<Slider
:model-value="[appearance.letterSpacing]"
:min="-2"
:max="4"
:step="0.5"
@update:model-value="(v: any) => { appearance.letterSpacing = Array.isArray(v) ? v[0] : Number(v) }"
/>
</div>
<Slider
:model-value="[appearance.letterSpacing]"
:min="-2"
:max="4"
:step="0.5"
@update:model-value="(v: any) => { appearance.letterSpacing = Array.isArray(v) ? v[0] : Number(v) }"
/>
</div>
<div class="grid grid-cols-2 gap-4">
<div class="space-y-1.5">
<div class="space-y-1.5 py-3">
<Label class="text-xs">光标样式</Label>
<Select v-model="appearance.cursorStyle">
<SelectTrigger class="h-8 text-sm"><SelectValue /></SelectTrigger>
@@ -514,259 +532,224 @@ const fontFamilyValue = computed({
</SelectContent>
</Select>
</div>
<div class="flex items-end pb-1.5">
<div class="flex items-center justify-between w-full">
<Label class="text-xs">光标闪烁</Label>
<Switch v-model="appearance.cursorBlink" />
<SettingRow label="光标闪烁">
<Switch v-model="appearance.cursorBlink" />
</SettingRow>
<div class="space-y-1.5 py-3">
<div class="flex items-center justify-between">
<Label class="text-xs">背景不透明度</Label>
<span class="text-xs font-mono text-muted-foreground">{{ appearance.opacity }}%</span>
</div>
<Slider
:model-value="[appearance.opacity]"
:min="30"
:max="100"
:step="1"
@update:model-value="(v: any) => { appearance.opacity = Array.isArray(v) ? v[0] : Number(v) }"
/>
<p v-if="appearance.opacity < 70" class="text-[11px] text-warning">
过低的不透明度会让文字与背景内容混在一起,影响可读性。
</p>
</div>
</div>
<div class="space-y-1.5">
<div class="flex items-center justify-between">
<Label class="text-xs">背景不透明度</Label>
<span class="text-xs font-mono text-muted-foreground">{{ appearance.opacity }}%</span>
</div>
<Slider
:model-value="[appearance.opacity]"
:min="30"
:max="100"
:step="1"
@update:model-value="(v: any) => { appearance.opacity = Array.isArray(v) ? v[0] : Number(v) }"
/>
<p v-if="appearance.opacity < 70" class="text-[11px] text-amber-600 dark:text-amber-400">
过低的不透明度会让文字与背景内容混在一起,影响可读性。
</p>
</div>
<div class="grid grid-cols-2 gap-4">
<div class="space-y-1.5">
<div class="space-y-1.5 py-3">
<Label class="text-xs">回滚缓冲行数</Label>
<Input v-model.number="appearance.scrollback" type="number" class="h-8 text-sm font-mono" />
<p class="text-[11px] text-muted-foreground">内存占用与此成正比</p>
</div>
</div>
<div class="flex items-center justify-between">
<div>
<Label class="text-xs">GPU 渲染(WebGL)</Label>
<p class="text-[11px] text-muted-foreground">
显著提升滚动流畅度;驱动异常时自动回退到 Canvas
</p>
</div>
<Switch v-model="appearance.gpuRendering" />
</div>
<SettingRow
label="GPU 渲染(WebGL)"
description="显著提升滚动流畅度;驱动异常时自动回退到 Canvas"
>
<Switch v-model="appearance.gpuRendering" />
</SettingRow>
</SettingGroup>
<!-- 保存按钮已移除:改动经 400ms 防抖自动写回(即时生效) -->
</div>
<!-- ===== 行为 ===== -->
<div v-else-if="section === 'behavior'" class="space-y-5 max-w-2xl">
<div>
<h3 class="text-sm font-medium mb-1">行为</h3>
<p class="text-xs text-muted-foreground">鼠标与剪贴板的交互方式。</p>
</div>
<div v-else-if="section === 'behavior'" class="max-w-3xl">
<SettingGroup title="行为" description="鼠标与剪贴板的交互方式。">
<SettingRow label="选中即复制" description="用鼠标选中文本后立即写入剪贴板(X11 习惯)">
<Switch v-model="selection.copyOnSelect" />
</SettingRow>
<div class="flex items-center justify-between">
<div>
<Label class="text-xs">选中即复制</Label>
<p class="text-[11px] text-muted-foreground">用鼠标选中文本后立即写入剪贴板(X11 习惯)</p>
<SettingRow label="中键粘贴" description="点击鼠标中键粘贴剪贴板内容">
<Switch v-model="selection.middleClickPaste" />
</SettingRow>
<div class="space-y-1.5 py-3">
<Label class="text-xs">右键行为</Label>
<Select v-model="selection.rightClick">
<SelectTrigger class="h-8 text-sm"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem value="menu">弹出菜单</SelectItem>
<SelectItem value="paste">粘贴</SelectItem>
<SelectItem value="select-word">选中光标下的词</SelectItem>
</SelectContent>
</Select>
</div>
<Switch v-model="selection.copyOnSelect" />
</div>
<div class="flex items-center justify-between">
<div>
<Label class="text-xs">中键粘贴</Label>
<p class="text-[11px] text-muted-foreground">点击鼠标中键粘贴剪贴板内容</p>
</div>
<Switch v-model="selection.middleClickPaste" />
</div>
<div class="space-y-1.5">
<Label class="text-xs">右键行为</Label>
<Select v-model="selection.rightClick">
<SelectTrigger class="h-8 text-sm"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem value="menu">弹出菜单</SelectItem>
<SelectItem value="paste">粘贴</SelectItem>
<SelectItem value="select-word">选中光标下的词</SelectItem>
</SelectContent>
</Select>
</div>
<div class="flex items-center justify-between">
<div>
<Label class="text-xs">复制时去掉行尾换行</Label>
<p class="text-[11px] text-muted-foreground">
复制单行命令时不带末尾换行,粘贴到 shell 不会立即执行
</p>
</div>
<Switch v-model="selection.trimTrailingNewline" />
</div>
<SettingRow
label="复制时去掉行尾换行"
description="复制单行命令时不带末尾换行,粘贴到 shell 不会立即执行"
>
<Switch v-model="selection.trimTrailingNewline" />
</SettingRow>
</SettingGroup>
<!-- 保存按钮已移除:改动经 400ms 防抖自动写回(即时生效) -->
</div>
<!-- ===== 布局 ===== -->
<div v-else-if="section === 'layout'" class="space-y-5 max-w-2xl">
<div>
<h3 class="text-sm font-medium mb-1">布局</h3>
<p class="text-xs text-muted-foreground">窗口与面板的组织方式。</p>
</div>
<div v-else-if="section === 'layout'" class="max-w-3xl">
<SettingGroup title="布局" description="窗口与面板的组织方式。">
<SettingRow label="显示状态栏" description="底部显示会话、工作目录与终端尺寸">
<Switch v-model="layout.showStatusBar" />
</SettingRow>
<div class="flex items-center justify-between">
<div>
<Label class="text-xs">显示状态栏</Label>
<p class="text-[11px] text-muted-foreground">底部显示会话、工作目录与终端尺寸</p>
</div>
<Switch v-model="layout.showStatusBar" />
</div>
<SettingRow
label="新会话继承当前目录"
description="新建本地标签时,从当前会话的工作目录启动(需 shell 支持 OSC 7 上报)"
>
<Switch v-model="layout.inheritCwd" />
</SettingRow>
<div class="flex items-center justify-between">
<div>
<Label class="text-xs">新会话继承当前目录</Label>
<SettingRow
label="关闭运行中的会话前确认"
description="强烈建议保持开启 —— 一个正在跑的编译或部署任务被误关会很难受"
>
<Switch v-model="layout.confirmCloseRunning" />
</SettingRow>
<div class="space-y-1.5 py-3">
<Label class="text-xs">面板数量上限</Label>
<Select
:model-value="String(layout.maxPanes)"
@update:model-value="(v: any) => { layout.maxPanes = Number(v) }"
>
<SelectTrigger class="h-8 text-sm"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem value="1">1(不分屏)</SelectItem>
<SelectItem value="2">2</SelectItem>
<SelectItem value="3">3</SelectItem>
<SelectItem value="4">4</SelectItem>
</SelectContent>
</Select>
<p class="text-[11px] text-muted-foreground">
新建本地标签时,从当前会话的工作目录启动(需 shell 支持 OSC 7 上报)
一个标签内可并排的面板上限;封顶 4(WebGL 上下文数量受限)
</p>
</div>
<Switch v-model="layout.inheritCwd" />
</div>
<div class="flex items-center justify-between">
<div>
<Label class="text-xs">关闭运行中的会话前确认</Label>
<p class="text-[11px] text-muted-foreground">
强烈建议保持开启 —— 一个正在跑的编译或部署任务被误关会很难受
</p>
</div>
<Switch v-model="layout.confirmCloseRunning" />
</div>
<div class="space-y-1.5">
<Label class="text-xs">面板数量上限</Label>
<Select :model-value="String(layout.maxPanes)">
<SelectTrigger class="h-8 text-sm"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem value="1">1(不分屏)</SelectItem>
<SelectItem value="2">2</SelectItem>
<SelectItem value="3">3</SelectItem>
<SelectItem value="4">4</SelectItem>
</SelectContent>
</Select>
<p class="text-[11px] text-muted-foreground">
分屏功能在后续版本提供,此处先确定上限
</p>
</div>
</SettingGroup>
<!-- 保存按钮已移除:改动经 400ms 防抖自动写回(即时生效) -->
</div>
<!-- ===== Shell ===== -->
<div v-else-if="section === 'shells'" class="space-y-5 max-w-3xl">
<div class="flex items-start justify-between">
<div>
<h3 class="text-sm font-medium mb-1">本地 Shell</h3>
<div v-else-if="section === 'shells'" class="max-w-3xl">
<div class="flex items-start justify-between gap-3 mb-3">
<div class="flex min-w-0 flex-col gap-1">
<h2 class="text-sm font-semibold text-foreground">本地 Shell</h2>
<p class="text-xs text-muted-foreground">
自动探测系统中可用的 Shell。禁用的 Shell 不会出现在新建会话的列表中。
</p>
</div>
<Button variant="outline" size="sm" class="h-7 gap-1.5 text-xs shrink-0" :disabled="detecting" @click="refreshShells">
<Button variant="outline" size="sm" class="shrink-0" :disabled="detecting" @click="refreshShells">
<RefreshCw class="size-3.5" :class="{ 'animate-spin': detecting }" />
重新探测
</Button>
</div>
<div v-if="store.shells.length === 0" class="py-12 text-center border border-dashed border-border rounded-md">
<Monitor class="size-7 mx-auto text-muted-foreground/30 mb-2" />
<p class="text-sm text-muted-foreground">未探测到可用 Shell</p>
</div>
<Card>
<CardContent>
<StateBlock
v-if="store.shells.length === 0"
variant="empty"
title="未探测到可用 Shell"
:min-height="200"
/>
<div v-else class="space-y-2">
<div
v-for="s in store.shells"
:key="s.id"
class="group flex items-start gap-3 rounded-md border border-border p-3 transition-colors hover:bg-hover"
>
<Monitor class="size-4 shrink-0 mt-0.5 text-muted-foreground" />
<div v-else class="space-y-1.5">
<div
v-for="s in store.shells"
:key="s.id"
class="group flex items-start gap-3 px-3 py-2.5 rounded-md border border-border
hover:border-primary/40 transition-colors"
>
<Monitor class="size-4 shrink-0 mt-0.5 text-muted-foreground" />
<div class="min-w-0 flex-1">
<div class="flex items-center gap-2 flex-wrap">
<span class="text-sm font-medium truncate">{{ s.name }}</span>
<span class="shrink-0 text-[11px] text-muted-foreground">{{ s.kind }}</span>
<StatusBadge v-if="s.detected" variant="info" size="sm">自动探测</StatusBadge>
<StatusBadge v-if="s.id === store.settings?.lastShellId" variant="success" size="sm">
默认
</StatusBadge>
</div>
<div class="mt-1 text-[11px] text-muted-foreground font-mono truncate" :title="s.path">
{{ s.path }}
<span v-if="s.args.length > 0" class="opacity-70">{{ s.args.join(' ') }}</span>
</div>
</div>
<div class="min-w-0 flex-1">
<div class="flex items-center gap-2 flex-wrap">
<span class="text-sm font-medium truncate">{{ s.name }}</span>
<span class="text-[10px] px-1.5 py-0.5 rounded bg-muted shrink-0">{{ s.kind }}</span>
<span
v-if="s.detected"
class="text-[10px] px-1.5 py-0.5 rounded bg-sky-500/15 text-sky-700 dark:text-sky-400 shrink-0"
>
自动探测
</span>
<span
v-if="s.id === store.settings?.lastShellId"
class="text-[10px] px-1.5 py-0.5 rounded bg-emerald-500/15 text-emerald-700 dark:text-emerald-400 shrink-0"
>
默认
</span>
</div>
<div class="mt-1 text-[11px] text-muted-foreground font-mono truncate" :title="s.path">
{{ s.path }}
<span v-if="s.args.length > 0" class="opacity-70">{{ s.args.join(' ') }}</span>
<div class="shrink-0 flex items-center gap-2">
<Button
v-if="s.id !== store.settings?.lastShellId"
variant="ghost"
size="sm"
class="opacity-0 group-hover:opacity-100 transition-opacity"
title="设为默认 Shell"
@click="store.setLastShell(s.id)"
>
设为默认
</Button>
<Button
variant="ghost"
size="sm"
class="opacity-0 group-hover:opacity-100 transition-opacity"
@click="testShell(s)"
>
测试
</Button>
<Switch :model-value="s.enabled" @update:model-value="() => toggleShellEnabled(s)" />
<Button
v-if="!s.detected"
variant="ghost"
size="icon-sm"
class="opacity-0 group-hover:opacity-100 transition-opacity text-destructive hover:text-destructive"
title="删除"
@click="pendingShellDelete = s"
>
<Trash2 class="size-3.5" />
</Button>
</div>
</div>
</div>
</CardContent>
</Card>
<div class="shrink-0 flex items-center gap-2">
<Button
v-if="s.id !== store.settings?.lastShellId"
variant="ghost"
size="sm"
class="h-7 text-[11px] opacity-0 group-hover:opacity-100 transition-opacity"
title="设为默认 Shell"
@click="store.setLastShell(s.id)"
>
设为默认
</Button>
<Button
variant="ghost"
size="sm"
class="h-7 text-[11px] opacity-0 group-hover:opacity-100 transition-opacity"
@click="testShell(s)"
>
测试
</Button>
<Switch :model-value="s.enabled" @update:model-value="() => toggleShellEnabled(s)" />
<Button
v-if="!s.detected"
variant="ghost"
size="icon"
class="size-7 opacity-0 group-hover:opacity-100 transition-opacity
text-destructive hover:text-destructive"
title="删除"
@click="pendingShellDelete = s"
>
<Trash2 class="size-3.5" />
</Button>
</div>
</div>
</div>
<p class="text-[11px] text-muted-foreground">
<p class="mt-3 text-[11px] text-muted-foreground">
自动探测到的 Shell 无法删除,只能禁用 —— 它们的路径来自系统,删掉也会在下次探测时重新出现。
</p>
</div>
<!-- ===== 快捷键 ===== -->
<div v-else-if="section === 'shortcuts'" class="space-y-5 max-w-3xl">
<div class="flex items-start justify-between">
<div>
<h3 class="text-sm font-medium mb-1">终端内快捷键</h3>
<div v-else-if="section === 'shortcuts'" class="max-w-3xl">
<div class="flex items-start justify-between gap-3 mb-3">
<div class="flex min-w-0 flex-col gap-1">
<h2 class="text-sm font-semibold text-foreground">终端内快捷键</h2>
<p class="text-xs text-muted-foreground">
仅在焦点位于终端面板内时生效。点击键位后按下新组合键即可修改。
仅在焦点位于终端面板内时生效(说明里标注「全局生效」的那条是系统级热键,
任意界面按下都有效)。点击键位后按下新组合键即可修改。
</p>
</div>
<Button variant="outline" size="sm" class="h-7 gap-1.5 text-xs shrink-0" @click="resetShortcuts">
<Button variant="outline" size="sm" class="shrink-0" @click="resetShortcuts">
<RotateCcw class="size-3.5" />恢复默认
</Button>
</div>
<!-- 硬约束说明:这是最容易引起困惑的地方,必须显式写在界面上 -->
<div class="flex items-start gap-2 p-2.5 rounded-md bg-muted text-[11px] text-muted-foreground">
<div class="flex items-start gap-2 p-2.5 rounded-md bg-muted text-[11px] text-muted-foreground mb-3">
<AlertTriangle class="size-3.5 shrink-0 mt-0.5" />
<div>
<p>
@@ -777,65 +760,69 @@ const fontFamilyValue = computed({
</div>
</div>
<p v-if="unboundCount > 0" class="text-[11px] text-muted-foreground">
<p v-if="unboundCount > 0" class="text-[11px] text-muted-foreground mb-3">
有 {{ unboundCount }} 个动作未绑定键位。
</p>
<div v-for="g in shortcutGroups" :key="g.group" class="space-y-1">
<p class="text-[10px] uppercase tracking-wide text-muted-foreground px-1">{{ g.group }}</p>
<Card>
<CardContent class="space-y-4">
<div v-for="g in shortcutGroups" :key="g.group" class="space-y-2">
<p class="text-[11px] font-medium text-muted-foreground">{{ g.group }}</p>
<div
v-for="b in g.items"
:key="b.action"
class="flex items-center gap-3 px-3 py-2 rounded-md border border-border"
:class="recording === b.action ? 'border-primary bg-accent/40' : 'border-border'"
>
<div class="min-w-0 flex-1">
<div class="text-xs font-medium">{{ ACTION_MAP[b.action]?.label ?? b.action }}</div>
<div class="text-[11px] text-muted-foreground truncate">
{{ ACTION_MAP[b.action]?.description }}
<div
v-for="b in g.items"
:key="b.action"
class="flex items-center gap-3 rounded-md border p-3"
:class="recording === b.action ? 'border-primary bg-primary-soft' : 'border-border'"
>
<div class="min-w-0 flex-1">
<div class="text-xs font-medium">{{ ACTION_MAP[b.action]?.label ?? b.action }}</div>
<div class="text-[11px] text-muted-foreground truncate">
{{ ACTION_MAP[b.action]?.description }}
</div>
</div>
<!-- 键位录制按钮 -->
<button
class="shrink-0 min-w-[132px] h-7 px-2.5 rounded-md border text-[11px] font-mono
transition-colors"
:class="
recording === b.action
? 'border-primary bg-primary-soft text-primary-soft-text'
: b.keys
? 'border-border hover:border-primary/50 hover:bg-hover'
: 'border-dashed border-muted-foreground/40 text-muted-foreground hover:border-primary/50'
"
@click="recording === b.action ? stopRecording() : startRecording(b.action)"
>
<template v-if="recording === b.action">
<span class="animate-pulse">按下组合键…</span>
</template>
<template v-else-if="b.keys">{{ b.keys }}</template>
<template v-else>未绑定</template>
</button>
<Button
v-if="b.keys"
variant="ghost"
size="icon-sm"
class="shrink-0 text-muted-foreground"
title="清除绑定"
@click="clearBinding(b.action)"
>
<RotateCcw class="size-3.5" />
</Button>
<div v-else class="size-7 shrink-0" />
<Switch
:model-value="b.enabled"
class="shrink-0"
@update:model-value="(v: boolean) => toggleBinding(b.action, v)"
/>
</div>
</div>
<!-- 键位录制按钮 -->
<button
class="shrink-0 min-w-[132px] h-7 px-2.5 rounded-md border text-[11px] font-mono
transition-colors"
:class="
recording === b.action
? 'border-primary bg-primary/10 text-primary'
: b.keys
? 'border-border hover:border-primary/50 hover:bg-accent/50'
: 'border-dashed border-muted-foreground/40 text-muted-foreground hover:border-primary/50'
"
@click="recording === b.action ? stopRecording() : startRecording(b.action)"
>
<template v-if="recording === b.action">
<span class="animate-pulse">按下组合键…</span>
</template>
<template v-else-if="b.keys">{{ b.keys }}</template>
<template v-else>未绑定</template>
</button>
<Button
v-if="b.keys"
variant="ghost"
size="icon"
class="size-7 shrink-0 text-muted-foreground"
title="清除绑定"
@click="clearBinding(b.action)"
>
<RotateCcw class="size-3.5" />
</Button>
<div v-else class="size-7 shrink-0" />
<Switch
:model-value="b.enabled"
class="shrink-0"
@update:model-value="(v: boolean) => toggleBinding(b.action, v)"
/>
</div>
</div>
</CardContent>
</Card>
<!-- 录制冲突提示 -->
<div
@@ -848,60 +835,50 @@ const fontFamilyValue = computed({
</div>
<!-- ===== 安全 ===== -->
<div v-else-if="section === 'security'" class="space-y-5 max-w-2xl">
<div>
<h3 class="text-sm font-medium mb-1">安全</h3>
<p class="text-xs text-muted-foreground">主机密钥校验与审计。</p>
</div>
<div class="rounded-md border border-border p-3 space-y-3">
<div>
<Label class="text-xs">主机密钥策略</Label>
<p class="text-[11px] text-muted-foreground mt-0.5">
本项目<span class="font-medium text-foreground">不提供「自动接受」</span>选项。
首次连接必须人工核对指纹 —— 这是抵御中间人攻击的唯一有效手段。
</p>
<div v-else-if="section === 'security'" class="max-w-3xl">
<SettingGroup title="安全" description="主机密钥校验与审计。">
<div class="space-y-3 py-3">
<div>
<Label class="text-xs">主机密钥策略</Label>
<p class="text-[11px] text-muted-foreground mt-0.5">
本项目<span class="font-medium text-foreground">不提供「自动接受」</span>选项。
首次连接必须人工核对指纹 —— 这是抵御中间人攻击的唯一有效手段。
</p>
</div>
<div class="flex items-center gap-2 px-2.5 py-2 rounded bg-muted">
<ShieldAlert class="size-3.5 text-success shrink-0" />
<span class="text-xs">询问并核对指纹(唯一策略)</span>
</div>
</div>
<div class="flex items-center gap-2 px-2.5 py-2 rounded bg-muted">
<ShieldAlert class="size-3.5 text-emerald-600 dark:text-emerald-400 shrink-0" />
<span class="text-xs">询问并核对指纹(唯一策略)</span>
<SettingRow
label="指纹变更时阻断连接"
description="已记录的主机换了密钥时,默认拒绝连接,需用户显式核对后放行"
>
<Switch v-model="security.blockOnFingerprintChange" />
</SettingRow>
<SettingRow
label="记录安全事件"
description="把主机密钥确认、指纹变更等事件写入日志,便于事后追溯"
>
<Switch v-model="security.auditLog" />
</SettingRow>
<div v-if="!security.blockOnFingerprintChange" class="py-3">
<div class="flex items-start gap-2 p-2.5 rounded-md border border-warning/40 bg-warning-soft">
<AlertTriangle class="size-3.5 shrink-0 mt-0.5 text-warning" />
<p class="text-[11px] text-warning-text">
关闭阻断后,主机密钥变更将不再自动拦截。若服务器被中间人替换,
您可能在毫无提示的情况下连接到了错误的机器。
</p>
</div>
</div>
</div>
<div class="flex items-center justify-between">
<div>
<Label class="text-xs">指纹变更时阻断连接</Label>
<p class="text-[11px] text-muted-foreground">
已记录的主机换了密钥时,默认拒绝连接,需用户显式核对后放行
</p>
</div>
<Switch v-model="security.blockOnFingerprintChange" />
</div>
<div class="flex items-center justify-between">
<div>
<Label class="text-xs">记录安全事件</Label>
<p class="text-[11px] text-muted-foreground">
把主机密钥确认、指纹变更等事件写入日志,便于事后追溯
</p>
</div>
<Switch v-model="security.auditLog" />
</div>
<div
v-if="!security.blockOnFingerprintChange"
class="flex items-start gap-2 p-2.5 rounded-md border border-amber-500/40 bg-amber-500/10"
>
<AlertTriangle class="size-3.5 shrink-0 mt-0.5 text-amber-600 dark:text-amber-400" />
<p class="text-[11px] text-amber-700 dark:text-amber-400">
关闭阻断后,主机密钥变更将不再自动拦截。若服务器被中间人替换,
您可能在毫无提示的情况下连接到了错误的机器。
</p>
</div>
</SettingGroup>
<!-- 保存按钮已移除:改动经 400ms 防抖自动写回(即时生效) -->
</div>
</div>
</div>
</ScrollArea>
<!-- ===== Shell 删除确认 ===== -->
<Dialog :open="pendingShellDelete !== null" @update:open="(v: boolean) => !v && (pendingShellDelete = null)">
@@ -1,6 +1,6 @@
<script setup lang="ts">
/**
* 终端状态栏:把「当前会话的客观事实」摆在最下面一行。
* 终端状态栏:把「当前会话的客观事实」摆在卡片最下面一行。
*
* 为什么需要它:终端是全屏沉浸式的界面,用户容易忘记自己在哪台机器、
* 用哪个 shell、当前目录是什么。状态栏用最低的视觉权重承担这个职责。
@@ -10,11 +10,38 @@
* (看到乱码要立刻切)这两重身份的合体。若挪进设置页,用户在 GBK 服务器上看到
* 乱码时得先想「设置在哪」,而这个动作天然是「就在我看到乱码的那一行下面改」。
* 其余任何可写设置都不该进状态栏 —— 那会让它退化成一个迷你设置面板。
*
* # 与上方控制栏的关系(2026-09-21)
*
* 两条栏同属终端卡片:控制栏 h-9、状态栏也 h-9,字号统一 12px(`text-xs`)。
* 之前状态栏是 h-6 / 10px,与 44px 的控制栏摆在同一张卡片里像两条不同来源的
* 附属信息;现在它们是同一块屏幕的上下边框,等高才不显得卡片是歪的。
*
* # 编码为什么从原生 select 换成 Popover
*
* 早期用原生 `<select>` 的理由是「shadcn 的 Select 会在 body 末尾挂浮层,
* 而状态栏处在终端容器的裁剪区内」。但本项目的 `PopoverContent` 走
* `PopoverPortal`(同样挂到 body),**不受**卡片的 `overflow-hidden` 影响 ——
* 原生 select 的样式(系统字体、系统下拉、深色主题下白底)与其余界面不一致,
* 换来的那点「稳定性」其实是多余的谨慎。
*/
import { computed, ref } from 'vue'
import { Globe, TerminalSquare, FolderOpen, Hash, Wifi, WifiOff, Cpu, Languages, Loader2 } from '@lucide/vue'
import {
Check,
ChevronDown,
Cpu,
FolderOpen,
Globe,
Hash,
Languages,
Loader2,
TerminalSquare,
Wifi,
WifiOff
} from '@lucide/vue'
import { useTerminalStore } from '@/stores/terminalStore'
import { toast } from 'vue-sonner'
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
import {
ENCODING_OPTIONS,
encodingShortLabel,
@@ -57,13 +84,13 @@ const stateText = computed(() => {
const stateColor = computed(() => {
switch (props.session?.state) {
case 'established':
return 'text-emerald-600 dark:text-emerald-400'
return 'text-success'
case 'connecting':
case 'authenticating':
case 'degraded':
return 'text-amber-600 dark:text-amber-400'
return 'text-warning'
case 'failed':
return 'text-red-600 dark:text-red-400'
return 'text-danger'
default:
return 'text-muted-foreground'
}
@@ -72,8 +99,15 @@ const stateColor = computed(() => {
/** 会话标题(与标签栏一致的口径,统一走 store 的解析) */
const title = computed(() => store.sessionLabel(props.session) || '无会话')
/** SSH 目标串 / 本地 shell 名 */
const target = computed(() => store.sessionTarget(props.session))
/**
* 副标题:**只对 SSH 显示**。
*
* SSH 的标题是主机名、副标题是 `user@host:port`,后者是标题给不出的信息,必须留。
* 本地会话的标题已经是 shell 名(`PowerShell` / `cmd`,见后端 `shell::session_label`),
* 而由 `ShellProfile::name` 拼出的「Windows PowerShell」是设置页里的描述名 ——
* 二者并排会让人以为是两个不同的东西。本地的「我在哪」由右侧的 cwd 承担。
*/
const target = computed(() => (isSsh.value ? store.sessionTarget(props.session) : ''))
// ===== 编码选择器 =====
@@ -86,6 +120,9 @@ const encodingAlert = computed(() => isNonDefaultEncoding(encoding.value))
/** 切换中(防止连点造成多次广播与状态错乱) */
const switching = ref(false)
/** 编码浮层开合 */
const encodingOpen = ref(false)
/**
* 切换编码。
*
@@ -94,14 +131,14 @@ const switching = ref(false)
* 所以新编码只对「之后的输出」生效。这一点必须让用户知道 ——
* 否则他会看到「切了还是乱码」并认为功能坏了。
*/
async function onEncodingChange(value: unknown) {
async function pickEncoding(value: string) {
encodingOpen.value = false
const sid = props.session?.id
const next = String(value ?? '')
if (!sid || !next || next === encoding.value) return
if (!sid || !value || value === encoding.value) return
switching.value = true
try {
const norm = await store.setEncoding(sid, next)
const norm = await store.setEncoding(sid, value)
toast.success(`编码已切换为 ${norm}`, {
description: '新编码对之后的输出生效;已显示的历史内容不会自动重绘,可执行 clear 后重新查看'
})
@@ -116,20 +153,20 @@ async function onEncodingChange(value: unknown) {
<template>
<div
class="shrink-0 h-6 flex items-center gap-3 px-2.5 border-t border-border bg-card/20
text-[10px] text-muted-foreground select-none"
class="shrink-0 h-9 flex items-center gap-3 px-3 border-t border-border bg-card/20
text-xs text-muted-foreground select-none"
>
<div class="flex items-center gap-1.5 min-w-0">
<component :is="isSsh ? Globe : TerminalSquare" class="size-3 shrink-0" />
<span class="truncate max-w-[200px]">{{ title }}</span>
<component :is="isSsh ? Globe : TerminalSquare" class="size-3.5 shrink-0" />
<span class="truncate max-w-[220px]">{{ title }}</span>
</div>
<span v-if="target" class="truncate max-w-[220px] opacity-80">{{ target }}</span>
<span v-if="target" class="truncate max-w-[240px] opacity-80">{{ target }}</span>
<!-- shrink-0 + nowrap:状态栏 flex 项多,不加会被压缩到「已连接」逐字换行成竖排 -->
<div class="flex items-center gap-1 shrink-0 whitespace-nowrap">
<Wifi v-if="session?.state === 'established'" class="size-3" />
<WifiOff v-else class="size-3 opacity-50" />
<Wifi v-if="session?.state === 'established'" class="size-3.5" />
<WifiOff v-else class="size-3.5 opacity-50" />
<span :class="stateColor">{{ stateText }}</span>
</div>
@@ -137,54 +174,65 @@ async function onEncodingChange(value: unknown) {
<!--
编码选择器:非默认编码时整块变琥珀色。
只换文字不够 —— 「GBK」和「UTF-8」在 10px 字号下形状差异不明显,
只换文字不够 —— 「GBK」和「UTF-8」在 12px 字号下形状差异不明显,
用户扫一眼不会注意到自己正在用非默认编码。
-->
<div
v-if="session"
class="flex items-center gap-0.5 shrink-0 rounded px-1 -mx-0.5 transition-colors"
:class="encodingAlert
? 'bg-amber-500/15 text-amber-700 dark:text-amber-400'
: 'text-muted-foreground'"
:title="encodingAlert
? `当前使用非默认编码 ${encoding},中文乱码时可在此切换`
: '切换字符编码'"
>
<Loader2 v-if="switching" class="size-3 animate-spin" />
<Languages v-else class="size-3" />
<!--
用原生 select 而不是 shadcn 的 Select:后者是 Radix 实现,会在 body 末尾
挂一个 portal 浮层,而状态栏处在终端容器的裁剪区内。10px 字号 + 状态栏
这种「工具条」语境下,原生 select 的外观差异可以接受,换来的是不受
浮层层级与裁剪影响 —— 这是稳定性优先于观感的一处取舍。
-->
<select
:value="encoding"
:disabled="switching"
class="bg-transparent border-0 outline-none cursor-pointer appearance-none
text-[10px] text-inherit pr-0.5 disabled:cursor-wait"
@change="onEncodingChange(($event.target as HTMLSelectElement).value)"
>
<option v-for="opt in ENCODING_OPTIONS" :key="opt.value" :value="opt.value">
{{ opt.label }}
</option>
</select>
<span class="tabular-nums opacity-70">{{ encodingShortLabel(encoding) }}</span>
</div>
<Popover v-if="session" v-model:open="encodingOpen">
<PopoverTrigger as-child>
<button
type="button"
class="flex items-center gap-1 h-6 px-1.5 -mx-0.5 rounded shrink-0 whitespace-nowrap
transition-colors"
:class="
encodingAlert
? 'bg-warning-soft text-warning-text hover:text-warning-text'
: 'text-muted-foreground hover:bg-primary-soft hover:text-primary-soft-text'
"
>
<Loader2 v-if="switching" class="size-3.5 animate-spin" />
<Languages v-else class="size-3.5" />
<span>{{ encodingShortLabel(encoding) }}</span>
<ChevronDown class="size-3 opacity-70" />
</button>
</PopoverTrigger>
<PopoverContent align="end" class="w-56 p-1">
<p class="px-2 pb-1 pt-1 text-[11px] text-muted-foreground">字符编码</p>
<button
v-for="opt in ENCODING_OPTIONS"
:key="opt.value"
type="button"
class="flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-left text-xs
transition-colors hover:bg-accent/60"
:class="
opt.value === encoding
? 'font-medium text-foreground'
: 'text-muted-foreground hover:text-foreground'
"
@click="pickEncoding(opt.value)"
>
<span class="min-w-0 flex-1 truncate">{{ opt.label }}</span>
<Check v-if="opt.value === encoding" class="size-3.5 shrink-0 text-primary" />
</button>
<p class="px-2 pb-1 pt-1.5 text-[11px] leading-relaxed text-muted-foreground">
<template v-if="encodingAlert">当前是非默认编码,中文乱码时可在此切换。</template>
<template v-else>新编码只对之后的输出生效,已显示的内容不会重绘。</template>
</p>
</PopoverContent>
</Popover>
<div v-if="session?.cwd" class="flex items-center gap-1 min-w-0 max-w-[45%]">
<FolderOpen class="size-3 shrink-0" />
<FolderOpen class="size-3.5 shrink-0" />
<span class="truncate" :title="session.cwd">{{ session.cwd }}</span>
</div>
<div v-if="cols && rows" class="flex items-center gap-1 shrink-0">
<Hash class="size-3" />
<Hash class="size-3.5" />
<span>{{ cols }}×{{ rows }}</span>
</div>
<div class="flex items-center gap-1 shrink-0">
<Cpu class="size-3" />
<Cpu class="size-3.5" />
<span>{{ fontSize }}px</span>
</div>
</div>
</template>
</template>
+126 -46
View File
@@ -1,14 +1,47 @@
<script setup lang="ts">
/**
* 终端标签栏。
* 终端页的会话标签栏(终端页头部的左侧部分)。
*
* 职责:展示会话列表、切换、关闭、拖动重排、新建。
* 不含任何终端渲染逻辑——标签只是会话的「视图句柄」。
* 职责:展示会话列表、切换、关闭、拖动重排、新建会话。
* 不含任何终端渲染逻辑 —— 标签只是会话的「视图句柄」。
*
* # 视觉规格为什么与模块 Tabs 对齐
*
* 会话标签曾经是「浏览器标签」样式(px-2.5 py-1.5、两行信息),与模块级 Tabs
* 并排时读起来像两套互不相干的导航,叠加出「终端软件内嵌在 Thing 里」的观感。
* 现在统一为:text-xs font-medium、h-7、rounded-md、激活态 bg-accent,
* 与模块 Tabs 同高同字重;完整信息(副标题、sessionId)放悬停提示。
* 「新建」入口同理走 `Button` 的 ghost 变体 + `Tooltip`;提示的锚点用一层包裹 div
* (菜单触发器不能直接当 Tooltip 的 as-child 子节点,见 TerminalToolbar 里的说明)。
*
* # 新建入口为什么是下拉而不是单个「+」
*
* 终端页里换 shell 与连主机的频率不低于新建本地会话,而原实现只有「+」(只能
* 新建上一次用过的 shell),想连主机必须切到「主机」页再点连接。改成下拉后
* 两个入口都在手边,且与模块的主机/密钥配置天然联动(列表直接来自 store)。
*/
import { ref, watch } from 'vue'
import { Plus, X, TerminalSquare, Lock, Loader2, AlertTriangle } from '@lucide/vue'
import { computed, ref, watch } from 'vue'
import {
AlertTriangle,
ChevronDown,
Loader2,
Lock,
Plus,
Server,
TerminalSquare,
X
} from '@lucide/vue'
import { VueDraggable } from 'vue-draggable-plus'
import { Button } from '@/components/ui/button'
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuLabel,
DropdownMenuSeparator,
DropdownMenuTrigger
} from '@/components/ui/dropdown-menu'
import { useTerminalStore } from '@/stores/terminalStore'
import type { SessionInfo } from '@/types/terminal'
@@ -24,8 +57,13 @@ const props = defineProps<{
const emit = defineEmits<{
(e: 'select', id: string): void
(e: 'close', id: string): void
(e: 'new'): void
/** 新建本地会话;shellId 为空时用上次/默认的 shell */
(e: 'new', shellId?: string): void
/** 新建 SSH 会话 */
(e: 'connect', hostId: string): void
(e: 'reorder', ids: string[]): void
/** 跳转到模块的主机页(新建菜单里的「管理主机」) */
(e: 'manage-hosts'): void
}>()
/**
@@ -75,9 +113,12 @@ function onDragUpdate() {
)
}
/** 当前正在被鼠标悬停的标签(用于 alway 显示关闭按钮 vs 仅悬停显示) */
/** 当前正在被鼠标悬停的标签(用于始终显示关闭按钮 vs 仅悬停显示) */
const hoveredId = ref<string | null>(null)
/** 「新建」菜单是否展开:展开期间收起它的 Tooltip,避免提示压在菜单上 */
const newMenuOpen = ref(false)
function stateIcon(s: SessionInfo) {
if (s.state === 'connecting' || s.state === 'authenticating') return Loader2
if (s.state === 'failed') return AlertTriangle
@@ -93,35 +134,33 @@ function labelOf(s: SessionInfo) {
return store.sessionLabel(s)
}
/** 副标题:展示 cwd(本地)或 user@host(SSH),提供「我在哪」的一眼信息 */
function subtitleOf(s: SessionInfo) {
return store.sessionSubtitle(s)
}
/** 会话类型图标:SSH 加锁标记,本地用终端标记 */
function kindIcon(s: SessionInfo) {
return s.kind === 'ssh' ? Lock : TerminalSquare
}
/** Tooltip 全文:标题 + 副标题(cwd / user@host),替代标签内的两行排版 */
/** Tooltip 全文:标题 + 副标题(cwd / user@host)+ 会话 id(排障用,不进主界面) */
function tooltipText(s: SessionInfo) {
const sub = subtitleOf(s)
return sub ? `${labelOf(s)}\n${sub}` : labelOf(s)
const sub = store.sessionSubtitle(s)
const head = sub ? `${labelOf(s)}\n${sub}` : labelOf(s)
return `${head}\n会话 ID:${s.id}`
}
/** 可新建的本地 Shell(只列启用项,与设置页的可见性规则一致) */
const enabledShells = computed(() => store.shells.filter(s => s.enabled))
/** 已配置的 SSH 主机(按名称排;数据量小,直接排序而不是分组折叠) */
const sshHosts = computed(() =>
[...store.hosts].sort((a, b) =>
a.config.name.localeCompare(b.config.name, 'zh-CN')
)
)
</script>
<template>
<!-- shrink-0 而不是 flex-1:主区是纵向 flex,标签行是固定高度的头部,
用 flex-1 会与下方面板区平分剩余高度,标签芯片垂直悬在拉高出
的空白中间(窗口栏高度异常的根因) -->
<div class="flex items-center gap-1 min-w-0 shrink-0">
<div class="flex items-center gap-1 min-w-0 flex-1">
<!--
不要加 `target=".tab-track"`。
`target` 是给**跨容器拖拽**用的(把元素从 A 列表拖到 B 列表),它会被解析成
`$el.querySelector(target)`(见 vue-draggable-plus 源码 `R(v)` / `Sn(t, e)`)。
`querySelector` **只搜后代,不匹配元素自身** —— 而 `.tab-track` 正是这个组件
根元素自己的类名,所以必然返回 `null`,继而 `new Sortable(null)` 抛
`querySelector` **只搜后代,不匹配元素自身** —— 而 `.tab-track` 正是这个元素
自己的类名,所以必然返回 `null`,继而 `new Sortable(null)` 抛
「`el` must be an HTMLElement, not [object Null]」。
单容器内排序**本来就不需要 target**:`v-model` 绑定的数组顺序就是拖拽结果。
@@ -130,18 +169,14 @@ function tooltipText(s: SessionInfo) {
<VueDraggable
v-model="localList"
:animation="150"
class="tab-track flex items-center gap-1 min-w-0 overflow-x-auto scrollbar-none"
class="tab-track flex items-center gap-1 min-w-0 flex-1 overflow-x-auto scrollbar-none"
@update:model-value="onDragUpdate"
>
<!--
标签只显示单行标题;完整信息(标题 + cwd/user@host 副标题)放 Tooltip,
与其他模块的悬停提示范式一致。此前副标题直接排在标签里,标签变成两行高。
-->
<Tooltip v-for="s in localList" :key="s.id">
<TooltipTrigger as-child>
<div
class="group relative flex items-center gap-1.5 shrink-0 max-w-[220px] px-2.5 py-1.5
rounded-md cursor-pointer select-none transition-colors"
class="group relative flex items-center gap-1.5 shrink-0 max-w-[176px] h-7 px-2.5
rounded-md cursor-pointer select-none text-xs font-medium transition-colors"
:class="
s.id === activeId
? 'bg-accent text-accent-foreground'
@@ -153,16 +188,16 @@ function tooltipText(s: SessionInfo) {
>
<!-- 类型图标 / 状态指示:连接中用旋转的 loader,失败用警告三角 -->
<component
:is="stateIcon(s) || kindIcon(s)"
:is="stateIcon(s) || (s.kind === 'ssh' ? Lock : TerminalSquare)"
class="size-3.5 shrink-0"
:class="{
'animate-spin': isBusy(s),
'text-red-500': s.state === 'failed',
'text-danger': s.state === 'failed',
'text-muted-foreground/60': s.state === 'closed'
}"
/>
<span class="text-xs truncate">{{ labelOf(s) }}</span>
<span class="truncate">{{ labelOf(s) }}</span>
<!-- 未读小圆点:有输出但当前未激活 -->
<span
@@ -196,20 +231,65 @@ function tooltipText(s: SessionInfo) {
</Tooltip>
</VueDraggable>
<!-- 新建按钮:固定在标签滚动区之外,避免被长标签列表挤到看不见 -->
<button
class="shrink-0 size-6 rounded flex items-center justify-center text-muted-foreground
hover:bg-accent hover:text-foreground transition-colors"
title="新建本地会话"
@click="emit('new')"
>
<Plus class="size-3.5" />
</button>
<!--
新建:固定在标签滚动区之外,避免被长标签列表挤到看不见。
Tooltip 的锚点是一层包裹 div(不能直接套在菜单触发器上,见 TerminalToolbar
里同一处说明);DropdownMenu 不绑 `v-model:open`,只监听 `@update:open`。
-->
<Tooltip :disabled="newMenuOpen">
<TooltipTrigger as-child>
<div class="inline-flex shrink-0">
<DropdownMenu @update:open="newMenuOpen = $event">
<DropdownMenuTrigger as-child>
<Button variant="ghost" size="sm" class="shrink-0 h-7 gap-0.5 px-1.5">
<Plus class="size-3.5" />
<ChevronDown class="size-3" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="start" class="w-56">
<DropdownMenuLabel>本地 Shell</DropdownMenuLabel>
<DropdownMenuItem
v-for="sh in enabledShells"
:key="sh.id"
@click="emit('new', sh.id)"
>
<TerminalSquare class="size-4" />{{ sh.name }}
</DropdownMenuItem>
<DropdownMenuItem v-if="enabledShells.length === 0" disabled>
没有可用的 Shell(到设置页探测)
</DropdownMenuItem>
<template v-if="sshHosts.length > 0">
<DropdownMenuSeparator />
<DropdownMenuLabel>SSH 主机</DropdownMenuLabel>
<DropdownMenuItem
v-for="h in sshHosts"
:key="h.config.id"
@click="emit('connect', h.config.id)"
>
<Lock class="size-4" />
<span class="truncate">{{ h.config.name }}</span>
<span class="ml-auto text-[10px] text-muted-foreground shrink-0">
{{ h.config.username ? `${h.config.username}@` : '' }}{{ h.config.host }}
</span>
</DropdownMenuItem>
</template>
<DropdownMenuSeparator />
<DropdownMenuItem @click="emit('manage-hosts')">
<Server class="size-4" />管理主机…
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</div>
</TooltipTrigger>
<TooltipContent>新建会话</TooltipContent>
</Tooltip>
</div>
</template>
<style scoped>
/* 标签栏横向滚动但不显示滚动条:滚动条会吃掉 8px 高度,让标签栏显得脏 */
/* 标签栏横向滚动但不显示滚动条:滚动条会吃掉高度,让标签栏显得脏 */
.scrollbar-none {
scrollbar-width: none;
}
@@ -1,45 +1,125 @@
<script setup lang="ts">
/**
* 终端工具栏:包裹当前会话的常用动作。
* 终端页**控制栏右侧的会话级操作组**(整行位于终端卡片顶部)。
*
* 设计原则:**只放「标签栏放不下的会话级动作」**。新建/关闭/切换在标签栏已有,
* 这里不重复;放的是搜索、字号、清屏、独立窗口这类低频但需要显式入口的操作。
* # 与标签栏的分工
*
* 新建/切换/关闭在标签栏(左侧),这里只放「作用于当前会话」的动作:
* 历史、片段、搜索、字体、清屏、独立窗口,以及收进「更多」菜单的次要动作。
*
* # 命令历史 / 命令片段为什么在这里(2026-09-22)
*
* 它们原本是模块「记录」页的两个分区,用户要「找一条以前敲过的命令」得先离开
* 终端、切到一个整页、再点一次页内分区开关 —— 三次动作只为了往命令行上填一行字。
* 现在它们是控制栏上紧挨着会话标签的两个 popover(`HistoryPopover` /
* `SnippetPopover`),填完即收起、回到终端。整页的排版(页头工具条、分区开关、
* 底部提示行)随之消失,那本来是为「页面」准备的结构,对浮层是纯浪费。
*
* 放在**最左**(搜索之前)而不是收进「更多」菜单:这是高频取用动作,
* 与「高频动作外露、低频配置性动作入菜单」的取舍一致。
*
* 两个浮层的开合状态由 `useRecordPopovers` 的模块级 ref 持有 ——
* 快捷键(Ctrl+Shift+H / S)与触发按钮必须读写同一份状态,见该文件说明。
* 触发器本身也不在这里:`HistoryPopover` / `SnippetPopover` 各自是「按钮 + 浮层」
* 的整体(内容、开合、编辑对话框都在内部),本组件只负责摆放位置。
*
* # 为什么用「更多」菜单而不是全部铺成图标
*
* 会话级动作有十来个(端口转发、文件面板、会话日志、日志位置、模板、AI 助手…)。
* 全铺成图标会占掉半行宽度,把左侧的会话标签挤到只剩一两个可见 ——
* 而标签是终端页最主要的导航。取舍与主机/密钥页一致:**高频动作外露,
* 低频配置性动作入菜单**。
*
* # 字号为什么收进 popover
*
* 原先「缩小 / 放大 / 重置」是三个并排图标:图标语义弱(`-` / `+` / 回退箭头放在
* 终端语境里没有唯一含义),且占用了三个按钮的宽度却只服务一件事。收成一个
* 「字体」按钮 + popover(滑块 + 当前值 + 重置)后,语义一目了然,也能直接跳到
* 想要的字号,而不是连点七八次。
*
* # 按钮一律用 Button 的 ghost 变体
*
* 这里曾经是自定义的 `.icon-btn` 类(hover 用中性的 `--accent` + `--foreground`),
* 与全项目「图标按钮 hover = 主题色字 + 半透明主题色底(`--primary-soft`)」
* 的规范不一致 —— 那是本项目统一在 `buttonVariants.ghost` 里定义的唯一口径。
* 现在直接用 `Button variant="ghost"`,不再自己写 hover 样式。
*
* # 提示用 Tooltip 而不是 title
*
* 原生 `title` 有约 1 秒延迟、样式不受主题控制、且无法承载换行说明。
* 全项目(侧栏、下载器等)的图标按钮都用 `Tooltip` + `TooltipContent`。
*
* 菜单触发器的提示要额外绕一步:Tooltip 的锚点用一层**包裹 div**,不能直接把
* `TooltipTrigger` 套在 `DropdownMenuTrigger` 上,也不要让它们互相当 as-child 子节点
* —— 那样菜单会点不开(详见模板里「更多」处的说明)。同时 DropdownMenu 不可绑
* `v-model:open`(受控 open 同样会让菜单打不开),只监听 `@update:open`。
*
* 提示一律 `side="bottom"`:本行的按钮位于卡片(或独立窗口)最顶部,
* 向上弹的提示会被窗口上边缘裁掉。
*/
import { ref } from 'vue'
import {
ChevronDown,
ChevronUp,
Eraser,
ExternalLink,
FileText,
FolderOpen,
FolderTree,
LayoutTemplate,
Minus,
MoreHorizontal,
Network,
Plus,
Pencil,
RotateCcw,
Search,
Eraser,
Sparkles,
X,
ChevronDown,
ChevronUp
Type,
X
} from '@lucide/vue'
import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input'
import { Slider } from '@/components/ui/slider'
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger
} from '@/components/ui/dropdown-menu'
import HistoryPopover from './HistoryPopover.vue'
import SnippetPopover from './SnippetPopover.vue'
import type { SessionInfo } from '@/types/terminal'
// 模板中直接使用 `sessionId` / `title` / `searching` 等,script 内无需局部变量
defineProps<{
const props = defineProps<{
/** 当前会话 id(null 表示没有会话,动作全部禁用) */
sessionId: string | null
/** 会话标题(用于显示「当前操作对象」) */
title: string
/** 当前会话(历史/片段需要它来判来源、过滤适用片段) */
session: SessionInfo | undefined
/** 搜索面板是否展开 */
searching: boolean
/** 是否有匹配结果的反馈文案(由父组件在搜索后设置) */
/** 搜索反馈文案(如「无匹配」) */
searchHint?: string
/** 当前会话是否为 SSH(决定是否显示文件面板按钮) */
/** 当前会话是否为 SSH(决定是否显示 SSH 专属动作) */
isSsh: boolean
/** 文件面板是否展开 */
sftpVisible: boolean
/** 当前会话是否正在记录日志 */
logging: boolean
/** 当前生效字号(含视图级临时覆盖,popover 里作为滑块初值) */
fontSize: number
/**
* 独立窗口模式(TerminalWindow 复用本组件时置真)。
*
* 隐藏三类只对「主窗口的终端页」成立的动作:
* - 「在独立窗口中打开」——自己就是那个窗口;
* - 文件面板 / 端口转发 / 会话模板 —— 它们开的是终端页里的面板与分屏布局,
* 独立窗口没有那套容器。
* 保留的动作(搜索 / 字体 / 清屏 / 重命名 / AI 助手 / 会话日志)都只依赖 store
* 与当前会话,在两种形态下语义一致。
*/
standalone?: boolean
}>()
const emit = defineEmits<{
@@ -48,12 +128,14 @@ const emit = defineEmits<{
(e: 'search', keyword: string): void
(e: 'search-next', keyword: string): void
(e: 'search-prev', keyword: string): void
/** 字号增量(父组件把它交给 stream.bumpFont,正负均可) */
(e: 'font', delta: number): void
(e: 'font-reset'): void
(e: 'clear'): void
(e: 'detach'): void
(e: 'rename'): void
(e: 'toggle-sftp'): void
/** 打开端口转发对话框(仅 SSH 会话显示按钮) */
/** 打开端口转发对话框(仅 SSH 会话显示菜单项) */
(e: 'open-forwards'): void
/** 开关当前会话的日志记录 */
(e: 'toggle-logging'): void
@@ -65,15 +147,15 @@ const emit = defineEmits<{
(e: 'open-ai'): void
}>()
/** 搜索输入(受控于工具栏,回车触发) */
/** 搜索输入(受控于本组件,回车触发) */
const keyword = ref('')
/**
* 每次查找都要把关键词随事件带出去。
*
* 早期版本只发 `search-next`(不带参数),依赖父组件「记住上次的关键词」——
* 但父组件并不持有工具栏的输入框内容,导致首次按 Enter 时搜索栏是空的、
* 什么都不会发生。关键词是工具栏的局部状态,只有这里知道它是什么,
* 但父组件并不持有这里的输入框内容,导致首次按 Enter 时搜索栏是空的、
* 什么都不会发生。关键词是本组件的局部状态,只有这里知道它是什么,
* 因此必须由这里显式传出。
*/
function onSearchNext() {
@@ -90,188 +172,226 @@ function closeSearch() {
keyword.value = ''
emit('toggle-search')
}
/** 「字体」popover 开合 */
const fontOpen = ref(false)
/** 「更多」菜单是否展开:展开期间收起它的 Tooltip,避免提示压在菜单上 */
const moreMenuOpen = ref(false)
/**
* 滑块 → 字号增量。
*
* 不新增「设置字号」的接口:`stream.bumpFont(delta)` 已经带上下限收敛(6–48),
* 传增量即可。这里用当前生效字号做基准 —— `bumpFont` 内部同样以
* 「临时覆盖值 ?? 设置值」为基准,两者一致,因此「基准 + 增量 = 目标值」。
*/
function onFontSlide(v: number[] | undefined) {
const raw = v?.[0]
if (raw === undefined) return
const delta = Math.round(raw) - props.fontSize
if (delta !== 0) emit('font', delta)
}
</script>
<template>
<div class="shrink-0 flex items-center gap-1 px-2 h-9 border-b border-border bg-card/20">
<!-- 当前会话标识:工具栏的动作都作用于它,必须显式写出来 -->
<div class="flex items-center gap-1.5 min-w-0 px-1">
<span class="text-xs font-medium truncate max-w-[220px]">{{ title || '无会话' }}</span>
<span v-if="sessionId" class="text-[10px] text-muted-foreground/60 shrink-0">
{{ sessionId }}
</span>
</div>
<div class="flex items-center gap-1 shrink-0">
<!--
===== 命令历史 / 命令片段(浮层,紧邻会话标签) =====
<div class="flex-1" />
这两个组件是「按钮 + 浮层」的整体(触发器、内容、开合状态、编辑对话框都在
各自内部),这里只负责摆位置 —— 见 HistoryPopover / SnippetPopover 的文件头。
-->
<HistoryPopover :session-id="sessionId" :session="session" />
<SnippetPopover :session-id="sessionId" :session="session" />
<div class="w-px h-4 bg-border mx-0.5 shrink-0" />
<!-- ===== 搜索 ===== -->
<div v-if="searching" class="flex items-center gap-1">
<div class="relative">
<Input
v-model="keyword"
placeholder="查找…"
class="h-6 w-[160px] text-xs"
autofocus
@keydown.enter="onSearchNext"
@keydown.shift.enter="onSearchPrev"
@keydown.esc="closeSearch"
/>
</div>
<button
class="size-6 rounded flex items-center justify-center text-muted-foreground hover:bg-accent"
title="上一个(Shift+Enter)"
@click="onSearchPrev"
>
<ChevronUp class="size-3.5" />
</button>
<button
class="size-6 rounded flex items-center justify-center text-muted-foreground hover:bg-accent"
title="下一个(Enter)"
@click="onSearchNext"
>
<ChevronDown class="size-3.5" />
</button>
<button
class="size-6 rounded flex items-center justify-center text-muted-foreground hover:bg-accent"
title="关闭搜索"
@click="closeSearch"
>
<X class="size-3.5" />
</button>
<Input
v-model="keyword"
placeholder="查找…"
class="h-7 w-[150px] text-xs"
autofocus
@keydown.enter="onSearchNext"
@keydown.shift.enter="onSearchPrev"
@keydown.esc="closeSearch"
/>
<!-- 无匹配时给一行文字反馈:只有箭头变灰的话,用户会以为搜索没生效 -->
<span v-if="searchHint" class="text-[10px] text-warning shrink-0">
{{ searchHint }}
</span>
<Tooltip>
<TooltipTrigger as-child>
<Button variant="ghost" size="icon-sm" @click="onSearchPrev">
<ChevronUp class="size-3.5" />
</Button>
</TooltipTrigger>
<TooltipContent side="bottom">上一个匹配(Shift+Enter)</TooltipContent>
</Tooltip>
<Tooltip>
<TooltipTrigger as-child>
<Button variant="ghost" size="icon-sm" @click="onSearchNext">
<ChevronDown class="size-3.5" />
</Button>
</TooltipTrigger>
<TooltipContent side="bottom">下一个匹配(Enter)</TooltipContent>
</Tooltip>
<Tooltip>
<TooltipTrigger as-child>
<Button variant="ghost" size="icon-sm" @click="closeSearch">
<X class="size-3.5" />
</Button>
</TooltipTrigger>
<TooltipContent side="bottom">关闭搜索</TooltipContent>
</Tooltip>
</div>
<button
v-else
class="size-7 rounded flex items-center justify-center text-muted-foreground
hover:bg-accent hover:text-foreground transition-colors"
title="搜索"
@click="emit('toggle-search')"
>
<Search class="size-3.5" />
</button>
<div class="w-px h-4 bg-border mx-0.5" />
<Tooltip v-else>
<TooltipTrigger as-child>
<Button variant="ghost" size="icon-sm" @click="emit('toggle-search')">
<Search class="size-3.5" />
</Button>
</TooltipTrigger>
<TooltipContent side="bottom">搜索输出内容</TooltipContent>
</Tooltip>
<!-- ===== 字号 ===== -->
<button
class="size-7 rounded flex items-center justify-center text-muted-foreground
hover:bg-accent hover:text-foreground transition-colors"
title="缩小字号"
@click="emit('font', -1)"
>
<Minus class="size-3.5" />
</button>
<button
class="size-7 rounded flex items-center justify-center text-muted-foreground
hover:bg-accent hover:text-foreground transition-colors"
title="放大字号"
@click="emit('font', 1)"
>
<Plus class="size-3.5" />
</button>
<button
class="size-7 rounded flex items-center justify-center text-muted-foreground
hover:bg-accent hover:text-foreground transition-colors"
title="重置字号"
@click="emit('font-reset')"
>
<RotateCcw class="size-3.5" />
</button>
<div class="w-px h-4 bg-border mx-0.5" />
<!-- 会话模板:不依赖当前会话(可以没有会话时先拉起一组) -->
<button
class="size-7 rounded flex items-center justify-center text-muted-foreground
hover:bg-accent hover:text-foreground transition-colors"
title="会话模板"
@click="emit('open-templates')"
>
<LayoutTemplate class="size-3.5" />
</button>
<!-- AI 命令助手 -->
<button
class="size-7 rounded flex items-center justify-center text-muted-foreground
hover:bg-accent hover:text-foreground transition-colors disabled:opacity-40"
:disabled="!sessionId"
title="AI 命令助手"
@click="emit('open-ai')"
>
<Sparkles class="size-3.5" />
</button>
<div class="w-px h-4 bg-border mx-0.5 shrink-0" />
<!--
文件面板:只对 SSH 会话显示。
本地会话不给这个按钮,而不是给了再报错 —— 「看得见但点不动」比
「看不见」更让人困惑。
===== 字体与字号(视图级临时覆盖,不写回设置) =====
触发器只留图标:控制栏的按钮一律同规格(icon-sm + ghost),
多一个「字体」二字就会把左侧的会话标签挤窄,而这行的宽度预算已经被
标签、历史、片段、搜索占满。语义由 Tooltip 承担(与清屏/独立窗口一致)。
Tooltip 锚在包裹 div 上、Popover 在自己的子树里用 as-child(同「更多」)。
-->
<button
v-if="isSsh"
class="size-7 rounded flex items-center justify-center transition-colors
disabled:opacity-40"
:class="'text-muted-foreground hover:bg-accent hover:text-foreground'"
:disabled="!sessionId"
title="端口转发(-L / -R)"
@click="emit('open-forwards')"
>
<Network class="size-3.5" />
</button>
<Tooltip :disabled="fontOpen">
<TooltipTrigger as-child>
<div class="inline-flex shrink-0">
<Popover v-model:open="fontOpen">
<PopoverTrigger as-child>
<Button variant="ghost" size="icon-sm" class="shrink-0">
<Type class="size-3.5" />
</Button>
</PopoverTrigger>
<PopoverContent align="end" class="w-64 p-3">
<div class="flex items-center justify-between">
<span class="text-xs font-medium">字号</span>
<span class="text-xs tabular-nums text-muted-foreground">{{ fontSize }} px</span>
</div>
<Slider
class="mt-3"
:model-value="[fontSize]"
:min="6"
:max="48"
:step="1"
@update:model-value="onFontSlide"
/>
<div class="mt-3 flex items-center justify-between gap-2">
<span class="text-[11px] text-muted-foreground">只影响当前视图,不改设置</span>
<Button variant="ghost" size="xs" class="shrink-0 gap-1" @click="emit('font-reset')">
<RotateCcw class="size-3" />重置
</Button>
</div>
</PopoverContent>
</Popover>
</div>
</TooltipTrigger>
<TooltipContent side="bottom">字体与字号</TooltipContent>
</Tooltip>
<button
v-if="isSsh"
class="size-7 rounded flex items-center justify-center transition-colors
disabled:opacity-40"
:class="sftpVisible
? 'bg-accent text-foreground'
: 'text-muted-foreground hover:bg-accent hover:text-foreground'"
:disabled="!sessionId"
:title="sftpVisible ? '隐藏文件面板' : '显示文件面板'"
@click="emit('toggle-sftp')"
>
<FolderTree class="size-3.5" />
</button>
<div class="w-px h-4 bg-border mx-0.5 shrink-0" />
<button
class="size-7 rounded flex items-center justify-center transition-colors
disabled:opacity-40"
:class="logging
? 'bg-primary/15 text-primary'
: 'text-muted-foreground hover:bg-accent hover:text-foreground'"
:disabled="!sessionId"
:title="logging ? '停止记录会话日志' : '开始记录会话日志'"
@click="emit('toggle-logging')"
>
<FileText class="size-3.5" />
</button>
<!-- 打开日志文件:只在记录中显示(日志路径此时才有意义) -->
<button
v-if="logging"
class="size-7 rounded flex items-center justify-center text-muted-foreground
hover:bg-accent hover:text-foreground transition-colors"
title="在文件管理器中显示日志文件"
@click="emit('open-log-dir')"
>
<FolderOpen class="size-3.5" />
</button>
<Tooltip>
<TooltipTrigger as-child>
<Button variant="ghost" size="icon-sm" :disabled="!sessionId" @click="emit('clear')">
<Eraser class="size-3.5" />
</Button>
</TooltipTrigger>
<TooltipContent side="bottom">清屏</TooltipContent>
</Tooltip>
<button
class="size-7 rounded flex items-center justify-center text-muted-foreground
hover:bg-accent hover:text-foreground transition-colors disabled:opacity-40"
:disabled="!sessionId"
title="清屏"
@click="emit('clear')"
>
<Eraser class="size-3.5" />
</button>
<Tooltip v-if="!standalone">
<TooltipTrigger as-child>
<Button variant="ghost" size="icon-sm" :disabled="!sessionId" @click="emit('detach')">
<ExternalLink class="size-3.5" />
</Button>
</TooltipTrigger>
<TooltipContent side="bottom">在独立窗口中打开</TooltipContent>
</Tooltip>
<button
class="size-7 rounded flex items-center justify-center text-muted-foreground
hover:bg-accent hover:text-foreground transition-colors disabled:opacity-40"
:disabled="!sessionId"
title="在独立窗口中打开"
@click="emit('detach')"
>
<ExternalLink class="size-3.5" />
</button>
<!--
===== 更多(低频的配置性与 SSH 专属动作) =====
Tooltip 的锚点是一层**包裹 div**,而不是菜单触发器本身:
`TooltipTrigger` 与 `DropdownMenuTrigger` 若叠在一起(或把触发器当作它的
as-child 子节点),菜单会点不开。这里让 TooltipTrigger 只认这层普通元素,
菜单在自己的子树里照常用 `as-child`,两条 as-child 链互不相干。
注意 DropdownMenu **不能**绑 `v-model:open`(实测受控 open 会让菜单打不开),
只监听 `@update:open` 用于展开期间收起提示。
-->
<Tooltip :disabled="moreMenuOpen">
<TooltipTrigger as-child>
<div class="inline-flex shrink-0">
<DropdownMenu @update:open="moreMenuOpen = $event">
<DropdownMenuTrigger as-child>
<!--
「日志记录中」的高亮加在 svg 上:Button 的 ghost 变体已经给按钮设了
`text-fg-secondary`,同一元素上再写 `text-primary` 谁生效取决于
Tailwind 的输出顺序(不可靠);落在 svg 上则确定覆盖继承色。
-->
<Button
variant="ghost"
size="icon-sm"
class="shrink-0"
:class="logging ? '[&_svg]:text-primary' : ''"
>
<MoreHorizontal class="size-3.5" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end" class="w-52">
<DropdownMenuItem :disabled="!sessionId" @click="emit('rename')">
<Pencil class="size-4" />{{ standalone ? '重命名会话' : '重命名标签' }}
</DropdownMenuItem>
<DropdownMenuItem v-if="!standalone" @click="emit('open-templates')">
<LayoutTemplate class="size-4" />会话模板
</DropdownMenuItem>
<DropdownMenuItem :disabled="!sessionId" @click="emit('open-ai')">
<Sparkles class="size-4" />AI 命令助手
</DropdownMenuItem>
<!--
SSH 专属动作:本地会话不给菜单项,而不是给了再报错。
「看得见但点不动」比「看不见」更让人困惑。
独立窗口里不给(面板与分屏属于终端页),见 standalone 的说明。
-->
<template v-if="isSsh && !standalone">
<DropdownMenuSeparator />
<DropdownMenuItem :disabled="!sessionId" @click="emit('open-forwards')">
<Network class="size-4" />端口转发(-L / -R)
</DropdownMenuItem>
<DropdownMenuItem :disabled="!sessionId" @click="emit('toggle-sftp')">
<FolderTree class="size-4" />{{ sftpVisible ? '隐藏文件面板' : '显示文件面板' }}
</DropdownMenuItem>
</template>
<DropdownMenuSeparator />
<DropdownMenuItem :disabled="!sessionId" @click="emit('toggle-logging')">
<FileText class="size-4" :class="logging ? 'text-primary' : ''" />
{{ logging ? '停止记录会话日志' : '开始记录会话日志' }}
</DropdownMenuItem>
<DropdownMenuItem v-if="logging" @click="emit('open-log-dir')">
<FolderOpen class="size-4" />在文件管理器中显示日志
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</div>
</TooltipTrigger>
<TooltipContent side="bottom">更多操作</TooltipContent>
</Tooltip>
</div>
</template>
</template>
@@ -0,0 +1,917 @@
<script setup lang="ts">
/**
* 终端工作区(模块「终端」页的全部内容)。
*
* # 为什么从 TerminalModule 里拆出来
*
* 拆分前 TerminalModule.vue 有 1197 行,同时承担两件性质完全不同的事:
* (a) 模块级编排 —— 5 个 tab、tab 记忆、快捷键分发;
* (b) 终端页的全部交互 —— 搜索、右键菜单、分屏、SFTP、清屏、重命名、
* 模板拉起、AI 助手、会话日志、独立窗口。
*
* 后者是终端模块里体量最大、改动最频繁的部分,与前者混在一个文件里,
* 每次动终端页都要在 1200 行里找位置。现在 (b) 整体搬到这里,(a) 留在
* TerminalModule —— 它回到「薄编排」的形态,和 proxy / monitor 的模块根一致。
*
* # 布局口径(2026-09-21 把控制栏收进终端卡片)
*
* ```
* ┌───────────────────────────────────────────────┐
* │ ╭───────────────────────────────────────────╮ │
* │ │ [会话标签…] │ 历史 片段 搜索 字体 清屏 ⋯ │ │ ← 控制栏(h-9,带下边框)
* │ ├───────────────────────────────────────────┤ │
* │ │ 画布(xterm) [SFTP 面板] │ │
* │ ├───────────────────────────────────────────┤ │
* │ │ 状态栏:会话 · 目标 · 编码 · cwd · 尺寸 │ │ ← 与控制栏同高(h-9)
* │ ╰───────────────────────────────────────────╯ │
* └───────────────────────────────────────────────┘
* ```
*
* 控制栏最左的两个图标(历史 / 片段)各带一个浮层,见 `TerminalToolbar` 的文件头。
*
* 上一版把「会话标签 + 操作组」放在卡片**外面**当作页面级工具条。结果是卡片里
* 只有画布与状态栏,控制栏反而悬在页面顶部 —— 一个终端窗口的控件应该长在窗口上,
* 而不是浮在它上面。现在三层(控制栏 / 画布 / 状态栏)同属一张卡片,卡片就是
* 「终端窗口」本身;页面上也不再多出一条既不属于模块 Tabs、也不属于卡片的横条。
*
* 上下两条栏同为 h-9 且都用 12px 字号:它们是同一块屏幕的边框,视觉上必须等高,
* 否则卡片看起来是歪的。
*
* # 面板为什么不销毁
*
* 切标签时**不销毁**非激活的 `TerminalPane`,只用 `v-show` 隐藏。
* xterm 实例的构造代价不小(解析字体度量、建 WebGL 上下文、分配回滚缓冲),
* 保留实例还能保住滚动位置与选区 —— 用户切回来时应该还是刚才那一屏。
* 代价是不活跃会话也持有 WebGL 上下文,超出上限时 `useXterm` 会自动回退到
* DOM 渲染器。
*
* # stream 为什么由父组件传入
*
* `useTerminalStream()` 内部的 `tabOrder` / `panes` / `activeSessionId`
* 是**每次调用各创建一份**的局部状态。父组件(模块根)需要 `activeSession`
* 去喂历史/片段面板,本组件需要 `panes` 去排分屏 —— 若两边各调一次,
* 就会出现两套独立的标签顺序与分屏状态。因此全模块只创建一次,
* 由父组件通过 prop 传下来。
*/
import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
import { AlertTriangle, ChevronsRight, Loader2, Plus, Server, TerminalSquare, X } from '@lucide/vue'
import { toast } from 'vue-sonner'
import { useTerminalStore } from '@/stores/terminalStore'
import type { useTerminalStream } from '@/composables/useSessionStream'
import TerminalPane from './TerminalPane.vue'
import TerminalTabs from './TerminalTabs.vue'
import TerminalToolbar from './TerminalToolbar.vue'
import TerminalStatusBar from './TerminalStatusBar.vue'
import TerminalContextMenu from './TerminalContextMenu.vue'
import SftpPanel from './SftpPanel.vue'
import ForwardPanel from './ForwardPanel.vue'
import TemplatePanel from './TemplatePanel.vue'
import AiPanel from './AiPanel.vue'
import { Button } from '@/components/ui/button'
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle
} from '@/components/ui/dialog'
import type { SessionTemplate } from '@/types/terminal'
const props = defineProps<{
/** 窗口级会话编排(只能由模块根创建一次,见文件头) */
stream: ReturnType<typeof useTerminalStream>
/** 模块初始化是否完成(完成前显示加载态) */
ready: boolean
}>()
const emit = defineEmits<{
/** 请求切换到模块的「主机」tab(空态与标签栏的「管理主机」入口) */
(e: 'go-hosts'): void
}>()
const store = useTerminalStore()
const {
activeSessionId,
activeSession,
orderedSessions,
effectiveAppearance,
confirmDialog,
selectSession,
closeTab,
applyOrder,
newLocalTab,
newSshTab,
bumpFont,
resetFont,
resolveConfirm,
isSplit,
splitLayout,
panes,
resetPanesTo,
addPane,
splitRight,
splitDown,
closePane,
toggleSplitDirection
} = props.stream
// ===== 面板引用(用于调用 fit / 搜索 / 清屏) =====
/** sessionId → TerminalPane 暴露的方法。用普通 Map:面板实例不需要响应式 */
const paneRefs = new Map<string, InstanceType<typeof TerminalPane>>()
function setPaneRef(sessionId: string, el: unknown) {
if (el) paneRefs.set(sessionId, el as InstanceType<typeof TerminalPane>)
else paneRefs.delete(sessionId)
}
function activePane() {
return activeSessionId.value ? paneRefs.get(activeSessionId.value) : undefined
}
/** 会话列表变化时清理面板引用,防止 Map 无限增长 */
watch(
() => store.sessions.map(s => s.id).join(','),
() => {
const alive = new Set(store.sessions.map(s => s.id))
for (const id of [...paneRefs.keys()]) {
if (!alive.has(id)) paneRefs.delete(id)
}
}
)
// ===== SFTP 文件面板 =====
/**
* 文件面板是**按会话**的开合状态(不全局开关)。
*
* 理由:面板显示的是「某个会话对应主机上的目录」,切到本地会话标签时
* 继续显示上一个 SSH 主机的文件会让人误以为在看本机 —— 那是个危险的误会。
* 因此面板只在 activeSession 是 SSH 时可用,且对每个会话独立记忆。
*/
const sftpVisible = ref(false)
const sftpWidth = ref(420)
const canShowSftp = computed(() => activeSession.value?.kind === 'ssh')
/** 面板标题用的会话名(store 的派生方法需要看到 hosts,故在这层取) */
const sftpSessionLabel = computed(() => store.sessionLabel(activeSession.value))
// 切到非 SSH 会话时收起面板:见上面关于「误以为是本机」的说明
watch(activeSessionId, () => {
if (!canShowSftp.value) sftpVisible.value = false
})
function toggleSftp() {
if (!canShowSftp.value) {
toast.info('文件管理器只对 SSH 会话可用(本地会话请用系统资源管理器)')
return
}
sftpVisible.value = !sftpVisible.value
}
/** 面板左边缘的拖拽调宽 */
function startResizeSftp(e: MouseEvent) {
e.preventDefault()
const startX = e.clientX
const startW = sftpWidth.value
const onMove = (ev: MouseEvent) => {
// 向左拖是变宽:面板贴右边缘,宽度 = 起点到鼠标的距离
const next = startW + (startX - ev.clientX)
sftpWidth.value = Math.min(Math.max(280, next), window.innerWidth - 360)
}
const onUp = () => {
document.removeEventListener('mousemove', onMove)
document.removeEventListener('mouseup', onUp)
}
document.addEventListener('mousemove', onMove)
document.addEventListener('mouseup', onUp)
}
// ===== 端口转发 / 会话模板 / AI 助手(低频配置,用 Dialog) =====
const forwardsOpen = ref(false)
const templatesOpen = ref(false)
const applyingTemplate = ref(false)
const aiOpen = ref(false)
/**
* 按模板拉起一组会话并排成布局。
*
* 逐条开会话:第 1 个作主面板(resetPanesTo 收敛布局),
* 其余依次 addPane —— 分屏方向沿用 splitDirection(默认左右)。
* 条目失败不中断整体(主机连不上不该挡住本地 Shell 拉起),
* 汇总成一条 toast;超分屏上限的孤儿会话按 splitTo 同款收掉。
*/
async function applyTemplate(t: SessionTemplate) {
if (applyingTemplate.value) return
applyingTemplate.value = true
const failures: string[] = []
let opened = 0
let first = true
try {
for (const e of t.entries.slice(0, 4)) {
try {
const info = e.kind === 'ssh' ? await newSshTab(e.targetId) : await newLocalTab()
if (!info) {
failures.push(`${e.label || '未知目标'}:没有可用的 Shell`)
continue
}
if (first) {
resetPanesTo(info.id)
first = false
} else if (!addPane(info.id)) {
// 超出分屏上限:把刚建的会话收掉,不留看不见的孤儿
await store.closeSession(info.id)
failures.push(`${e.label}:超出分屏上限`)
continue
}
opened++
} catch (err) {
failures.push(`${e.label || '未知目标'}:${String(err)}`)
}
}
} finally {
applyingTemplate.value = false
}
if (opened > 0 && failures.length === 0) {
toast.success(`已按模板「${t.name}」拉起 ${opened} 个会话`)
} else if (opened > 0) {
toast.warning(`已拉起 ${opened} 个,部分失败:${failures.join(';')}`)
} else {
toast.error(`模板「${t.name}」拉起失败:${failures.join(';') || '没有可用条目'}`)
}
}
/** 当前可见面板的会话 id(模板「保存当前布局」的捕获源) */
const currentPaneIds = computed(() => {
if (panes.value.length > 0) return panes.value.map(p => p.sessionId)
return activeSessionId.value ? [activeSessionId.value] : []
})
/** 终端上下文:当前会话的选中文本(供 AI 理解「接着上一步做什么」) */
function getTerminalContext(): string {
const id = activeSessionId.value
if (!id) return ''
return paneRefs.get(id)?.getSelection?.() ?? ''
}
/**
* 开关当前会话的日志。
*
* 成功提示里带日志路径——用户需要知道日志在哪才能在事后找到它;
* 开关状态本身由后端的 TERMINAL_STATE 事件刷新(SessionInfo.logging)。
*/
async function toggleLogging() {
const id = activeSessionId.value
const sess = activeSession.value
if (!id || !sess) return
try {
await store.toggleLogging(id, !sess.logging)
if (!sess.logging) {
const p = await store.logPath(id)
toast.success(p ? `已开始记录会话日志:${p}` : '已开始记录会话日志')
} else {
toast.success('已停止记录会话日志(文件已保留)')
}
} catch (e) {
toast.error(`切换日志记录失败:${String(e)}`)
}
}
/** 在文件管理器中显示当前日志文件 */
async function openLogDir() {
const id = activeSessionId.value
if (!id) return
try {
const p = await store.logPath(id)
if (!p) {
toast.info('当前会话未开启日志')
return
}
await store.revealLocalPath(p)
} catch (e) {
toast.error(`打开日志位置失败:${String(e)}`)
}
}
// ===== 搜索 =====
const searching = ref(false)
const searchHint = ref('')
function toggleSearch() {
searching.value = !searching.value
if (!searching.value) {
activePane()?.clearSearch?.()
searchHint.value = ''
}
}
function doSearch(keyword: string) {
const pane = activePane()
if (!pane) return
const found = pane.findNext?.(keyword)
searchHint.value = found === false ? '无匹配' : ''
}
function searchNext(keyword: string) {
const pane = activePane()
if (!pane) return
const found = pane.findNext?.(keyword)
searchHint.value = found === false ? '无匹配' : ''
}
function searchPrev(keyword: string) {
const pane = activePane()
if (!pane) return
const found = pane.findPrevious?.(keyword)
searchHint.value = found === false ? '无匹配' : ''
}
// ===== 会话操作 =====
const creating = ref(false)
/**
* 新建本地会话。
*
* `shellId` 由标签栏的「新建」下拉传入(用户明确选了某个 shell);
* 从空态、快捷键、分屏进来的调用都不带参数,走「上次使用的 shell」。
*/
async function handleNewLocal(shellId?: string) {
if (creating.value) return
creating.value = true
try {
const info = await newLocalTab({ shellId })
// 新建标签后把分屏容器收敛到它:否则会看到上一个标签的分屏布局残留
if (info) resetPanesTo(info.id)
} catch (e) {
toast.error(`新建会话失败:${String(e)}`)
} finally {
creating.value = false
}
}
/** 从标签栏的「新建」下拉里选中已保存主机 → 建立 SSH 会话 */
async function handleConnect(hostId: string) {
try {
const info = await newSshTab(hostId)
if (info) resetPanesTo(info.id)
} catch (e) {
// SSH 失败的具体原因(握手/认证/主机密钥)后端已写进 session.error,
// 这里只给一个总括提示,详细原因会显示在面板中央
toast.error(`连接失败:${String(e)}`)
}
}
// ===== 分屏 =====
async function handleSplit(dir: 'right' | 'down') {
try {
const r = await (dir === 'right' ? splitRight() : splitDown())
if (!r.ok) toast.info(r.message)
} catch (e) {
toast.error(`分屏失败:${String(e)}`)
}
}
/** 分屏网格的 CSS 布局类(与 splitLayout 一一对应) */
const splitGridClass = computed(() => {
switch (splitLayout.value) {
case 'v-split':
return 'grid-rows-2 grid-cols-1'
case 'h-split':
return 'grid-cols-2 grid-rows-1'
case 'grid':
return 'grid-cols-2 grid-rows-2'
default:
return 'grid-cols-1 grid-rows-1'
}
})
/**
* 实际渲染的面板列表:**全部会话常驻挂载**。
*
* 这是对文件头「全部保留实例,用 v-show 切换」承诺的落实。此前实现只渲染
* `panes` 里的会话,切标签会把其他会话的 TerminalPane 整个卸载——
* xterm 实例被 dispose、隐藏期间到达的输出因无订阅者被丢弃,
* 切回来就是一片空白(多标签基本不可用)。
*
* 现在的可见性规则:
* - 分屏激活时(`panes` 非空):只有分屏组内的会话可见;
* - 单面板时:只有激活会话可见。
* 不在可见集里的会话保持挂载(display:none),照常接收输出。
*/
const renderPanes = computed(() => {
const visible = new Set(
panes.value.length > 0
? panes.value.map(p => p.sessionId)
: activeSessionId.value
? [activeSessionId.value]
: []
)
return orderedSessions.value.map(s => ({
id: `pane-${s.id}`,
sessionId: s.id,
hidden: !visible.has(s.id)
}))
})
async function handleDetach() {
const id = activeSessionId.value
if (!id) return
try {
await store.detachSession(id)
toast.success('已在独立窗口中打开')
} catch (e) {
toast.error(`打开独立窗口失败:${String(e)}`)
}
}
function handleClear() {
const id = activeSessionId.value
if (!id) return
const pane = paneRefs.get(id)
if (!pane) return
const shellKind = store.shells.find(s => s.id === store.sessionById(id)?.targetId)?.kind
// 清屏是「让 shell 执行清屏」而不是「从 xterm 缓冲里删掉」——
// 后者只是视觉上清了,向上滚动仍能看到旧内容,且 shell 的行计数会错乱
void store.clearSession(id, shellKind)
pane.clear?.()
}
// ===== 标签重排 =====
/**
* 写回用户拖动后的标签顺序。
*
* 标签栏把拖动结果以「完整 id 列表」的形式抛上来,这里直接交给编排组合函数
* 的 `applyOrder` —— 由它负责过滤已消失的会话并补齐漏网的。
* 前端不做任何顺序推断(例如「谁到了谁前面」),因为拖动本身已经给出了完整答案,
* 再做推断只会引入「拖到末尾时位置漂移」这类边界问题。
*/
function handleReorder(ids: string[]) {
applyOrder(ids)
}
// ===== 右键菜单 =====
const contextMenu = ref<{ sessionId: string; x: number; y: number } | null>(null)
function closeContextMenu() {
contextMenu.value = null
}
/** 右键菜单的当前会话是否有选区(决定「复制」是否可用) */
const contextHasSelection = computed(() => {
const id = contextMenu.value?.sessionId
if (!id) return false
return !!paneRefs.get(id)?.getSelection?.()
})
const behavior = computed(() => store.settings?.selection ?? null)
/**
* 面板右键的统一入口。
*
* 三种行为共用这一个监听(`rightClick` 设置项决定走哪条):
* - `menu`(默认):弹出菜单。终端里的右键在不同软件里含义不同
* (Windows Terminal 粘贴、PuTTY 弹菜单),猜测意图容易误操作,
* 因此默认给显式菜单。
* - `paste`:直接粘贴。习惯 X11 的用户会期待这个。
* - `select-word`:选中光标下的词,随后仍弹菜单 —— 只选中不弹菜单
* 等于给了一个「无法后续操作」的选区,用户还得再右键一次。
*/
function onPaneContextMenu(payload: { sessionId: string; x: number; y: number }) {
const mode = behavior.value?.rightClick ?? 'menu'
if (mode === 'paste') {
// 粘贴的目标是「发出右键的那块面板」,而不是当前激活标签 ——
// 两者在分屏或标签快速切换时可能不一致
activeSessionId.value = payload.sessionId
void doPaste()
return
}
if (mode === 'select-word') {
paneRefs.get(payload.sessionId)?.selectWordAt?.(payload.x, payload.y)
}
contextMenu.value = payload
}
async function doCopy() {
const id = contextMenu.value?.sessionId ?? activeSessionId.value
if (!id) return
const text = paneRefs.get(id)?.getSelection?.()
if (!text) {
toast.info('没有选中内容')
return
}
const payload =
(behavior.value?.trimTrailingNewline ?? true) && text.endsWith('\n')
? text.replace(/\n+$/, '')
: text
try {
await navigator.clipboard.writeText(payload)
} catch (e) {
toast.error(`复制失败:${String(e)}`)
}
closeContextMenu()
}
/**
* 粘贴。
*
* 多行内容会先在终端里「攒着」而不是直接执行 —— 但 P0 不做确认弹窗,
* 因为 xterm 的 bracketed paste 模式(若 shell 启用)已经能让编辑器
* 正确处理多行。这里只负责把文本交给 PTY。
*/
async function doPaste() {
const id = contextMenu.value?.sessionId ?? activeSessionId.value
if (!id) return
try {
const text = await navigator.clipboard.readText()
if (!text) return
await store.write(id, text)
} catch (e) {
toast.error(`粘贴失败:${String(e)}`)
}
closeContextMenu()
}
function doSelectAll() {
const id = contextMenu.value?.sessionId ?? activeSessionId.value
if (!id) return
paneRefs.get(id)?.selectAll?.()
closeContextMenu()
}
function doClearFromMenu() {
const id = contextMenu.value?.sessionId
closeContextMenu()
if (id) {
activeSessionId.value = id
handleClear()
}
}
async function doCloseFromMenu() {
const id = contextMenu.value?.sessionId
closeContextMenu()
if (id) await closeTab(id)
}
function doRename() {
const id = contextMenu.value?.sessionId
closeContextMenu()
openRename(id)
}
/**
* 打开重命名对话框。
*
* 抽出来是因为有两处入口(右键菜单、工具栏「更多」菜单),原实现
* 在右键路径里**忘了打开对话框**——点了「重命名标签」什么都不发生。
* 两处共用同一个函数,这类「复制粘贴漏一行」的问题不会再出现。
*/
function openRename(id: string | null | undefined) {
if (!id) return
renameValue.value = store.sessionById(id)?.title ?? ''
renameTargetId.value = id
confirmRenameOpen.value = true
}
const confirmRenameOpen = ref(false)
const renameTargetId = ref<string | null>(null)
const renameValue = ref('')
watch(confirmRenameOpen, v => {
if (!v) renameTargetId.value = null
})
async function submitRename() {
const id = renameTargetId.value
if (!id) return
const title = renameValue.value.trim()
if (!title) {
toast.error('名称不能为空')
return
}
try {
await store.renameSession(id, title)
confirmRenameOpen.value = false
} catch (e) {
toast.error(`重命名失败:${String(e)}`)
}
}
// ===== 生命周期 =====
onMounted(() => {
// 点击任意处关闭右键菜单(冒泡阶段:面板自身的 click 也要能关掉菜单)
document.addEventListener('click', closeContextMenu)
})
onBeforeUnmount(() => {
document.removeEventListener('click', closeContextMenu)
})
/** 聚焦当前激活面板(供模块根在新建会话后调用,让键盘输入直接可用) */
async function focusActivePane() {
await nextTick()
paneRefs.get(activeSessionId.value ?? '')?.focus?.()
}
/**
* 暴露给模块根的动作集合。
*
* 这些动作由**模块级快捷键**触发(见 TerminalModule 的 useTerminalKeys),
* 但状态与实现属于终端页(搜索框开合、右键菜单目标、SFTP 面板开合…),
* 因此模块根做一次转发。用显式清单而不是把整个 setup 作用域暴露出去:
* 新增动作时必须两边同时改,不会被静默漏掉。
*
* 标签导航类的动作(切标签、关标签、编号跳转)不在此列 —— 它们的状态在
* `useTerminalStream` 里,模块根可以直接调用。
*/
defineExpose({
doCopy,
doPaste,
toggleSearch,
handleClear,
handleNewLocal,
handleSplit,
handleDetach,
toggleSftp,
openRename,
focusActivePane
})
</script>
<template>
<div class="flex flex-col h-full min-h-0">
<!--
===== 终端卡片:控制栏 + 画布 + 状态栏 =====
三层同属一张卡片 —— 卡片就是「终端窗口」本身。圆角与边框不再只是给
xterm 划边界(画布不是内容流,必须有边界),也是控制栏与状态栏的容器。
shadow-sm 与项目 `<Card>` 一致:终端卡片在页面里就是「一张卡片」,
别的页面卡片有阴影而这块没有,会让终端页看起来像没铺完的骨架。
-->
<div
class="flex-1 min-h-0 flex flex-col rounded-lg border border-border overflow-hidden bg-background shadow-sm"
>
<!--
控制栏:会话标签(左)+ 会话级操作(右)。
与状态栏同为 h-9;px-1.5 让首尾按钮不贴到卡片圆角上。
-->
<div class="shrink-0 flex items-center gap-1 h-9 px-1.5 border-b border-border">
<TerminalTabs
:sessions="orderedSessions"
:active-id="activeSessionId"
@select="selectSession"
@close="closeTab"
@new="handleNewLocal"
@connect="handleConnect"
@reorder="handleReorder"
@manage-hosts="emit('go-hosts')"
/>
<div class="w-px h-4 bg-border shrink-0" />
<TerminalToolbar
:session-id="activeSessionId"
:session="activeSession"
:searching="searching"
:search-hint="searchHint"
:is-ssh="activeSession?.kind === 'ssh'"
:sftp-visible="sftpVisible"
:logging="activeSession?.logging ?? false"
:font-size="effectiveAppearance?.fontSize ?? 14"
@toggle-sftp="toggleSftp"
@open-forwards="forwardsOpen = true"
@toggle-logging="toggleLogging"
@open-log-dir="openLogDir"
@open-templates="templatesOpen = true"
@open-ai="aiOpen = true"
@rename="openRename(activeSessionId)"
@toggle-search="toggleSearch"
@search="doSearch"
@search-next="searchNext($event)"
@search-prev="searchPrev($event)"
@font="bumpFont($event)"
@font-reset="resetFont"
@clear="handleClear"
@detach="handleDetach"
/>
</div>
<div class="flex-1 min-h-0 flex">
<!-- 主区 -->
<div class="flex-1 min-w-0 relative">
<!-- 加载态 -->
<div v-if="!props.ready" class="absolute inset-0 flex items-center justify-center">
<div class="flex flex-col items-center gap-3">
<Loader2 class="size-5 animate-spin text-muted-foreground" />
<p class="text-xs text-muted-foreground">正在初始化终端…</p>
</div>
</div>
<!-- 空态 -->
<div
v-else-if="orderedSessions.length === 0"
class="absolute inset-0 flex items-center justify-center"
>
<div class="flex flex-col items-center gap-4 text-center">
<TerminalSquare class="size-10 text-muted-foreground/25" />
<div>
<p class="text-sm text-muted-foreground mb-1">还没有打开的会话</p>
<p class="text-xs text-muted-foreground/70">
点左上角的「+」新建本地 Shell 或连接已保存的主机
</p>
</div>
<div class="flex items-center gap-2">
<Button size="sm" class="gap-1.5" @click="handleNewLocal()">
<Plus class="size-3.5" />新建本地会话
</Button>
<Button variant="outline" size="sm" class="gap-1.5" @click="emit('go-hosts')">
<Server class="size-3.5" />管理主机
</Button>
</div>
</div>
</div>
<!-- 面板:全部保留实例,用 v-show 切换(见 renderPanes 说明) -->
<template v-else>
<!--
分屏容器。
1 个可见面板时就是普通全屏;2~4 个时按 splitLayout 排成 2 列或 2×2。
这里用 CSS grid 而不是嵌套 flex:分屏的维度组合是可枚举的
(单/左右/上下/2×2),网格能用一组静态类表达全部情形,
而 flex 需要嵌套 + 条件样式,逻辑会散在模板里。
隐藏面板(display:none)不占据网格单元,因此可见面板数决定布局。
-->
<div class="absolute inset-0 grid gap-px bg-border" :class="splitGridClass">
<div
v-for="p in renderPanes"
:key="p.id"
v-show="!p.hidden"
class="relative min-w-0 min-h-0"
>
<TerminalPane
:ref="(el: any) => setPaneRef(p.sessionId, el)"
:session-id="p.sessionId"
:appearance="effectiveAppearance"
:visible="!p.hidden"
@focus="selectSession(p.sessionId)"
@contextmenu="onPaneContextMenu"
/>
<!-- 非聚焦面板的边框高亮:分屏时「输入会去哪里」必须一眼可见 -->
<div
v-if="isSplit && p.sessionId === activeSessionId"
class="pointer-events-none absolute inset-0 ring-1 ring-inset ring-primary/40"
/>
<!-- 分屏面板的关闭按钮(只移除面板,不杀会话) -->
<button
v-if="isSplit"
class="absolute top-0.5 right-0.5 z-10 size-5 rounded flex items-center justify-center
bg-background/80 text-muted-foreground hover:text-foreground
opacity-0 hover:opacity-100 transition-opacity"
title="关闭此面板(会话保留)"
@click.stop="selectSession(p.sessionId); closePane()"
>
<X class="size-3" />
</button>
</div>
</div>
<!-- 分屏方向切换(仅两面板时有意义) -->
<button
v-if="panes.length === 2"
class="absolute bottom-2 right-2 z-10 h-6 px-2 rounded border border-border
bg-background/90 text-[10px] text-muted-foreground hover:text-foreground"
:title="splitLayout === 'h-split' ? '改为上下排列' : '改为左右排列'"
@click="toggleSplitDirection"
>
{{ splitLayout === 'h-split' ? '⬍ 上下' : '⬌ 左右' }}
</button>
</template>
</div>
<!-- ===== SFTP 文件面板(仅 SSH 会话) ===== -->
<template v-if="sftpVisible && canShowSftp && activeSessionId">
<!-- 拖拽条:面板贴右边缘,向左拖变宽 -->
<div
class="shrink-0 w-1 cursor-col-resize hover:bg-primary/40 transition-colors"
title="拖动调整宽度"
@mousedown="startResizeSftp"
/>
<aside class="shrink-0 border-l border-border" :style="{ width: `${sftpWidth}px` }">
<SftpPanel
:key="activeSessionId"
:session-id="activeSessionId"
:session-label="sftpSessionLabel"
:terminal-cwd="activeSession?.cwd ?? ''"
@close="sftpVisible = false"
/>
</aside>
</template>
<!-- 独立窗口的会话提示条:该会话在主窗口不可交互 -->
<div
v-if="activeSession?.detached"
class="shrink-0 w-8 border-l border-border flex items-start justify-center pt-3"
>
<button
class="text-muted-foreground hover:text-foreground transition-colors"
title="该会话已在独立窗口中打开,点击收回"
@click="activeSessionId && store.attachSession(activeSessionId)"
>
<ChevronsRight class="size-3.5" />
</button>
</div>
</div>
<!-- 状态栏:会话的客观事实(身份/状态/cwd/编码/尺寸) -->
<TerminalStatusBar
v-if="store.settings?.layout.showStatusBar !== false"
:session="activeSession"
:font-size="effectiveAppearance?.fontSize ?? 14"
:cols="activeSession?.cols"
:rows="activeSession?.rows"
/>
</div>
<!-- ===== 右键菜单(与独立窗口共用同一份,见该组件的文件头) ===== -->
<TerminalContextMenu
v-if="contextMenu"
:x="contextMenu.x"
:y="contextMenu.y"
:can-copy="contextHasSelection"
@copy="doCopy"
@paste="doPaste"
@select-all="doSelectAll"
@clear="doClearFromMenu"
@rename="doRename"
@close="doCloseFromMenu"
/>
<!-- ===== 端口转发(P2,SSH 会话) ===== -->
<ForwardPanel
v-model:open="forwardsOpen"
:session-id="activeSessionId"
:session-label="sftpSessionLabel"
/>
<!-- ===== 会话模板(P2) ===== -->
<TemplatePanel
v-model:open="templatesOpen"
:pane-ids="currentPaneIds"
@apply="applyTemplate"
/>
<!-- ===== AI 命令助手(P2) ===== -->
<AiPanel v-model:open="aiOpen" :session-id="activeSessionId" :get-context="getTerminalContext" />
<!-- ===== 关闭运行中会话的确认 ===== -->
<Dialog :open="confirmDialog !== null" @update:open="v => !v && resolveConfirm(false)">
<DialogContent class="max-w-sm" :show-close-button="false">
<DialogHeader>
<!-- break-all:标题含无可断行的长路径(如 powershell.exe 全路径),不 加会横向撑破容器 -->
<DialogTitle class="text-base flex items-start gap-2 break-all">
<AlertTriangle class="size-4 shrink-0 text-warning" />
<span class="min-w-0">{{ confirmDialog?.title }}</span>
</DialogTitle>
<DialogDescription class="text-xs break-all">{{ confirmDialog?.message }}</DialogDescription>
</DialogHeader>
<DialogFooter>
<Button variant="outline" size="sm" @click="resolveConfirm(false)">取消</Button>
<Button variant="destructive" size="sm" @click="resolveConfirm(true)">关闭会话</Button>
</DialogFooter>
</DialogContent>
</Dialog>
<!-- ===== 重命名 ===== -->
<Dialog v-model:open="confirmRenameOpen">
<DialogContent class="max-w-sm">
<DialogHeader>
<DialogTitle class="text-base">重命名标签</DialogTitle>
</DialogHeader>
<input
v-model="renameValue"
class="w-full h-8 px-2.5 rounded-md border border-border bg-transparent
text-sm outline-none focus:border-primary/60"
@keydown.enter="submitRename"
/>
<DialogFooter>
<Button variant="outline" size="sm" @click="confirmRenameOpen = false">取消</Button>
<Button size="sm" @click="submitRename">保存</Button>
</DialogFooter>
</DialogContent>
</Dialog>
</div>
</template>
+11 -2
View File
@@ -46,7 +46,9 @@ export function blankHost(id: string): SshHost {
startupCommand: '',
useProxy: false,
jumpIds: [],
encoding: 'utf-8'
encoding: 'utf-8',
// 默认开:这是「命令历史 / cwd 跟踪能用」的开关,新建主机不该默认关掉
injectShellIntegration: true
}
}
@@ -75,7 +77,14 @@ export function normalizeHost(raw: Partial<SshHost>, id: string): SshHost {
authMethod: raw.authMethod || base.authMethod,
// 数组字段单独兜底:旧配置没有该字段时是 undefined,直接展开会盖掉 base 的 []
jumpIds: Array.isArray(raw.jumpIds) ? raw.jumpIds : base.jumpIds,
encoding: raw.encoding || base.encoding
encoding: raw.encoding || base.encoding,
// 布尔字段同样单独兜底:旧配置里没有这个键,但**显式的 `undefined`**
// (`{...raw}` 会把它带进来)会盖掉 base 的 true,于是「老主机默认关闭注入」。
// 用 `typeof` 判断能把「没设置过」与「真的设成 false」区分开。
injectShellIntegration:
typeof raw.injectShellIntegration === 'boolean'
? raw.injectShellIntegration
: base.injectShellIntegration
}
}
@@ -0,0 +1,113 @@
/**
* 主机配置(`SshHost`)与 known_hosts 记录(`KnownHost`)的关联规则。
*
* # 为什么两侧不是一对一
*
* - **一台主机可能有多条记录**:SSH 在协商阶段会拿到服务端提供的多种主机密钥
* (ed25519 / rsa / ecdsa),每种算法各存一条指纹。所以「这台主机可信吗」
* 要看的是**一组**记录,而不是一条。
* - **记录可能没有对应的主机配置**:直接 `ssh user@addr` 连过一次、或配置被删掉
* 之后,记录仍在。这类「孤儿记录」只能靠地址去认,没有主机的显示名可用。
*
* 因此关联只能用「地址 + 端口」这一对稳定字段(忽略大小写,域名与 IP 的字面量
* 就是连接时用的那个地址)。**刻意不做**「端口缺省按 22 处理」之外的推断:
* 记录里存的是实际连接端口,配置里也是,两者不一致就是不同的目标。
*
* 归组/匹配逻辑集中在这里而不是各面板各写一遍:主机页的信任徽标、信任详情
* popover、孤儿区块三处都要用同一套判定,写三份必然在边界上分叉
* (表现为「徽标说已信任、详情里却找不到记录」)。
*/
import type { HostView, KnownHost, SshHost } from '@/types/terminal'
/** 匹配键:地址(小写)+ 端口。忽略 keyType —— 同一地址可能有多条算法记录 */
export function addressKey(host: string, port: number): string {
return `${host.trim().toLowerCase()}:${port}`
}
/** 单条记录的唯一键(地址 + 端口 + 算法),用作列表 key 与「忘记」的入参标识 */
export function recordKey(h: KnownHost): string {
return `${addressKey(h.host, h.port)}/${h.keyType}`
}
/** 按地址归组:一次遍历后供主机行与孤儿判定反复查,避免每行各扫一遍全表 */
export function groupByAddress(records: KnownHost[]): Map<string, KnownHost[]> {
const map = new Map<string, KnownHost[]>()
for (const r of records) {
const k = addressKey(r.host, r.port)
const list = map.get(k)
if (list) list.push(r)
else map.set(k, [r])
}
return map
}
/** 某台主机配置对应的全部记录(可能为空 = 还没成功连过) */
export function recordsForHost(
grouped: Map<string, KnownHost[]>,
config: Pick<SshHost, 'host' | 'port'>
): KnownHost[] {
return grouped.get(addressKey(config.host, config.port)) ?? []
}
/**
* 未被任何主机配置引用的记录。
*
* 这些记录同样是**有效且必须能管理**的:它们可能来自「连过但没存配置」,
* 或来自配置已删除的主机 —— 指纹变更提示同样会拦住用户,忘记它们的入口
* 不能因为「没有对应主机」而消失。
*/
export function orphanRecords(records: KnownHost[], hosts: HostView[]): KnownHost[] {
const known = new Set(hosts.map(v => addressKey(v.config.host, v.config.port)))
return records.filter(r => !known.has(addressKey(r.host, r.port)))
}
/**
* 信任状态。
*
* - `none`:还没有记录(从未成功连过,或刚清空过 known_hosts)
* - `trusted`:有记录且从未变更过
* - `changed`:有过指纹变更 —— 需要用户看一眼变更历史再决定
*/
export type TrustState = 'none' | 'trusted' | 'changed'
export function trustState(records: KnownHost[]): TrustState {
if (records.length === 0) return 'none'
return records.some(r => r.history.length > 0) ? 'changed' : 'trusted'
}
/** 指纹变更次数合计(同一主机的多种算法记录合并计数) */
export function changeCount(records: KnownHost[]): number {
return records.reduce((n, r) => n + r.history.length, 0)
}
/** 算法展示名(`ssh-ed25519` → `Ed25519`) */
export function keyTypeLabel(t: string): string {
const map: Record<string, string> = {
'ssh-ed25519': 'Ed25519',
'ssh-rsa': 'RSA',
'ecdsa-sha2-nistp256': 'ECDSA 256',
'ecdsa-sha2-nistp384': 'ECDSA 384',
'ecdsa-sha2-nistp521': 'ECDSA 521',
'ssh-dss': 'DSA'
}
return map[t] ?? t
}
/** RFC3339 → 本地可读时间(非法值原样返回,便于发现问题而不是显示「Invalid Date」) */
export function formatDateTime(rfc3339: string): string {
if (!rfc3339) return '—'
const d = new Date(rfc3339)
if (Number.isNaN(d.getTime())) return rfc3339
return d.toLocaleString('zh-CN', {
year: 'numeric',
month: '2-digit',
day: '2-digit',
hour: '2-digit',
minute: '2-digit'
})
}
/** 主机地址的可读形式(非 22 端口才带端口) */
export function addressLabel(host: string, port: number): string {
return port === 22 ? host : `${host}:${port}`
}
+37 -7
View File
@@ -1,6 +1,24 @@
import type { ModuleConfig } from '@/types/module'
import type { SearchIndexItem } from '@/stores/searchIndex'
/**
* 全局搜索索引。
*
* # `tab` 只能表达「哪个 tab」(现存取舍)
*
* 模块 Tabs 于 2026-09-20 由 7 项收敛为 5 项,2026-09-22 又收敛为 4 项
* (终端 / 主机 / 密钥 / 设置):
*
* - 「已知主机」不再是一个 tab,而是主机页里的**信任徽标**(点开看指纹与
* 变更历史)与列表末尾的**孤儿记录区块**,因此它指向 `hosts`;
* - 「命令历史」「命令片段」变成终端页控制栏上的两个 popover,因此指向
* `terminal`。
*
* **已知的取舍**:`SearchIndexItem.tab` 只能表达「哪个 tab」,无法表达
* 「tab 里的哪一个 popover / 哪台主机」,所以搜「命令片段」会落在终端页、
* 还需要再点一下控制栏的按钮。要为一次点击去改 moduleTabsStore /
* useModuleTabs / TitleBar 三处共享基建,收益不抵成本,故不做。
*/
const searchItems: SearchIndexItem[] = [
{
title: '终端',
@@ -16,7 +34,7 @@ const searchItems: SearchIndexItem[] = [
},
{
title: 'SSH 主机',
description: '管理 SSH 主机连接(含跳板机与自动登录)',
description: '管理 SSH 主机连接(含跳板机、主机密钥信任状态与自动登录)',
keywords: ['ssh', '主机', '服务器', '远程', '连接', 'host', '远程登录'],
tab: 'hosts'
},
@@ -28,9 +46,9 @@ const searchItems: SearchIndexItem[] = [
},
{
title: '已知主机(known_hosts)',
description: '查看与清理主机密钥指纹记录,导出供审阅',
description: '主机行的信任徽标查看密钥指纹与变更历史,可单条忘记、导入导出',
keywords: ['known_hosts', '指纹', '主机密钥', '信任', 'host key', '安全'],
tab: 'knownHosts'
tab: 'hosts'
},
{
title: '终端外观设置',
@@ -46,9 +64,21 @@ const searchItems: SearchIndexItem[] = [
},
{
title: '终端独立窗口',
description: '把会话拖出主窗口,独立窗口承载单个会话',
keywords: ['独立窗口', '分离', 'detach', '新窗口', '多屏'],
description: '把会话拖出主窗口,独立窗口承载单个会话;Ctrl+3 可直接唤起新建列表',
keywords: ['独立窗口', '分离', 'detach', '新窗口', '多屏', 'ctrl+3'],
tab: 'settings'
},
{
title: '命令历史',
description: '终端控制栏的「历史」按钮里按主机与会话检索已执行命令,支持收藏与再次填入',
keywords: ['历史', 'history', '命令', '收藏', '检索', '重放'],
tab: 'terminal'
},
{
title: '命令片段',
description: '终端控制栏的「片段」按钮里取用常用命令模板,支持占位符与危险命令二次确认',
keywords: ['片段', 'snippet', '模板', '占位符', '常用命令'],
tab: 'terminal'
}
]
@@ -79,6 +109,6 @@ export const moduleConfig: ModuleConfig = {
// 真正的清理在应用退出时由 Rust 侧 cleanup_on_exit 统一处理。
}
},
// 排在音乐(15)之后、剪贴板(20)之前:终端是高频入口,应靠前
order: 18
// 默认第 4 位:音乐 / 代理 / 下载 / 终端 / 翻译 / 硬件监控 / 截图 / 剪贴板 / 快捷面板 / 开发工具
order: 40
}
+54
View File
@@ -0,0 +1,54 @@
/**
* 终端「新建独立窗口」的窗口创建入口。
*
* # 为什么由前端创建这个窗口
*
* 会话窗口必须由 Rust 创建(label 要等于 `terminal-window-<sessionId>`,
* 见 `terminal/window.rs::label_for`)。但「选择会话」这一步发生在会话存在之前,
* 拿不到 sessionId,因此这个**临时选择窗口**由前端用 `WebviewWindow` 直接创建
* (label 前缀仍是 `terminal-window-`,以便命中 `capabilities/terminal-window.json`
* 的 `terminal-window-*` 授权)。
*
* 用户选完目标后,这个窗口会调用 `terminal_detach_session` —— 由 Rust 用规范 label
* 开真正的会话窗口 —— 然后关掉自己。
*/
import { WebviewWindow } from '@tauri-apps/api/webviewWindow'
import { createLogger } from '@/lib/logger'
const logger = createLogger('terminal')
/** label 前缀必须落在 `terminal-window-*`(capability 的 glob)里 */
const LABEL_PREFIX = 'terminal-window-new-'
/** 打开选择窗口。失败时抛出(调用方负责提示),否则用户按了快捷键只会看到「没反应」 */
export async function openTerminalPickerWindow(): Promise<void> {
const label = `${LABEL_PREFIX}${Date.now().toString(36)}`
const win = new WebviewWindow(label, {
url: 'index.html#new-terminal-window',
title: '新建终端窗口',
// 与 Rust 侧会话窗口同尺寸并同样居中:选完后本窗口关闭、会话窗口出现,
// 视觉上是「原地变成会话窗口」而不是两个窗口在屏幕上跳
width: 1000,
height: 620,
minWidth: 460,
minHeight: 320,
resizable: true,
decorations: false,
shadow: true,
center: true,
// **隐藏创建**:窗口初始底色是白的,而深浅色主题要等前端读 localStorage 后才应用
// —— 直接显示会先闪一下纯白窗口再变深色。由 NewTerminalWindow.vue 应用完主题
// (含 setBackgroundColor)再自己 show + setFocus。
visible: false,
focus: false,
})
// 创建是异步的:label 冲突、系统限制等失败必须显式抛出
win.once('tauri://error', e => {
logger.error(`打开终端选择窗口失败:${String(e)}`)
})
await new Promise<void>((resolve, reject) => {
win.once('tauri://created', () => resolve())
win.once('tauri://error', e => reject(new Error(String(e))))
})
}
+33
View File
@@ -0,0 +1,33 @@
/**
* 终端页控制栏上「历史 / 片段」两个 popover 的开合状态。
*
* # 为什么是模块级单例,而不是让工具栏自己持有
*
* 这两个 popover 有两个入口:控制栏上的触发按钮,以及快捷键
* (`Ctrl+Shift+H` / `Ctrl+Shift+S`,见 `TerminalModule` 的快捷键分发)。
* 若状态留在 `TerminalToolbar` 内部,快捷键就必须走「模块 → 终端页 → 工具栏」
* 三层转发,工具栏还得为此暴露一套命令式 API(`toggleHistory()` 之类)——
* 为一个布尔值付出的接口成本过高。放在模块级单例里,两边读写的是同一个 ref。
*
* 这是对模块内「状态由编排层持有、通过 props/事件传递」约定的一处**有意偏离**,
* 理由如上:这两个面板是**视图级浮层**,不属于任何一方的业务状态。
*
* 独立窗口是另一个 WebView 入口、另一份 JS 运行时,因此这里天然按窗口隔离,
* 不会出现「主窗口打开片段、独立窗口跟着弹出来」的问题。
*/
import { ref } from 'vue'
/** 命令历史 popover */
export const historyPopoverOpen = ref(false)
/** 命令片段 popover */
export const snippetsPopoverOpen = ref(false)
/** 翻转 / 显式设置「历史」popover(快捷键与触发按钮共用) */
export function toggleHistoryPopover(open?: boolean) {
historyPopoverOpen.value = open ?? !historyPopoverOpen.value
}
/** 翻转 / 显式设置「片段」popover */
export function toggleSnippetsPopover(open?: boolean) {
snippetsPopoverOpen.value = open ?? !snippetsPopoverOpen.value
}
+22 -24
View File
@@ -1,10 +1,9 @@
<script setup lang="ts">
import { onMounted, ref } from 'vue'
import { History, Languages, Settings } from '@lucide/vue'
import { computed, onMounted, ref } from 'vue'
import { useModuleTabs } from '@/lib/use-module-tabs'
import { useTranslateStore } from '@/stores/translateStore'
import { createLogger } from '@/lib/logger'
import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
import { Tabs, TabsContent } from '@/components/ui/tabs'
import TranslateWorkbench from './components/TranslateWorkbench.vue'
import TranslateSettings from './components/TranslateSettings.vue'
import TranslateHistory from './components/TranslateHistory.vue'
@@ -13,11 +12,13 @@ const logger = createLogger('translate')
const store = useTranslateStore()
const activeTab = ref('workbench')
const tabsListRef = useModuleTabs('translate', activeTab, [
/** 设置页走外部滚动(容器随内容增长),翻译 / 历史页占满高度 */
const isSettingsTab = computed(() => activeTab.value === 'settings')
useModuleTabs('translate', activeTab, [
{ value: 'workbench', label: '翻译' },
{ value: 'history', label: '历史' },
{ value: 'settings', label: '设置' }
])
], { alwaysVisible: true })
onMounted(async () => {
try {
@@ -29,31 +30,28 @@ onMounted(async () => {
</script>
<template>
<div class="h-full overflow-hidden p-6 flex flex-col">
<Tabs v-model="activeTab" class="flex-1 min-h-0 flex flex-col">
<div ref="tabsListRef" class="shrink-0">
<TabsList class="grid w-full max-w-md grid-cols-3 !bg-transparent !p-0 !shadow-none">
<TabsTrigger value="workbench" class="gap-1.5">
<Languages class="size-3.5" />翻译
</TabsTrigger>
<TabsTrigger value="history" class="gap-1.5">
<History class="size-3.5" />历史
</TabsTrigger>
<TabsTrigger value="settings" class="gap-1.5">
<Settings class="size-3.5" />设置
</TabsTrigger>
</TabsList>
</div>
<TabsContent value="workbench" class="flex-1 min-h-0 flex flex-col mt-4 tab-animate">
<!--
设置页改为「外部滚动」:内容超出视口时由主滚动区(ModuleContainer)接管,
与其他模块一致;翻译 / 历史页仍需占满高度,故按 tab 切换容器约束。
-->
<div
class="p-5 flex flex-col"
:class="isSettingsTab ? 'min-h-full' : 'h-full overflow-hidden'"
>
<Tabs
v-model="activeTab"
class="flex flex-col"
:class="isSettingsTab ? undefined : 'flex-1 min-h-0'"
>
<TabsContent value="workbench" class="flex-1 min-h-0 flex flex-col tab-animate">
<TranslateWorkbench />
</TabsContent>
<TabsContent value="history" class="flex-1 min-h-0 flex flex-col mt-4 tab-animate">
<TabsContent value="history" class="flex-1 min-h-0 flex flex-col tab-animate">
<TranslateHistory />
</TabsContent>
<TabsContent value="settings" class="flex-1 min-h-0 overflow-hidden mt-4 tab-animate">
<TabsContent value="settings" class="tab-animate">
<TranslateSettings />
</TabsContent>
</Tabs>
+7 -4
View File
@@ -5,6 +5,7 @@ import { listen, type UnlistenFn } from '@tauri-apps/api/event'
import { invoke } from '@tauri-apps/api/core'
import { CircleAlert, Copy, LoaderCircle, Pin, PinOff, X } from '@lucide/vue'
import { EVENTS, STORAGE_KEYS } from '@/lib/constants'
import { applyStoredAccent } from '@/lib/theme'
import { labelOf, promptNameOf } from '@/lib/translate/languages'
import {
copyToClipboard,
@@ -611,6 +612,8 @@ async function applyTheme() {
root.classList.remove('dark', 'effect-mica', 'effect-acrylic', 'effect-normal')
root.classList.add(`effect-${effect}`)
if (isDark) root.classList.add('dark')
// 主题色:与主窗口共用同一份设置
applyStoredAccent(root, isDark ? 'dark' : 'light', STORAGE_KEYS.appSettings)
const shell = rootEl.value
try {
@@ -697,7 +700,7 @@ onUnmounted(() => {
<!-- 取词失败:占用同一块位置给出原因与替代做法 -->
<template v-if="payload?.error">
<div class="flex items-start gap-2">
<CircleAlert class="mt-0.5 size-4 shrink-0 text-amber-600 dark:text-amber-400" />
<CircleAlert class="mt-0.5 size-4 shrink-0 text-warning-text" />
<div class="min-w-0 flex-1 space-y-1">
<p class="leading-relaxed">{{ payload.error }}</p>
<p class="text-[11px] text-muted-foreground">
@@ -846,7 +849,7 @@ onUnmounted(() => {
两侧内部滚动区各自封顶 25rem,超出即内部滚动 + 同步。
注意不能把 max-height 放在 grid 容器上:auto 行不受容器 max-height 钳制,
长内容会把行撑高、内部滚动条消失。 -->
<div class="grid min-h-[18rem] shrink-0 grid-cols-2 items-stretch gap-2">
<div class="grid min-h-72 shrink-0 grid-cols-2 items-stretch gap-2">
<!-- 左:原文(可编辑,翻译以编辑框内容为准) -->
<div
v-if="payload.text || payload.source === 'panel'"
@@ -856,7 +859,7 @@ onUnmounted(() => {
<textarea
ref="textareaRef"
v-model="editableText"
class="no-scrollbar field-sizing-content min-h-14 max-h-[25rem] w-full flex-auto resize-none overflow-y-auto bg-transparent leading-relaxed outline-none placeholder:text-muted-foreground/60"
class="no-scrollbar field-sizing-content min-h-14 max-h-100 w-full flex-auto resize-none overflow-y-auto bg-transparent leading-relaxed outline-none placeholder:text-muted-foreground/60"
spellcheck="false"
placeholder="输入或粘贴要翻译的内容…(Enter 翻译 · Alt+Enter 换行)"
title="可直接编辑原文;Enter 翻译,Alt+Enter 换行"
@@ -888,7 +891,7 @@ onUnmounted(() => {
@mousedown="enableEditing()"
@scroll.capture="onTargetScroll"
>
<ScrollArea class="min-h-0 max-h-[25rem] flex-auto">
<ScrollArea class="min-h-0 max-h-100 flex-auto">
<div class="px-0.5 pb-1">
<div v-if="translating" class="space-y-1 py-1">
<div class="flex items-center gap-2 text-muted-foreground">
@@ -311,7 +311,7 @@ const remove = () =>
<div
v-if="testResult"
class="space-y-1 rounded-md border p-2.5 text-[12px]"
:class="testResult.ok ? 'bg-emerald-50 dark:bg-emerald-950/20' : 'bg-red-50 dark:bg-red-950/20'"
:class="testResult.ok ? 'bg-success-soft' : 'bg-danger-soft'"
>
<div class="flex items-start gap-2">
<CircleCheck v-if="testResult.ok" class="mt-0.5 size-3.5 shrink-0" />
@@ -131,7 +131,7 @@ onBeforeUnmount(() => {
<template>
<div class="flex h-full min-h-0 flex-col">
<div class="mx-auto flex min-h-0 w-full max-w-3xl flex-col gap-3">
<div class="flex min-h-0 w-full flex-col gap-3">
<!-- 工具条 -->
<div class="flex shrink-0 flex-wrap items-center gap-2">
<div class="relative min-w-56 flex-1">
@@ -208,7 +208,7 @@ onBeforeUnmount(() => {
<div class="flex-1" />
<button
class="rounded p-1 transition-colors hover:bg-accent"
:class="{ 'text-amber-500': item.favorited }"
:class="{ 'text-warning': item.favorited }"
:title="item.favorited ? '取消收藏' : '收藏'"
@click="store.toggleHistoryFavorite(item.id)"
>
@@ -253,479 +253,477 @@ function templateWarning(text: string): string {
正在读取设置…
</div>
<div v-else class="h-full overflow-y-auto pb-2">
<div class="mx-auto max-w-3xl space-y-4">
<!-- ===== 引擎 ===== -->
<Card>
<CardHeader class="pb-3">
<CardTitle class="flex items-center gap-2 text-[14px]">
<Sparkles class="size-4" />
翻译引擎
</CardTitle>
<p class="text-[12px] text-muted-foreground">
同一类引擎可配置多个实例(如官方 API 与本地 Ollama 并存)。「自动」模式会按优先级依次尝试。
</p>
</CardHeader>
<CardContent class="space-y-3">
<div
v-for="view in store.engines"
:key="view.config.id"
class="rounded-lg border p-3"
>
<div class="flex items-center gap-2">
<span class="text-[13px] font-medium">{{ view.config.name }}</span>
<Badge variant="outline" class="text-[11px]">
{{ view.config.kind === 'ai' ? 'AI · OpenAI 兼容' : view.config.kind }}
</Badge>
<Badge variant="secondary" class="text-[11px] tabular-nums">
P{{ view.config.priority }}
</Badge>
<Badge v-if="view.ready" variant="secondary" class="text-[11px]">就绪</Badge>
<div v-else class="space-y-4 pb-2">
<!-- ===== 引擎 ===== -->
<Card>
<CardHeader class="pb-3">
<CardTitle class="flex items-center gap-2 text-[14px]">
<Sparkles class="size-4 text-primary" />
翻译引擎
</CardTitle>
<p class="text-[12px] text-muted-foreground">
同一类引擎可配置多个实例(如官方 API 与本地 Ollama 并存)。「自动」模式会按优先级依次尝试。
</p>
</CardHeader>
<CardContent class="space-y-3">
<div
v-for="view in store.engines"
:key="view.config.id"
class="rounded-lg border p-3"
>
<div class="flex items-center gap-2">
<span class="text-[13px] font-medium">{{ view.config.name }}</span>
<Badge variant="outline" class="text-[11px]">
{{ view.config.kind === 'ai' ? 'AI · OpenAI 兼容' : view.config.kind }}
</Badge>
<Badge variant="secondary" class="text-[11px] tabular-nums">
P{{ view.config.priority }}
</Badge>
<Badge v-if="view.ready" variant="secondary" class="text-[11px]">就绪</Badge>
<div class="flex-1" />
<div class="flex-1" />
<span class="text-[11px] text-muted-foreground">{{ view.config.model }}</span>
<Switch
:model-value="view.config.enabled"
@update:model-value="
v =>
store
.saveEngine({ ...view.config, enabled: Boolean(v) })
.catch(e => toast.error(String(e)))
"
/>
<Button
variant="outline"
size="sm"
@click="editingId = editingId === view.config.id ? '' : view.config.id"
>
{{ editingId === view.config.id ? '收起' : '编辑' }}
</Button>
</div>
<p v-if="view.issue" class="mt-1.5 flex items-center gap-1.5 text-[12px] text-amber-700 dark:text-amber-300">
<CircleAlert class="size-3.5 shrink-0" />
{{ view.issue }}
</p>
<div v-if="editingId === view.config.id" class="mt-3">
<EngineEditor :view="view" @deleted="editingId = ''" />
</div>
</div>
<Separator />
<div class="space-y-2">
<Label class="text-[12px]">新增引擎</Label>
<div class="flex gap-2">
<Select v-model="presetKey">
<SelectTrigger class="h-8 w-44 text-[12px]"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem v-for="p in ENGINE_PRESETS" :key="p.key" :value="p.key">
{{ p.label }}
</SelectItem>
</SelectContent>
</Select>
<Input
v-model="newEngineName"
class="h-8 flex-1 text-[13px]"
:placeholder="selectedPreset?.label ?? '引擎名称'"
/>
<Button size="sm" @click="addEngine">
<Plus />
新增
</Button>
</div>
<p v-if="selectedPreset" class="text-[11px] text-muted-foreground">
{{ selectedPreset.description }}
</p>
</div>
</CardContent>
</Card>
<!-- ===== 通用 ===== -->
<Card>
<CardHeader class="pb-3">
<CardTitle class="text-[14px]">通用</CardTitle>
</CardHeader>
<CardContent class="space-y-4">
<div class="flex items-center gap-3">
<Label class="w-32 shrink-0 text-[12px]">默认目标语言</Label>
<Select
:model-value="store.settings?.defaultTarget"
@update:model-value="v => patch({ defaultTarget: String(v) })"
>
<SelectTrigger class="h-8 w-40 text-[12px]"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem v-for="l in targetLanguages" :key="l.code" :value="l.code">
{{ l.label }}
</SelectItem>
</SelectContent>
</Select>
</div>
<div class="flex items-center gap-3">
<Label class="w-32 shrink-0 text-[12px]">默认引擎</Label>
<Select
:model-value="store.settings?.defaultEngineId"
@update:model-value="v => patch({ defaultEngineId: String(v) })"
>
<SelectTrigger class="h-8 w-52 text-[12px]"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem value="auto">自动(按优先级降级)</SelectItem>
<SelectItem
v-for="e in store.engines"
:key="e.config.id"
:value="e.config.id"
>
{{ e.config.name }}
</SelectItem>
</SelectContent>
</Select>
</div>
<div class="flex items-start gap-3">
<Label class="w-32 shrink-0 pt-0.5 text-[12px]">失败自动降级</Label>
<div>
<Switch
:model-value="store.settings?.autoFallback"
@update:model-value="v => patch({ autoFallback: Boolean(v) })"
/>
<p class="mt-1 text-[11px] text-muted-foreground">
开启后「自动」模式会在某个源失败时尝试下一个;关闭则只用默认引擎。
<br />无论开关如何,手动指定某个引擎时都不会降级——否则「指定了 A 却拿到 B 的译文」更难排查。
</p>
</div>
</div>
<div class="flex items-start gap-3">
<Label class="w-32 shrink-0 pt-0.5 text-[12px]">走代理模块</Label>
<div>
<Switch
:model-value="store.settings?.useProxy"
@update:model-value="v => patch({ useProxy: Boolean(v) })"
/>
<p class="mt-1 text-[11px] text-muted-foreground">
默认关闭。自建 LibreTranslate 在境内、MyMemory 与 DeepSeek 均可直连;
仅当翻译服务部署在境外或直连被拦截时打开。
</p>
</div>
</div>
</CardContent>
</Card>
<!-- ===== 历史 ===== -->
<Card v-if="store.settings">
<CardHeader class="pb-3">
<CardTitle class="text-[14px]">历史记录</CardTitle>
<p class="text-[12px] text-muted-foreground">
搜索走 SQLite FTS5 三元组索引;不足 3 个字符的关键词无法命中该索引,会退回全表扫描
——仍然搜得到,只是更慢。
</p>
</CardHeader>
<CardContent class="space-y-4">
<div class="flex items-start gap-3">
<Label class="w-32 shrink-0 pt-0.5 text-[12px]">记录历史</Label>
<div>
<Switch
:model-value="store.settings.history.enabled"
@update:model-value="v => patchHistory({ enabled: Boolean(v) })"
/>
<p class="mt-1 text-[11px] text-muted-foreground">
关闭后不再写入新记录,已有记录不受影响。
</p>
</div>
</div>
<div class="flex items-start gap-3">
<Label class="w-32 shrink-0 pt-1.5 text-[12px]">保留条数</Label>
<div>
<Input
v-model.number="maxItemsDraft"
type="number"
:min="HISTORY_MAX_ITEMS_MIN"
:max="HISTORY_MAX_ITEMS_MAX"
step="100"
class="h-8 w-32 text-[12px]"
@blur="commitMaxItems"
@keydown.enter="commitMaxItems"
/>
<p class="mt-1 text-[11px] text-muted-foreground">
超出后按时间淘汰最旧的非收藏记录({{ HISTORY_MAX_ITEMS_MIN }}–{{ HISTORY_MAX_ITEMS_MAX }})。
收藏条目不占这个额度,收藏得足够多时总占用会超过上限。
</p>
</div>
</div>
</CardContent>
</Card>
<!-- ===== 提示词模板 ===== -->
<Card v-if="templates">
<CardHeader class="pb-3">
<CardTitle class="text-[14px]">提示词模板</CardTitle>
<p class="text-[12px] text-muted-foreground">
<code class="rounded bg-muted px-1">{'{target}'}</code> 会替换为目标语言的自然语言名称,
<code class="rounded bg-muted px-1">{'{source}'}</code> 为源语言名称。
</p>
</CardHeader>
<CardContent class="space-y-3">
<div class="space-y-1.5">
<Label class="text-[12px]">翻译(默认模式)</Label>
<Textarea v-model="templates.translate" class="min-h-24 text-[12px]" />
<p v-if="templateWarning(templates.translate)" class="text-[11px] text-amber-700 dark:text-amber-300">
{{ templateWarning(templates.translate) }}
</p>
</div>
<details class="rounded-md border p-2.5">
<summary class="cursor-pointer select-none text-[12px] font-medium">
备用模板:润色 / 解释 / 总结(计划 P3 接入划词弹窗)
</summary>
<div class="mt-2 space-y-3">
<div class="space-y-1.5">
<Label class="text-[12px]">润色</Label>
<Textarea v-model="templates.polish" class="min-h-16 text-[12px]" />
</div>
<div class="space-y-1.5">
<Label class="text-[12px]">解释</Label>
<Textarea v-model="templates.explain" class="min-h-16 text-[12px]" />
</div>
<div class="space-y-1.5">
<Label class="text-[12px]">总结</Label>
<Textarea v-model="templates.summarize" class="min-h-16 text-[12px]" />
</div>
</div>
</details>
<Button size="sm" :disabled="!templatesDirty || savingTemplates" @click="saveTemplates">
<LoaderCircle v-if="savingTemplates" class="animate-spin" />
<Save v-else />
保存提示词
</Button>
</CardContent>
</Card>
<!-- ===== 翻译面板与划词取词 ===== -->
<Card v-if="store.settings">
<CardHeader class="pb-3">
<CardTitle class="text-[14px]">翻译面板</CardTitle>
<p class="text-[12px] text-muted-foreground">
按全局快捷键打开翻译面板:自动尝试读取<span class="text-foreground">当前划词</span>与
<span class="text-foreground">剪贴板首条</span>作为候选,↑↓ 选择、Enter 直接翻译;
也可以在原文框里手动输入(Enter 翻译,Alt+Enter 换行)。
</p>
</CardHeader>
<CardContent class="space-y-4">
<div class="flex items-center gap-3">
<Label class="w-32 shrink-0 text-[12px]">面板快捷键</Label>
<Input
v-model="shortcutDraft.panelShortcut"
class="h-8 w-40 text-[13px]"
placeholder="Ctrl+2"
/>
<span class="text-[11px] text-muted-foreground">全局生效;留空禁用</span>
</div>
<div class="flex flex-wrap items-center gap-2 pl-[8.75rem]">
<Button size="sm" :disabled="!shortcutsDirty || applyingShortcuts" @click="applyShortcuts">
<LoaderCircle v-if="applyingShortcuts" class="animate-spin" />
<Save v-else />
应用快捷键
</Button>
<Button variant="outline" size="sm" @click="previewPopup">
<Sparkles />
预览面板
</Button>
<span class="text-[11px] text-muted-foreground">
预览用固定样例文本走完整链路,便于确认窗口与翻译都正常
</span>
</div>
<Separator />
<div class="flex items-start gap-3">
<Label class="w-32 shrink-0 pt-0.5 text-[12px]">读取当前划词</Label>
<div>
<Switch
:model-value="store.settings.selection.enabled"
@update:model-value="v => patchSelection({ enabled: Boolean(v) })"
/>
<p class="mt-1 text-[11px] text-muted-foreground">
打开面板时尝试读取当前选中的文字作为第一条候选;关闭后仅提供剪贴板候选。
</p>
</div>
</div>
<div class="flex items-start gap-3">
<Label class="w-32 shrink-0 pt-0.5 text-[12px]">取词方式</Label>
<div class="space-y-1">
<Select
:model-value="store.settings.selection.mode || 'smart'"
@update:model-value="v => patchSelection({ mode: String(v) })"
>
<SelectTrigger class="h-8 w-56 text-[12px]"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem value="smart">智能(UIA 直读优先,失败再模拟复制)</SelectItem>
<SelectItem value="compat">兼容(只用模拟 Ctrl+C)</SelectItem>
<SelectItem value="clipboard">不取词(仅剪贴板候选)</SelectItem>
</SelectContent>
</Select>
<p class="max-w-xl text-[11px] text-muted-foreground">
「智能」直接从目标程序的无障碍接口读选区,<span class="text-foreground">不模拟按键、不占用剪贴板</span>,
因此不受「目标窗口提权」影响;读不到时自动退回兼容方式。
</p>
</div>
</div>
<div class="flex items-start gap-3">
<Label class="w-32 shrink-0 pt-0.5 text-[12px]">取词后还原剪贴板</Label>
<div>
<Switch
:model-value="store.settings.selection.restoreClipboard"
@update:model-value="v => patchSelection({ restoreClipboard: Boolean(v) })"
/>
<p class="mt-1 max-w-xl text-[11px] text-muted-foreground">
取词会临时占用剪贴板,还原可保留你原来的内容。注意:只有文本 / 图片 / 文件三种格式
能被备份还原;若原内容是不支持的格式(例如只含 HTML/RTF),选区文本会留在剪贴板上。
</p>
</div>
</div>
<div class="flex items-center gap-3">
<Label class="w-32 shrink-0 text-[12px]">取词字数上限</Label>
<Input
:model-value="store.settings.selection.maxChars"
type="number"
class="h-8 w-24 text-[13px]"
@update:model-value="
v => patchSelection({ maxChars: Math.max(1, Number(v) || 2000) })
"
/>
<span class="text-[11px] text-muted-foreground">
超出直接拒绝并提示,避免误选整篇文档时发一个又慢又费钱的请求
</span>
</div>
<div class="space-y-1.5">
<Label class="text-[12px]">跳过取词的应用(每行一个进程名)</Label>
<Textarea v-model="blacklistDraft" class="min-h-20 text-[12px]" spellcheck="false" />
<p class="text-[11px] text-muted-foreground">
这些应用里 Ctrl+C 是中断信号,取词时自动跳过。
</p>
<Button size="sm" :disabled="!blacklistDirty" @click="saveBlacklist">保存名单</Button>
</div>
<p class="rounded-md border bg-muted/30 p-2.5 text-[11px] leading-relaxed text-muted-foreground">
取不到划词的常见原因:当前没有选中任何文字、目标窗口以管理员权限运行
(兼容方式下系统会丢弃来自普通权限程序的模拟按键)、终端类应用(已默认跳过)、
该程序没有暴露选区给无障碍接口(智能方式下会退回兼容方式)。<br />
兜底路径:任何程序里都可以「选中 → 复制 → 打开翻译面板」,剪贴板首条会作为候选出现。
</p>
</CardContent>
</Card>
<!-- ===== 截图翻译 ===== -->
<Card v-if="store.settings">
<CardHeader class="pb-3">
<CardTitle class="flex items-center gap-2 text-[14px]">
<ScanText class="size-4" />
截图翻译
</CardTitle>
<p class="text-[12px] text-muted-foreground">
在截图覆盖层框选区域后点「翻译选区」,识别结果以非激活悬浮窗展示在选区旁。
</p>
</CardHeader>
<CardContent class="space-y-4">
<div class="flex items-center gap-3">
<Label class="w-32 shrink-0 text-[12px]">识别方式</Label>
<Select
:model-value="store.settings.screenshot.ocrMode"
<span class="text-[11px] text-muted-foreground">{{ view.config.model }}</span>
<Switch
:model-value="view.config.enabled"
@update:model-value="
v =>
patch({
screenshot: { ...store.settings!.screenshot, ocrMode: String(v) }
})
store
.saveEngine({ ...view.config, enabled: Boolean(v) })
.catch(e => toast.error(String(e)))
"
/>
<Button
variant="outline"
size="sm"
@click="editingId = editingId === view.config.id ? '' : view.config.id"
>
{{ editingId === view.config.id ? '收起' : '编辑' }}
</Button>
</div>
<p v-if="view.issue" class="mt-1.5 flex items-center gap-1.5 text-[12px] text-warning-text">
<CircleAlert class="size-3.5 shrink-0" />
{{ view.issue }}
</p>
<div v-if="editingId === view.config.id" class="mt-3">
<EngineEditor :view="view" @deleted="editingId = ''" />
</div>
</div>
<Separator />
<div class="space-y-2">
<Label class="text-[12px]">新增引擎</Label>
<div class="flex gap-2">
<Select v-model="presetKey">
<SelectTrigger class="h-8 w-44 text-[12px]"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem v-for="p in ENGINE_PRESETS" :key="p.key" :value="p.key">
{{ p.label }}
</SelectItem>
</SelectContent>
</Select>
<Input
v-model="newEngineName"
class="h-8 flex-1 text-[13px]"
:placeholder="selectedPreset?.label ?? '引擎名称'"
/>
<Button size="sm" @click="addEngine">
<Plus />
新增
</Button>
</div>
<p v-if="selectedPreset" class="text-[11px] text-muted-foreground">
{{ selectedPreset.description }}
</p>
</div>
</CardContent>
</Card>
<!-- ===== 通用 ===== -->
<Card>
<CardHeader class="pb-3">
<CardTitle class="text-[14px]">通用</CardTitle>
</CardHeader>
<CardContent class="space-y-4">
<div class="flex items-center gap-3">
<Label class="w-32 shrink-0 text-[12px]">默认目标语言</Label>
<Select
:model-value="store.settings?.defaultTarget"
@update:model-value="v => patch({ defaultTarget: String(v) })"
>
<SelectTrigger class="h-8 w-40 text-[12px]"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem v-for="l in targetLanguages" :key="l.code" :value="l.code">
{{ l.label }}
</SelectItem>
</SelectContent>
</Select>
</div>
<div class="flex items-center gap-3">
<Label class="w-32 shrink-0 text-[12px]">默认引擎</Label>
<Select
:model-value="store.settings?.defaultEngineId"
@update:model-value="v => patch({ defaultEngineId: String(v) })"
>
<SelectTrigger class="h-8 w-52 text-[12px]"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem value="auto">自动(按优先级降级)</SelectItem>
<SelectItem
v-for="e in store.engines"
:key="e.config.id"
:value="e.config.id"
>
{{ e.config.name }}
</SelectItem>
</SelectContent>
</Select>
</div>
<div class="flex items-start gap-3">
<Label class="w-32 shrink-0 pt-0.5 text-[12px]">失败自动降级</Label>
<div>
<Switch
:model-value="store.settings?.autoFallback"
@update:model-value="v => patch({ autoFallback: Boolean(v) })"
/>
<p class="mt-1 text-[11px] text-muted-foreground">
开启后「自动」模式会在某个源失败时尝试下一个;关闭则只用默认引擎。
<br />无论开关如何,手动指定某个引擎时都不会降级——否则「指定了 A 却拿到 B 的译文」更难排查。
</p>
</div>
</div>
<div class="flex items-start gap-3">
<Label class="w-32 shrink-0 pt-0.5 text-[12px]">走代理模块</Label>
<div>
<Switch
:model-value="store.settings?.useProxy"
@update:model-value="v => patch({ useProxy: Boolean(v) })"
/>
<p class="mt-1 text-[11px] text-muted-foreground">
默认关闭。自建 LibreTranslate 在境内、MyMemory 与 DeepSeek 均可直连;
仅当翻译服务部署在境外或直连被拦截时打开。
</p>
</div>
</div>
</CardContent>
</Card>
<!-- ===== 历史 ===== -->
<Card v-if="store.settings">
<CardHeader class="pb-3">
<CardTitle class="text-[14px]">历史记录</CardTitle>
<p class="text-[12px] text-muted-foreground">
搜索走 SQLite FTS5 三元组索引;不足 3 个字符的关键词无法命中该索引,会退回全表扫描
——仍然搜得到,只是更慢。
</p>
</CardHeader>
<CardContent class="space-y-4">
<div class="flex items-start gap-3">
<Label class="w-32 shrink-0 pt-0.5 text-[12px]">记录历史</Label>
<div>
<Switch
:model-value="store.settings.history.enabled"
@update:model-value="v => patchHistory({ enabled: Boolean(v) })"
/>
<p class="mt-1 text-[11px] text-muted-foreground">
关闭后不再写入新记录,已有记录不受影响。
</p>
</div>
</div>
<div class="flex items-start gap-3">
<Label class="w-32 shrink-0 pt-1.5 text-[12px]">保留条数</Label>
<div>
<Input
v-model.number="maxItemsDraft"
type="number"
:min="HISTORY_MAX_ITEMS_MIN"
:max="HISTORY_MAX_ITEMS_MAX"
step="100"
class="h-8 w-32 text-[12px]"
@blur="commitMaxItems"
@keydown.enter="commitMaxItems"
/>
<p class="mt-1 text-[11px] text-muted-foreground">
超出后按时间淘汰最旧的非收藏记录({{ HISTORY_MAX_ITEMS_MIN }}–{{ HISTORY_MAX_ITEMS_MAX }})。
收藏条目不占这个额度,收藏得足够多时总占用会超过上限。
</p>
</div>
</div>
</CardContent>
</Card>
<!-- ===== 提示词模板 ===== -->
<Card v-if="templates">
<CardHeader class="pb-3">
<CardTitle class="text-[14px]">提示词模板</CardTitle>
<p class="text-[12px] text-muted-foreground">
<code class="rounded bg-muted px-1">{'{target}'}</code> 会替换为目标语言的自然语言名称,
<code class="rounded bg-muted px-1">{'{source}'}</code> 为源语言名称。
</p>
</CardHeader>
<CardContent class="space-y-3">
<div class="space-y-1.5">
<Label class="text-[12px]">翻译(默认模式)</Label>
<Textarea v-model="templates.translate" class="min-h-24 text-[12px]" />
<p v-if="templateWarning(templates.translate)" class="text-[11px] text-warning-text">
{{ templateWarning(templates.translate) }}
</p>
</div>
<details class="rounded-md border p-2.5">
<summary class="cursor-pointer select-none text-[12px] font-medium">
备用模板:润色 / 解释 / 总结(计划 P3 接入划词弹窗)
</summary>
<div class="mt-2 space-y-3">
<div class="space-y-1.5">
<Label class="text-[12px]">润色</Label>
<Textarea v-model="templates.polish" class="min-h-16 text-[12px]" />
</div>
<div class="space-y-1.5">
<Label class="text-[12px]">解释</Label>
<Textarea v-model="templates.explain" class="min-h-16 text-[12px]" />
</div>
<div class="space-y-1.5">
<Label class="text-[12px]">总结</Label>
<Textarea v-model="templates.summarize" class="min-h-16 text-[12px]" />
</div>
</div>
</details>
<Button size="sm" :disabled="!templatesDirty || savingTemplates" @click="saveTemplates">
<LoaderCircle v-if="savingTemplates" class="animate-spin" />
<Save v-else />
保存提示词
</Button>
</CardContent>
</Card>
<!-- ===== 翻译面板与划词取词 ===== -->
<Card v-if="store.settings">
<CardHeader class="pb-3">
<CardTitle class="text-[14px]">翻译面板</CardTitle>
<p class="text-[12px] text-muted-foreground">
按全局快捷键打开翻译面板:自动尝试读取<span class="text-foreground">当前划词</span>与
<span class="text-foreground">剪贴板首条</span>作为候选,↑↓ 选择、Enter 直接翻译;
也可以在原文框里手动输入(Enter 翻译,Alt+Enter 换行)。
</p>
</CardHeader>
<CardContent class="space-y-4">
<div class="flex items-center gap-3">
<Label class="w-32 shrink-0 text-[12px]">面板快捷键</Label>
<Input
v-model="shortcutDraft.panelShortcut"
class="h-8 w-40 text-[13px]"
placeholder="Ctrl+2"
/>
<span class="text-[11px] text-muted-foreground">全局生效;留空禁用</span>
</div>
<div class="flex flex-wrap items-center gap-2 pl-35">
<Button size="sm" :disabled="!shortcutsDirty || applyingShortcuts" @click="applyShortcuts">
<LoaderCircle v-if="applyingShortcuts" class="animate-spin" />
<Save v-else />
应用快捷键
</Button>
<Button variant="outline" size="sm" @click="previewPopup">
<Sparkles />
预览面板
</Button>
<span class="text-[11px] text-muted-foreground">
预览用固定样例文本走完整链路,便于确认窗口与翻译都正常
</span>
</div>
<Separator />
<div class="flex items-start gap-3">
<Label class="w-32 shrink-0 pt-0.5 text-[12px]">读取当前划词</Label>
<div>
<Switch
:model-value="store.settings.selection.enabled"
@update:model-value="v => patchSelection({ enabled: Boolean(v) })"
/>
<p class="mt-1 text-[11px] text-muted-foreground">
打开面板时尝试读取当前选中的文字作为第一条候选;关闭后仅提供剪贴板候选。
</p>
</div>
</div>
<div class="flex items-start gap-3">
<Label class="w-32 shrink-0 pt-0.5 text-[12px]">取词方式</Label>
<div class="space-y-1">
<Select
:model-value="store.settings.selection.mode || 'smart'"
@update:model-value="v => patchSelection({ mode: String(v) })"
>
<SelectTrigger class="h-8 w-56 text-[12px]"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem value="windows">本地 OCR(离线,零成本)</SelectItem>
<SelectItem value="vision">视觉模型直译(质量更高,需图像模型)</SelectItem>
<SelectItem value="smart">智能(UIA 直读优先,失败再模拟复制)</SelectItem>
<SelectItem value="compat">兼容(只用模拟 Ctrl+C)</SelectItem>
<SelectItem value="clipboard">不取词(仅剪贴板候选)</SelectItem>
</SelectContent>
</Select>
<p class="max-w-xl text-[11px] text-muted-foreground">
「智能」直接从目标程序的无障碍接口读选区,<span class="text-foreground">不模拟按键、不占用剪贴板</span>,
因此不受「目标窗口提权」影响;读不到时自动退回兼容方式。
</p>
</div>
</div>
<div class="flex items-start gap-3">
<Label class="w-32 shrink-0 pt-0.5 text-[12px]">取词后还原剪贴板</Label>
<div>
<Switch
:model-value="store.settings.selection.restoreClipboard"
@update:model-value="v => patchSelection({ restoreClipboard: Boolean(v) })"
/>
<p class="mt-1 max-w-xl text-[11px] text-muted-foreground">
取词会临时占用剪贴板,还原可保留你原来的内容。注意:只有文本 / 图片 / 文件三种格式
能被备份还原;若原内容是不支持的格式(例如只含 HTML/RTF),选区文本会留在剪贴板上。
</p>
</div>
</div>
<div class="flex items-center gap-3">
<Label class="w-32 shrink-0 text-[12px]">取词字数上限</Label>
<Input
:model-value="store.settings.selection.maxChars"
type="number"
class="h-8 w-24 text-[13px]"
@update:model-value="
v => patchSelection({ maxChars: Math.max(1, Number(v) || 2000) })
"
/>
<span class="text-[11px] text-muted-foreground">
超出直接拒绝并提示,避免误选整篇文档时发一个又慢又费钱的请求
</span>
</div>
<div class="space-y-1.5">
<Label class="text-[12px]">跳过取词的应用(每行一个进程名)</Label>
<Textarea v-model="blacklistDraft" class="min-h-20 text-[12px]" spellcheck="false" />
<p class="text-[11px] text-muted-foreground">
这些应用里 Ctrl+C 是中断信号,取词时自动跳过。
</p>
<Button size="sm" :disabled="!blacklistDirty" @click="saveBlacklist">保存名单</Button>
</div>
<p class="rounded-md border bg-muted/30 p-2.5 text-[11px] leading-relaxed text-muted-foreground">
取不到划词的常见原因:当前没有选中任何文字、目标窗口以管理员权限运行
(兼容方式下系统会丢弃来自普通权限程序的模拟按键)、终端类应用(已默认跳过)、
该程序没有暴露选区给无障碍接口(智能方式下会退回兼容方式)。<br />
兜底路径:任何程序里都可以「选中 → 复制 → 打开翻译面板」,剪贴板首条会作为候选出现。
</p>
</CardContent>
</Card>
<!-- ===== 截图翻译 ===== -->
<Card v-if="store.settings">
<CardHeader class="pb-3">
<CardTitle class="flex items-center gap-2 text-[14px]">
<ScanText class="size-4 text-primary" />
截图翻译
</CardTitle>
<p class="text-[12px] text-muted-foreground">
在截图覆盖层框选区域后点「翻译选区」,识别结果以非激活悬浮窗展示在选区旁。
</p>
</CardHeader>
<CardContent class="space-y-4">
<div class="flex items-center gap-3">
<Label class="w-32 shrink-0 text-[12px]">识别方式</Label>
<Select
:model-value="store.settings.screenshot.ocrMode"
@update:model-value="
v =>
patch({
screenshot: { ...store.settings!.screenshot, ocrMode: String(v) }
})
"
>
<SelectTrigger class="h-8 w-56 text-[12px]"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem value="windows">本地 OCR(离线,零成本)</SelectItem>
<SelectItem value="vision">视觉模型直译(质量更高,需图像模型)</SelectItem>
</SelectContent>
</Select>
</div>
<p
v-if="store.settings.screenshot.ocrMode === 'vision'"
class="rounded-md border bg-muted/30 p-2.5 text-[11px] leading-relaxed text-muted-foreground"
>
视觉直译会把截图上传给所选引擎:请在引擎设置中勾选「支持图像输入」并确认该模型支持图像。
识别与翻译一步完成,对表格、菜单等复杂排版效果更好。
</p>
<template v-else>
<div class="flex items-center gap-3">
<Label class="w-32 shrink-0 text-[12px]">识别语言</Label>
<Input
:model-value="store.settings.screenshot.ocrLang"
class="h-8 w-40 text-[13px]"
placeholder="auto"
@update:model-value="
v =>
patch({
screenshot: {
...store.settings!.screenshot,
ocrLang: String(v) || 'auto'
}
})
"
/>
<Button variant="outline" size="sm" :disabled="store.ocrLanguagesLoading" @click="store.loadOcrLanguages()">
<LoaderCircle v-if="store.ocrLanguagesLoading" class="animate-spin" />
{{ store.ocrLanguagesLoading ? '读取中…' : '可用语言' }}
</Button>
</div>
<p class="pl-35 text-[11px] text-muted-foreground">
auto 跟随系统语言配置;也可填 BCP-47 标签(如 en-US、ja)。
</p>
<p
v-if="store.settings.screenshot.ocrMode === 'vision'"
v-if="store.ocrLanguagesError"
class="rounded-md border border-destructive/40 bg-destructive/5 p-2.5 text-[11px] leading-relaxed text-destructive"
>
{{ store.ocrLanguagesError }}
</p>
<p
v-else-if="store.ocrLanguages"
class="rounded-md border bg-muted/30 p-2.5 text-[11px] leading-relaxed text-muted-foreground"
>
视觉直译会把截图上传给所选引擎:请在引擎设置中勾选「支持图像输入」并确认该模型支持图像。
识别与翻译一步完成,对表格、菜单等复杂排版效果更好。
<span class="text-foreground">系统已装 {{ store.ocrLanguages.length }} 个 OCR 语言包:</span>
{{ store.ocrLanguages.join('、') || '(无)' }}
<br />缺语言时,在系统「设置 → 时间和语言 → 语言和区域」添加并勾选「文本识别」。
</p>
</template>
<template v-else>
<div class="flex items-center gap-3">
<Label class="w-32 shrink-0 text-[12px]">识别语言</Label>
<Input
:model-value="store.settings.screenshot.ocrLang"
class="h-8 w-40 text-[13px]"
placeholder="auto"
@update:model-value="
v =>
patch({
screenshot: {
...store.settings!.screenshot,
ocrLang: String(v) || 'auto'
}
})
"
/>
<Button variant="outline" size="sm" :disabled="store.ocrLanguagesLoading" @click="store.loadOcrLanguages()">
<LoaderCircle v-if="store.ocrLanguagesLoading" class="animate-spin" />
{{ store.ocrLanguagesLoading ? '读取中…' : '可用语言' }}
</Button>
</div>
<p class="pl-[8.75rem] text-[11px] text-muted-foreground">
auto 跟随系统语言配置;也可填 BCP-47 标签(如 en-US、ja)。
<div class="flex items-start gap-3">
<Label class="w-32 shrink-0 pt-0.5 text-[12px]">自动翻译</Label>
<div>
<Switch
:model-value="store.settings.screenshot.autoTranslate"
@update:model-value="
v =>
patch({
screenshot: {
...store.settings!.screenshot,
autoTranslate: Boolean(v)
}
})
"
/>
<p class="mt-1 max-w-xl text-[11px] text-muted-foreground">
关闭后框选只做识别,译文需在悬浮窗手动触发。
</p>
<p
v-if="store.ocrLanguagesError"
class="rounded-md border border-destructive/40 bg-destructive/5 p-2.5 text-[11px] leading-relaxed text-destructive"
>
{{ store.ocrLanguagesError }}
</p>
<p
v-else-if="store.ocrLanguages"
class="rounded-md border bg-muted/30 p-2.5 text-[11px] leading-relaxed text-muted-foreground"
>
<span class="text-foreground">系统已装 {{ store.ocrLanguages.length }} 个 OCR 语言包:</span>
{{ store.ocrLanguages.join('、') || '(无)' }}
<br />缺语言时,在系统「设置 → 时间和语言 → 语言和区域」添加并勾选「文本识别」。
</p>
</template>
<div class="flex items-start gap-3">
<Label class="w-32 shrink-0 pt-0.5 text-[12px]">自动翻译</Label>
<div>
<Switch
:model-value="store.settings.screenshot.autoTranslate"
@update:model-value="
v =>
patch({
screenshot: {
...store.settings!.screenshot,
autoTranslate: Boolean(v)
}
})
"
/>
<p class="mt-1 max-w-xl text-[11px] text-muted-foreground">
关闭后框选只做识别,译文需在悬浮窗手动触发。
</p>
</div>
</div>
</CardContent>
</Card>
</div>
</div>
</CardContent>
</Card>
</div>
</template>
@@ -296,7 +296,7 @@ function onTargetScroll(e: Event) {
</Button>
</div>
<div v-if="showEngineWarning" class="mb-3 shrink-0 rounded-lg border border-amber-300/60 bg-amber-50 px-3 py-2 text-[12px] text-amber-900 dark:bg-amber-950/30 dark:text-amber-200">
<div v-if="showEngineWarning" class="mb-3 shrink-0 rounded-lg border border-warning/60 bg-warning-soft px-3 py-2 text-[12px] text-warning-text">
<div class="flex items-start gap-2">
<CircleAlert class="mt-0.5 size-3.5 shrink-0" />
<span>
@@ -305,7 +305,7 @@ function onTargetScroll(e: Event) {
</div>
</div>
<div class="grid min-h-[26rem] flex-1 grid-cols-2 gap-3">
<div class="grid min-h-104 flex-1 grid-cols-2 gap-3">
<div class="flex h-full min-h-0 flex-col gap-3">
<div ref="sourceWrapRef" class="flex min-h-0 flex-1">
<Textarea
+2 -2
View File
@@ -61,6 +61,6 @@ export const moduleConfig: ModuleConfig = {
defaultEnabled: true,
loader: () => import('./TranslateModule.vue'),
searchItems,
// 排在剪贴板(20)之后、截图(30)之前
order: 25
// 默认第 5 位(翻译是高频入口,紧跟终端之后)
order: 50
}
+15 -2
View File
@@ -4,6 +4,7 @@ import { invoke } from '@tauri-apps/api/core'
import { listen, type UnlistenFn } from '@tauri-apps/api/event'
import { getCurrentWindow } from '@tauri-apps/api/window'
import { STORAGE_KEYS } from '@/lib/constants'
import { applyAccent, readStoredAccent } from '@/lib/theme'
import { Effect, EffectState } from '@tauri-apps/api/window'
import {
Globe, Power, PowerOff, RefreshCw, Check, Monitor, Download,
@@ -39,7 +40,7 @@ const loadingAction = ref<string | null>(null)
const refreshing = ref(false)
const osdVisible = ref(false)
const nodeSelectOpen = ref(false)
let unlistenFns: UnlistenFn[] = []
const unlistenFns: UnlistenFn[] = []
/** 菜单关闭/失焦前重置状态:关闭节点下拉框并取消所有焦点,避免下次打开时残留 */
function resetMenuState() {
@@ -374,8 +375,10 @@ async function applyTheme() {
const root = document.documentElement
const { theme, effect } = readMainTheme()
const isDark = resolveIsDark(theme)
// 主题色也纳入缓存键:只比 theme|effect 时,改了主题色会因键未变而被跳过
const accent = readStoredAccent(STORAGE_KEYS.appSettings)
const key = `${theme}|${effect}|${isDark}`
const key = `${theme}|${effect}|${isDark}|${accent ?? 'default'}`
if (key === lastAppliedThemeKey) return
lastAppliedThemeKey = key
@@ -392,6 +395,9 @@ async function applyTheme() {
root.classList.add(`effect-${effect}`)
if (isDark) root.classList.add('dark')
// 主题色:与主窗口共用同一份设置(行内变量压住 .dark 规则,按当前模式整组重写)
applyAccent(root, accent, isDark ? 'dark' : 'light')
try {
const tauriWin = getCurrentWindow()
await tauriWin.clearEffects()
@@ -426,6 +432,13 @@ onMounted(async () => {
mq.addEventListener('change', onThemeChange)
unlistenFns.push(() => mq.removeEventListener('change', onThemeChange))
// 主窗口改主题/效果/主题色时同步(托盘菜单常驻,不监听就会一直用旧值)
const onStorage = (e: StorageEvent) => {
if (e.key === STORAGE_KEYS.appSettings) void applyTheme()
}
window.addEventListener('storage', onStorage)
unlistenFns.push(() => window.removeEventListener('storage', onStorage))
// 右键显示的合并窗口:浏览器/线程内收到 tray-menu-show(基础状态、菜单较小)后,
// 不给 150ms 窗口等完整状态(含节点)到达,再一次性定位显示最终尺寸。
// 避免"先以小菜单显示 → 节点数据到达 → 可见后二次 resize"造成的闪烁。