diff --git a/apps/desktop/src/main/browser/browser-profile.ts b/apps/desktop/src/main/browser/browser-profile.ts index 675abef..60c35fd 100644 --- a/apps/desktop/src/main/browser/browser-profile.ts +++ b/apps/desktop/src/main/browser/browser-profile.ts @@ -443,7 +443,7 @@ export async function importBrowserProfile(sourceId: string, profileDir: string) applyStagedLocalStorage(staging) } catch (err2) { // 理论不可达(clearStorageData 已释放句柄);兜底:整体转待办,重启应用后完成 - const deferredNote = '受管浏览器数据正被占用,已计划在重启应用后自动完成导入。' + const deferredNote = '已暂存导入任务:点击下方「重启并完成导入」即可生效。' mkdirSync(join(app.getPath('userData'), 'Partitions'), { recursive: true }) rmSync(pendingDir(), { recursive: true, force: true }) writeFileSync( @@ -481,7 +481,7 @@ export async function importBrowserProfile(sourceId: string, profileDir: string) rmSync(staging, { recursive: true, force: true }) throw new Error(`导入写入失败: ${err instanceof Error ? err.message : String(err)}`) } - const deferredNote = 'LocalStorage 已生效;Cookie 数据将在重启应用后自动完成迁移。' + const deferredNote = 'LocalStorage 已生效;点击「重启并完成导入」补上 Cookie。' mkdirSync(join(app.getPath('userData'), 'Partitions'), { recursive: true }) rmSync(pendingDir(), { recursive: true, force: true }) writeFileSync( diff --git a/apps/desktop/src/renderer/src/components/browser/BrowserImportForm.tsx b/apps/desktop/src/renderer/src/components/browser/BrowserImportForm.tsx index cb468fc..09a0f45 100644 --- a/apps/desktop/src/renderer/src/components/browser/BrowserImportForm.tsx +++ b/apps/desktop/src/renderer/src/components/browser/BrowserImportForm.tsx @@ -118,17 +118,6 @@ export function BrowserImportForm(): JSX.Element { {error && (
{error}
)} - {result?.deferred && ( -
- -
- )} {result && (
)} -
+ {/* 操作区:始终集中在底部一行;被搁置时以「重启并完成导入」为主操作 */} +
+ {result?.deferred && ( + + )}