xiaochan il y a 1 an
Parent
commit
6fcafaab8b
1 fichiers modifiés avec 4 ajouts et 4 suppressions
  1. 4 4
      src/pinia/system-store.ts

+ 4 - 4
src/pinia/system-store.ts

@@ -52,11 +52,11 @@ export const useSystemStore = defineStore('system', {
     },
     actions: {
         merge() {
+            if (typeof this.userConfig === 'undefined') {
+                this.userConfig = userConfig
+                return
+            }
             for (let key in userConfig) {
-                if (typeof this.userConfig === 'undefined') {
-                    this.userConfig = userConfig
-                    return
-                }
                 if (!XEUtils.has(this.userConfig, key)) {
                     // @ts-ignore
                     this.userConfig[key] = userConfig[key];