From 959624240fd66773e0dca75a05ef5add1ce05bd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?cls=5F=E5=AE=81=E6=B3=A2=E6=9C=AC=E6=9C=BA?= <908705107@qq.com> Date: Tue, 9 Jun 2026 08:44:04 +0800 Subject: [PATCH] Align frontend branding defaults --- web/apps/web-ele/.env.analyze | 2 ++ web/apps/web-ele/.env.development | 2 ++ web/apps/web-ele/src/main.ts | 11 +++++++++++ web/internal/vite-config/src/utils/env.ts | 2 +- .../__tests__/__snapshots__/config.test.ts.snap | 15 +++++++++------ web/packages/@core/preferences/src/config.ts | 2 +- web/packages/@core/preferences/src/preferences.ts | 7 +++++++ 7 files changed, 33 insertions(+), 8 deletions(-) diff --git a/web/apps/web-ele/.env.analyze b/web/apps/web-ele/.env.analyze index ffafa8d..4b0a7b2 100644 --- a/web/apps/web-ele/.env.analyze +++ b/web/apps/web-ele/.env.analyze @@ -1,4 +1,6 @@ # public path +VITE_APP_TITLE=AI Agent Admin + VITE_BASE=/ # Basic interface address SPA diff --git a/web/apps/web-ele/.env.development b/web/apps/web-ele/.env.development index 25c18fd..860e52c 100644 --- a/web/apps/web-ele/.env.development +++ b/web/apps/web-ele/.env.development @@ -1,6 +1,8 @@ # 端口号 VITE_PORT=5777 +VITE_APP_TITLE=AI Agent Admin + VITE_BASE=/ # 接口地址 diff --git a/web/apps/web-ele/src/main.ts b/web/apps/web-ele/src/main.ts index 5f1695e..b4e4b81 100644 --- a/web/apps/web-ele/src/main.ts +++ b/web/apps/web-ele/src/main.ts @@ -128,6 +128,17 @@ async function initApplication() { // 4. 合并配置:后端配置优先级高于前端配置 // defu/merge 的特点是第一个参数优先,所以后端配置放前面 const finalPreferences = merge({}, backendPreferences, overridesPreferences); + if (overridesPreferences.app?.name) { + finalPreferences.app = finalPreferences.app || {}; + finalPreferences.app.name = overridesPreferences.app.name; + } + if (overridesPreferences.copyright) { + finalPreferences.copyright = merge( + {}, + overridesPreferences.copyright, + finalPreferences.copyright, + ); + } console.log('[配置加载] 合并后配置:', finalPreferences); // 5. app偏好设置初始化 diff --git a/web/internal/vite-config/src/utils/env.ts b/web/internal/vite-config/src/utils/env.ts index f342216..f87dfab 100644 --- a/web/internal/vite-config/src/utils/env.ts +++ b/web/internal/vite-config/src/utils/env.ts @@ -93,7 +93,7 @@ async function loadAndConvertEnv( .filter((item) => item === 'brotli' || item === 'gzip'); return { - appTitle: getString(VITE_APP_TITLE, 'Vben Admin'), + appTitle: getString(VITE_APP_TITLE, 'AI Agent Admin'), archiver: getBoolean(VITE_ARCHIVER), base: getString(VITE_BASE, '/'), compress: compressTypes.length > 0, diff --git a/web/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap b/web/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap index ecee42b..c2af93a 100644 --- a/web/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap +++ b/web/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap @@ -17,7 +17,7 @@ exports[`defaultPreferences immutability test > should not modify the config obj "contentPaddingRight": 0, "contentPaddingTop": 0, "defaultAvatar": "https://unpkg.com/@vbenjs/static-source@0.1.7/source/avatar-v1.webp", - "defaultHomePath": "/analytics", + "defaultHomePath": "/control-center", "dynamicTitle": true, "enableCheckUpdates": true, "enablePreferences": true, @@ -27,7 +27,7 @@ exports[`defaultPreferences immutability test > should not modify the config obj "layout": "sidebar-nav", "locale": "zh-CN", "loginExpiredMode": "page", - "name": "Vben Admin", + "name": "AI Agent Admin", "preferencesButtonPosition": "auto", "watermark": false, "watermarkContent": "", @@ -41,12 +41,15 @@ exports[`defaultPreferences immutability test > should not modify the config obj "styleType": "normal", }, "copyright": { - "companyName": "Vben", - "companySiteLink": "https://www.vben.pro", - "date": "2024", + "companyName": "ZQ-Platform", + "companySiteLink": "https://django-ninja.zq-platform.cn/analytics", + "date": "2025", "enable": true, "icp": "", "icpLink": "", + "loginOnly": true, + "policeIcp": "", + "policeIcpLink": "", "settingShow": true, }, "footer": { @@ -131,10 +134,10 @@ exports[`defaultPreferences immutability test > should not modify the config obj "lockScreen": true, "notification": true, "refresh": true, + "sidebarBranding": true, "sidebarToggle": true, "themeToggle": true, "timezone": true, - "sidebarBranding": true, }, } `; diff --git a/web/packages/@core/preferences/src/config.ts b/web/packages/@core/preferences/src/config.ts index 0551521..801059f 100644 --- a/web/packages/@core/preferences/src/config.ts +++ b/web/packages/@core/preferences/src/config.ts @@ -27,7 +27,7 @@ const defaultPreferences: Preferences = { layout: 'sidebar-nav', locale: 'zh-CN', loginExpiredMode: 'page', - name: 'Vben Admin', + name: 'AI Agent Admin', preferencesButtonPosition: 'auto', watermark: false, watermarkContent: '', diff --git a/web/packages/@core/preferences/src/preferences.ts b/web/packages/@core/preferences/src/preferences.ts index 0d5c7b5..c2c2225 100644 --- a/web/packages/@core/preferences/src/preferences.ts +++ b/web/packages/@core/preferences/src/preferences.ts @@ -100,6 +100,13 @@ class PreferenceManager { if (overrides?.logo?.enable !== undefined) { mergedPreference.logo.enable = overrides.logo.enable; } + if (overrides?.copyright) { + mergedPreference.copyright = merge( + {}, + overrides.copyright, + mergedPreference.copyright, + ); + } // 更新偏好设置 this.updatePreferences(mergedPreference);