Merge pull request #3167 from hLinx/hotfix_3.9.x

feat: 全局配置title/footer/logo/favicon/产品名称 #3073
TencentBlueKing · Aug 13, 2024 · ed3047e · ed3047e
2 parents 228e0a3 + 42a4f54
commit ed3047e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/src/frontend/package.json b/src/frontend/package.json
@@ -18,7 +18,7 @@
     "@blueking/login-modal": "1.0.4",
     "@blueking/notice-component-vue2": "2.0.0-beta.2",
     "@blueking/paas-login": "0.0.11",
-    "@blueking/platform-config": "1.0.2",
+    "@blueking/platform-config": "1.0.5",
     "@blueking/sub-saas": "0.0.0-beta.6",
     "@blueking/user-selector": "1.0.12",
     "@vue/babel-preset-jsx": "1.4.0",

diff --git a/src/frontend/src/App.vue b/src/frontend/src/App.vue
@@ -205,11 +205,11 @@
             this.relatedSystemUrls = Object.freeze(data);
 
             return getPlatformConfig(data.BK_SHARED_RES_BASE_JS_URL, {
-              name: '蓝鲸作业平台',
-              nameEn: 'BlueKing JOB',
+              name: '作业平台',
+              nameEn: 'JOB',
               appLogo: '/static/images/logo.png',
-              brandName: '腾讯蓝鲸智云',
-              brandNameEn: 'BlueKing',
+              brandName: '蓝鲸智云',
+              brandNameEn: 'Tencent BlueKing',
               favicon: '/static/images/favicon.icon',
               version: process.env.JOB_VERSION,
             }).then((data) => {

diff --git a/src/frontend/src/layout-new.vue b/src/frontend/src/layout-new.vue
@@ -43,7 +43,7 @@
         <span
           class="site-title"
           @click="handleRouterChange('home')">
-          {{ siteName }}
+          {{ productName }}
         </span>
       </template>
       <template slot="headerCenter">
@@ -324,7 +324,7 @@
 
   const noticApiUrl = `${window.PROJECT_CONFIG.AJAX_URL_PREFIX}/job-manage/web/notice/announcement/currentAnnouncements`;
 
-  const siteName = computed(() => (locale === 'en-US' ? store.state.platformConfig.nameEn : store.state.platformConfig.name));
+  const productName = computed(() => (locale === 'en-US' ? store.state.platformConfig.productNameEn : store.state.platformConfig.productName));
 
   watch(route, (currentRoute) => {
     routerTitle.value = (currentRoute.meta.title || currentRoute.meta.pageTitle);

diff --git a/src/frontend/src/store/modules/platform-config.js b/src/frontend/src/store/modules/platform-config.js
@@ -27,10 +27,12 @@ export default {
   namespaced: true,
   state: {
     bkAppCode: '', // appcode
-    name: '蓝鲸作业平台', // 站点的名称，通常显示在页面左上角，也会出现在网页title中
-    nameEn: 'BlueKing JOB', // 站点的名称-英文
+    name: '作业平台', // 站点的名称，通常显示在页面左上角，也会出现在网页title中
+    nameEn: 'JOB', // 站点的名称-英文
     appLogo: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/wIAAgMBAAirr3kAAAAASUVORK5CYII=', // 站点logo
     favicon: '/static/images/favicon.icon', // 站点favicon
+    productName: '作业平台', // 产品名称，展示在logo区域 1.0.5版本新增
+    productNameEn: 'JOB',
     helperText: '',
     helperTextEn: '',
     helperLink: '',