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

2024-09-26 14:37:22 +08:00
parent c3618e121e a72b8acaf9
commit 169acef19f
13 changed files with 530 additions and 324 deletions
--- a/packages/@core/preferences/src/preferences.ts
+++ b/packages/@core/preferences/src/preferences.ts
@@ -172,7 +172,7 @@ class PreferenceManager {
    const mergedPreference = merge(
      {},
      // overrides,
-      this.loadCachedPreferences() || defaultPreferences,
+      this.loadCachedPreferences() || {},
      this.initialPreferences,
    );