UI/细节调整
This commit is contained in:
1 parent
b018abd922
commit
bccd21fde5
135 files changed
+11393
-5104
No files matched your search
@@ -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); }
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -64,5 +64,5 @@ export const moduleConfig: ModuleConfig = {
|
||||
// 模块禁用时不停止引擎(引擎在应用退出时统一清理)
|
||||
}
|
||||
},
|
||||
order: 50
|
||||
order: 30
|
||||
}
|
||||
Reference in new issue
Block a user