滚动截图,细节调整
This commit is contained in:
1 parent
6b9f71da08
commit
27ad5d89a5
34 files changed
+3766
-559
No files matched your search
@@ -14,7 +14,6 @@ import { open as openDialog } from '@tauri-apps/plugin-dialog'
|
||||
import { commands } from '@/lib/bindings'
|
||||
import { useDownloaderStore, type DownloadTask, type DownloaderSettings, type TaskStatus, type CheckUrlResult } from '@/stores/downloaderStore'
|
||||
import { useModuleTabs } from '@/lib/use-module-tabs'
|
||||
import { useModuleTabsStore } from '@/stores/moduleTabsStore'
|
||||
import { createLogger } from '@/lib/logger'
|
||||
import { pendingNewDownload, pendingShowDownloadTasks } from '@/lib/trayEvents'
|
||||
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
|
||||
@@ -44,7 +43,7 @@ const logger = createLogger('downloader')
|
||||
|
||||
// ===== 主 Tab 状态 =====
|
||||
const activeTab = ref('tasks')
|
||||
const tabsStore = useModuleTabsStore()
|
||||
|
||||
const tabsListRef = useModuleTabs('downloader', activeTab, [
|
||||
{ value: 'tasks', label: '下载任务' },
|
||||
{ value: 'settings', label: '设置' },
|
||||
@@ -175,9 +174,9 @@ const showSecret = ref(false)
|
||||
// 下载设置快捷弹窗(任务页工具栏入口)
|
||||
const downloadSettingsOpen = ref(false)
|
||||
|
||||
// ===== 设置草案 =====
|
||||
// 设置页/快捷弹窗编辑的是本地草案,点击"保存"才写入 store.settings(生效值)并持久化;
|
||||
// 避免未保存的编辑污染全应用读取的生效值(主页代理开关、添加任务默认值等)
|
||||
// ===== 设置草案(即改即生效) =====
|
||||
// 设置页/快捷弹窗编辑的是本地草案,任一处改动后防抖自动保存,无需手动"保存";
|
||||
// store.settings 为全应用读取的生效值(主页代理开关、添加任务默认值等)
|
||||
const settingsDraft = ref<DownloaderSettings | null>(null)
|
||||
watch(
|
||||
() => store.settings,
|
||||
@@ -187,6 +186,27 @@ watch(
|
||||
{ immediate: true, deep: true }
|
||||
)
|
||||
|
||||
// 防抖自动保存:改动后延迟写入 store 并持久化;成功不提示,失败才 toast。
|
||||
// 用值与生效值是否相同来短路,避免 store round-trip 触发上面的同步 watch 造成无限循环。
|
||||
let saveDraftTimer = 0
|
||||
const persistSettingsDraft = async () => {
|
||||
if (!settingsDraft.value || !store.settings) return
|
||||
if (JSON.stringify(settingsDraft.value) === JSON.stringify(store.settings)) return
|
||||
try {
|
||||
await store.saveSettings({ ...settingsDraft.value })
|
||||
} catch (e) {
|
||||
toast.error('保存设置失败', { description: String(e) })
|
||||
}
|
||||
}
|
||||
watch(
|
||||
settingsDraft,
|
||||
() => {
|
||||
window.clearTimeout(saveDraftTimer)
|
||||
saveDraftTimer = window.setTimeout(persistSettingsDraft, 400)
|
||||
},
|
||||
{ deep: true }
|
||||
)
|
||||
|
||||
// ===== 任务列表:筛选 / 排序 / 搜索 / 分页 =====
|
||||
type StatusFilter = 'all' | TaskStatus
|
||||
type SortField = 'id' | 'name' | 'size'
|
||||
@@ -486,24 +506,19 @@ const handleAddDownload = async () => {
|
||||
const dir = addDir.value.trim()
|
||||
addingTask.value = true
|
||||
try {
|
||||
// HTTP 链接走原流程(含重复检查)
|
||||
// HTTP 链接:立即添加(后端先建占位任务返回,探测/分段/调度在后台进行,
|
||||
// 不会卡在慢速探测上;重复 URL 由后端去重,多次点击也不会堆积重复任务)
|
||||
if (httpUris.length > 0) {
|
||||
const checkEnabled = store.settings?.checkDuplicate ?? true
|
||||
if (checkEnabled) {
|
||||
duplicateSuccessCount.value = 0
|
||||
processUrlsWithCheck(httpUris, dir || undefined)
|
||||
} else {
|
||||
let successCount = 0
|
||||
for (const uri of httpUris) {
|
||||
try {
|
||||
await store.addTask(uri, undefined, dir || undefined, undefined, true)
|
||||
successCount++
|
||||
} catch (e) {
|
||||
logger.error(`添加 ${uri} 失败: ` + e)
|
||||
}
|
||||
let successCount = 0
|
||||
for (const uri of httpUris) {
|
||||
try {
|
||||
await store.addTask(uri, undefined, dir || undefined, undefined, true)
|
||||
successCount++
|
||||
} catch (e) {
|
||||
logger.error(`添加 ${uri} 失败: ` + e)
|
||||
}
|
||||
if (successCount > 0) finishAdd(successCount)
|
||||
}
|
||||
if (successCount > 0) finishAdd(successCount)
|
||||
}
|
||||
|
||||
// BT 链接:异步添加(立即返回,不卡在元数据解析)。后台解析,成功后弹文件勾选。
|
||||
@@ -711,48 +726,26 @@ const handleSelectSettingsDir = async () => {
|
||||
try {
|
||||
const selected = await openDialog({ directory: true, multiple: false })
|
||||
if (typeof selected === 'string' && settingsDraft.value) {
|
||||
await store.saveSettings({ ...settingsDraft.value, downloadDir: selected })
|
||||
toast.success('下载目录已更新')
|
||||
settingsDraft.value.downloadDir = selected
|
||||
}
|
||||
} catch (e) {
|
||||
toast.error('选择目录失败: ' + e)
|
||||
}
|
||||
}
|
||||
|
||||
// ===== 设置保存 =====
|
||||
const handleSaveSettings = async (): Promise<boolean> => {
|
||||
if (!settingsDraft.value) return false
|
||||
try {
|
||||
await store.saveSettings({ ...settingsDraft.value })
|
||||
toast.success('设置已保存')
|
||||
return true
|
||||
} catch (e) {
|
||||
toast.error('保存失败: ' + e)
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
/** 切换代理开关并立即保存(新任务/探测立即生效,正在下载的任务不受影响) */
|
||||
const toggleProxy = async () => {
|
||||
if (!store.settings) return
|
||||
const next = !store.settings.useProxy
|
||||
try {
|
||||
await store.saveSettings({ ...store.settings, useProxy: next })
|
||||
toast.success(next ? '已启用系统代理下载' : '已切换为直连下载')
|
||||
// 同步草稿,使工具栏与设置页开关状态一致
|
||||
if (settingsDraft.value) settingsDraft.value.useProxy = next
|
||||
} catch (e) {
|
||||
toast.error('切换失败: ' + e)
|
||||
}
|
||||
}
|
||||
|
||||
// 注册保存处理函数到标签栏 store(TitleBar 保存按钮调用)
|
||||
tabsStore.registerSave(handleSaveSettings)
|
||||
|
||||
// Dialog 保存:成功后关闭弹窗
|
||||
const handleDialogSave = async () => {
|
||||
const ok = await handleSaveSettings()
|
||||
if (ok) downloadSettingsOpen.value = false
|
||||
}
|
||||
|
||||
// ===== 扩展 =====
|
||||
// Thing Extension 已发布到 Microsoft Edge 加载项商店,暂定优先 Edge;后续如需支持 Chrome 商店再补充入口
|
||||
const EXTENSION_STORE_URL = 'https://microsoftedge.microsoft.com/addons/detail/thing-extension/fpcffdkeemoibkhldghjbkgbgbdpofbo'
|
||||
@@ -1045,7 +1038,7 @@ const toggleSortOrder = () => {
|
||||
</Button>
|
||||
</TooltipTrigger>
|
||||
<TooltipContent>
|
||||
{{ store.settings?.useProxy ? '使用系统代理(mihomo 开启系统代理时经其转发)' : '直连模式' }}
|
||||
{{ store.settings?.useProxy ? '使用 mihomo 代理(本地端口)' : '直连模式' }}
|
||||
</TooltipContent>
|
||||
</Tooltip>
|
||||
|
||||
@@ -1392,13 +1385,13 @@ const toggleSortOrder = () => {
|
||||
</div>
|
||||
<div class="flex items-center justify-between">
|
||||
<div class="flex flex-col gap-0.5">
|
||||
<Label for="dl-use-proxy" class="cursor-pointer">使用系统代理</Label>
|
||||
<span class="text-xs text-muted-foreground">下载时尊重系统代理设置(mihomo 开启系统代理时经其转发),关闭则强制直连</span>
|
||||
<Label for="dl-use-proxy" class="cursor-pointer">使用 mihomo 代理</Label>
|
||||
<span class="text-xs text-muted-foreground">下载时经本地 mihomo 代理(127.0.0.1:端口)转发,mihomo 未运行时自动直连;关闭则强制直连</span>
|
||||
</div>
|
||||
<Switch
|
||||
id="dl-use-proxy"
|
||||
:model-value="settingsDraft?.useProxy ?? true"
|
||||
@update:model-value="(v: boolean) => settingsDraft && (settingsDraft.useProxy = v)"
|
||||
:model-value="store.settings?.useProxy ?? true"
|
||||
@update:model-value="() => toggleProxy()"
|
||||
/>
|
||||
</div>
|
||||
</CardContent>
|
||||
@@ -1435,14 +1428,9 @@ const toggleSortOrder = () => {
|
||||
</div>
|
||||
<div class="flex items-center justify-between">
|
||||
<div class="flex flex-col gap-0.5">
|
||||
<Label for="bt-proxy" class="cursor-pointer">使用代理下载</Label>
|
||||
<span class="text-xs text-muted-foreground">开启后自动使用代理模块(mihomo)的 SOCKS5 端口;代理不可用时自动降级为直连</span>
|
||||
<Label class="cursor-pointer">使用代理下载</Label>
|
||||
<span class="text-xs text-muted-foreground">BT 下载是否走代理跟随上方"使用 mihomo 代理"开关:开启时自动使用 mihomo 的 SOCKS5 端口,代理不可用时自动降级为直连</span>
|
||||
</div>
|
||||
<Switch
|
||||
id="bt-proxy"
|
||||
:model-value="settingsDraft?.btUseProxy ?? false"
|
||||
@update:model-value="(v: boolean) => settingsDraft && (settingsDraft.btUseProxy = v)"
|
||||
/>
|
||||
</div>
|
||||
<div class="flex items-center justify-between">
|
||||
<div class="flex flex-col gap-0.5">
|
||||
@@ -1718,16 +1706,16 @@ const toggleSortOrder = () => {
|
||||
/>
|
||||
</div>
|
||||
|
||||
<!-- 使用系统代理 -->
|
||||
<!-- 使用 mihomo 代理 -->
|
||||
<div class="flex items-center justify-between">
|
||||
<div class="flex flex-col gap-0.5">
|
||||
<Label for="dl-dialog-use-proxy" class="cursor-pointer">使用系统代理</Label>
|
||||
<Label for="dl-dialog-use-proxy" class="cursor-pointer">使用 mihomo 代理</Label>
|
||||
<span class="text-xs text-muted-foreground">关闭则强制直连</span>
|
||||
</div>
|
||||
<Switch
|
||||
id="dl-dialog-use-proxy"
|
||||
:model-value="settingsDraft.useProxy"
|
||||
@update:model-value="(v: boolean) => settingsDraft && (settingsDraft.useProxy = v)"
|
||||
:model-value="store.settings?.useProxy ?? true"
|
||||
@update:model-value="() => toggleProxy()"
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -1747,12 +1735,8 @@ const toggleSortOrder = () => {
|
||||
|
||||
<DialogFooter>
|
||||
<DialogClose as-child>
|
||||
<Button variant="outline">取消</Button>
|
||||
<Button variant="outline">关闭</Button>
|
||||
</DialogClose>
|
||||
<Button @click="handleDialogSave">
|
||||
<Check class="size-4" />
|
||||
保存
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
|
||||
Reference in new issue
Block a user