Merge pull request #2773 from lhzzforever/dev/develop_ci

feature: 升级全局配置plugin，区分title和productName之间的文本差异
TencentBlueKing · Aug 12, 2024 · ec41fa7 · ec41fa7
2 parents 6f35d30 + f030b14
commit ec41fa7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -90,7 +90,7 @@
     "@blueking/functional-dependency": "0.0.1-beta.12",
     "@blueking/login-modal": "^1.0.0",
     "@blueking/notice-component-vue2": "^2.0.3",
-    "@blueking/platform-config": "^1.0.2",
+    "@blueking/platform-config": "^1.0.5",
     "@blueking/sub-saas": "0.0.0-beta.7",
     "@blueking/user-selector": "^1.0.14",
     "@commitlint/cli": "~13.1.0",

diff --git a/frontend/src/components/header-nav/index.vue b/frontend/src/components/header-nav/index.vue
@@ -311,11 +311,7 @@
       },
       appName () {
         // 如果未获取到配置，使用默认title
-        if (this.globalConfig) {
-          const { name, nameEn } = this.globalConfig;
-          return this.curLanguageIsCn ? name : nameEn;
-        }
-        return this.$t('m.nav["蓝鲸权限中心"]');
+        return this.globalConfig && this.globalConfig.i18n ? this.globalConfig.i18n.productName : this.$t('m.nav["蓝鲸权限中心"]');
       },
       appLogo () {
         // 如果未获取到配置，使用默认logo

diff --git a/frontend/src/store/modules/global-config.js b/frontend/src/store/modules/global-config.js
@@ -33,8 +33,11 @@ export default {
         name: '', // 网站名
         separator: '|' // 网站名称路由分隔符
       },
+      i18n: {},
       name: '权限中心',
       nameEn: 'IAM',
+      productName: '权限中心',
+      productNameEn: 'BK IAM',
       brandName: '蓝鲸智云',
       brandNameEn: 'Tencent BlueKing',
       appLogo: require('@/images/logo.svg'),