Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin

2024-09-26 07:55:41 +08:00
parent c659e6cdd5 a46c85d77d
commit e5ba0a2f31
31 changed files with 1331 additions and 618 deletions
--- a/packages/@core/preferences/src/preferences.ts
+++ b/packages/@core/preferences/src/preferences.ts
@@ -171,8 +171,9 @@ class PreferenceManager {
    // 加载并合并当前存储的偏好设置
    const mergedPreference = merge(
      {},
-      overrides,
+      // overrides,
      this.loadCachedPreferences() || defaultPreferences,
+      this.initialPreferences,
    );

    // 更新偏好设置