From 95044c3a155000ab42279db2ea94e29712463825 Mon Sep 17 00:00:00 2001
From: Rick Ye <rick.ye@gz.questwork.com>
Date: Fri, 11 Sep 2026 19:08:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(browser):=20=E5=AF=BC=E5=85=A5=E8=A2=AB?=
 =?UTF-8?q?=E6=90=81=E7=BD=AE=E6=80=81=E7=9A=84=E6=93=8D=E4=BD=9C=E6=94=B6?=
 =?UTF-8?q?=E7=BA=B3=E2=80=94=E2=80=94=E6=8F=90=E7=A4=BA=E6=9D=A1=E5=9C=A8?=
 =?UTF-8?q?=E4=B8=8A=EF=BC=8C=E6=8C=89=E9=92=AE=E9=9B=86=E4=B8=AD=E5=BA=95?=
 =?UTF-8?q?=E9=83=A8=E4=B8=80=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/browser/browser-profile.ts       |  4 +--
 .../components/browser/BrowserImportForm.tsx  | 29 ++++++++++---------
 2 files changed, 18 insertions(+), 15 deletions(-)

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 && (
         <div className="mt-3 rounded border border-red/40 bg-red-tint px-2.5 py-2 text-[11.5px] text-red">{error}</div>
       )}
-      {result?.deferred && (
-        <div className="mt-3 flex items-center justify-end">
-          <button
-            type="button"
-            onClick={() => void window.api.appRelaunch()}
-            className="rounded bg-accent px-3.5 py-1.5 text-[12px] font-medium text-page transition-opacity hover:opacity-90"
-          >
-            重启并完成导入
-          </button>
-        </div>
-      )}
       {result && (
         <div
           className={`mt-3 rounded border px-2.5 py-2 text-[11.5px] leading-relaxed ${
@@ -139,12 +128,26 @@ export function BrowserImportForm(): JSX.Element {
         </div>
       )}
 
-      <div className="mt-3 flex items-center justify-end">
+      {/* 操作区：始终集中在底部一行；被搁置时以「重启并完成导入」为主操作 */}
+      <div className="mt-3 flex items-center justify-end gap-2">
+        {result?.deferred && (
+          <button
+            type="button"
+            onClick={() => void window.api.appRelaunch()}
+            className="rounded bg-accent px-3.5 py-1.5 text-[12px] font-medium text-page transition-opacity hover:opacity-90"
+          >
+            重启并完成导入
+          </button>
+        )}
         <button
           type="button"
           disabled={!selected || busy}
           onClick={runImport}
-          className="rounded bg-accent px-3.5 py-1.5 text-[12px] font-medium text-page transition-opacity hover:opacity-90 disabled:opacity-40"
+          className={`rounded px-3.5 py-1.5 text-[12px] transition-colors disabled:opacity-40 ${
+            result?.deferred
+              ? 'border border-line-strong text-ink-2 hover:bg-hover hover:text-ink'
+              : 'bg-accent font-medium text-page hover:opacity-90'
+          }`}
         >
           {busy ? '导入中…' : '导入浏览器数据'}
         </button>