From cd86de54e1d88d79ac399eeb943aa9dc826d9803 Mon Sep 17 00:00:00 2001
From: Reese Wellin <lqmrtcrr@gmail.com>
Date: Sat, 23 May 2026 04:17:46 +0800
Subject: [PATCH] =?UTF-8?q?fix(preferences):=20=E4=BF=AE=E5=A4=8D=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98=E7=AD=89=E4=B8=AA=E6=80=A7=E5=8C=96=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8C=81=E4=B9=85=E5=8C=96=E8=A2=AB=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=A6=86=E7=9B=96=20(#7948)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

调整 initPreferences 中 merge 顺序，使用户缓存优先于 initialPreferences。

Fixes #7943
---
 packages/@core/preferences/src/preferences.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@core/preferences/src/preferences.ts b/packages/@core/preferences/src/preferences.ts
index 8e4cf4b5b..dddadd76a 100644
--- a/packages/@core/preferences/src/preferences.ts
+++ b/packages/@core/preferences/src/preferences.ts
@@ -135,8 +135,8 @@ class PreferenceManager {
     const cachedPreferences = (await this.loadFromCache()) || {};
     const mergedPreference = merge(
       {},
-      this.initialPreferences, // 初始化配置优先，缓存仅补齐缺失字段
-      cachedPreferences,
+      cachedPreferences,       // 用户缓存的设置优先
+      this.initialPreferences, // 初始设置仅补齐缺失字段
     );
 
     // 更新偏好设置