|
@@ -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];
|