diff --git a/web/apps/web-ele/src/main.ts b/web/apps/web-ele/src/main.ts index b4e4b81..c3c3dbd 100644 --- a/web/apps/web-ele/src/main.ts +++ b/web/apps/web-ele/src/main.ts @@ -128,17 +128,32 @@ async function initApplication() { // 4. 合并配置:后端配置优先级高于前端配置 // defu/merge 的特点是第一个参数优先,所以后端配置放前面 const finalPreferences = merge({}, backendPreferences, overridesPreferences); - if (overridesPreferences.app?.name) { + if (!applicationId && overridesPreferences.app) { finalPreferences.app = finalPreferences.app || {}; finalPreferences.app.name = overridesPreferences.app.name; + finalPreferences.app.defaultHomePath = overridesPreferences.app.defaultHomePath; } - if (overridesPreferences.copyright) { + if (!applicationId && overridesPreferences.copyright) { finalPreferences.copyright = merge( {}, overridesPreferences.copyright, finalPreferences.copyright, ); } + if (!applicationId && overridesPreferences.logo) { + finalPreferences.logo = merge( + {}, + overridesPreferences.logo, + finalPreferences.logo, + ); + } + if (!applicationId && overridesPreferences.widget) { + finalPreferences.widget = merge( + {}, + overridesPreferences.widget, + finalPreferences.widget, + ); + } console.log('[配置加载] 合并后配置:', finalPreferences); // 5. app偏好设置初始化