feat(front): 7.2问题优化汇总(closed #357)

# Reviewed, transaction id: 14230
TencentBlueKing · Aug 7, 2024 · 56c6933 · 56c6933
1 parent 968a513
commit 56c6933
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 12 deletions.
diff --git a/web/src/components/Auth/AuthPage.vue b/web/src/components/Auth/AuthPage.vue
@@ -35,7 +35,7 @@
       </div>
       <p class="empty-footer">
         <i18n path="快速了解GSEkit">
-          <span>{{ appName }}</span>
+          <span>{{ app_name }}</span>
           <bk-button text theme="primary" class="reset-icon-btn" @click="handleClick('official')">
             <span class="flex-content">
               {{ $t('白皮书文档') }}<i class="ml6 gsekit-icon gsekit-icon-jump-fill"></i>
@@ -60,6 +60,9 @@ export default {
   },
   computed: {
     ...mapState(['bizId', 'appName']),
+    app_name() {
+      return this.$store.state.platform.i18n.name || this.appName
+    },
   },
   methods: {
     ...mapActions('iam', ['ajaxGetAuthApplyInfo']),

diff --git a/web/src/components/Empty/EmptyProcess.vue b/web/src/components/Empty/EmptyProcess.vue
@@ -2,10 +2,10 @@
   <div class="empty-process-container">
     <div class="flex-top"></div>
     <div class="empty-process-content" v-if="isEmptyPage">
-      <p class="empty-title">{{ $t('接入GSEKit进程管理', [appName]) }}</p>
+      <p class="empty-title">{{ $t('接入GSEKit进程管理', [app_name]) }}</p>
       <p class="empty-sub-title">
         <i18n tag="p" path="欢迎使用GSEKit">
-          <span>{{ appName }}</span>
+          <span>{{ app_name }}</span>
           <bk-button text theme="primary" class="reset-icon-btn" @click="handleClick('document')">
             <span class="flex-content">
               {{ $t('帮助文档') }}<i class="gsekit-icon gsekit-icon-jump-fill"></i>
@@ -77,6 +77,9 @@ export default {
     isEmptyPage() {
       return this.emptyType === 'page';
     },
+    app_name() {
+      return this.$store.state.platform.i18n.name || this.appName
+    },
   },
   methods: {
     handleClick(type) {

diff --git a/web/src/components/Header.vue b/web/src/components/Header.vue
@@ -41,7 +41,7 @@
                 <div class="bk-option-content-default">
                   <div class="bk-option-name">
                     <span class="gsekit-icon gsekit-icon-logout-fill"></span>
-                    <span class="text">{{ $t('注销') }}</span>
+                    <span class="text">{{ $t('退出登录') }}</span>
                   </div>
                 </div>
               </div>
@@ -70,7 +70,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(['username', 'appName']),
+    ...mapState(['username', 'appName', 'language']),
     showStaticRouter() {
       return this.$store.state.showStaticRouter;
     },

diff --git a/web/src/language/lang/en.js b/web/src/language/lang/en.js
@@ -40,7 +40,7 @@ export default {
   静态文件加载失败请刷新页面重试: 'Static file loading failed, please refresh the page and try again',
   // 首页
   首页: 'Home',
-  注销: 'Logout',
+  退出登录: 'Sign out',
   // 进程管理
   进程状态: 'Process Status',
   进程管理: 'Process Manage',

diff --git a/web/src/language/lang/zh.js b/web/src/language/lang/zh.js
@@ -40,7 +40,7 @@ export default {
   静态文件加载失败请刷新页面重试: '静态文件加载失败，请刷新页面重试',
   // 首页
   首页: '首页',
-  注销: '注销',
+  退出登录: '退出登录',
   // 进程管理
   进程状态: '进程状态',
   进程管理: '进程管理',

diff --git a/web/src/store/modules/platform-config.js b/web/src/store/modules/platform-config.js
@@ -42,18 +42,23 @@ export default {
   },
   actions: {
     async getConfig(context) {
-      const url = `${window.PROJECT_CONFIG?.BKPAAS_SHARED_RES_URL}/gsekit/base.js`
-      const config = await getPlatformConfig(url, {
+      const defaults = {
         name: 'GSEKit',
         nameEn: 'GSEKit',
         appLogo: logoSrc,
-        brandName: '腾讯蓝鲸智云',
+        brandName: '蓝鲸智云',
         brandNameEn: 'BlueKing',
         favicon: logoSrc,
         helperLink: window.PROJECT_CONFIG.BKAPP_NAV_HELPER_URL,
         helperText: window.i18n.t('联系BK助手'),
-      });
-
+      }
+      let config;
+      if (window.PROJECT_CONFIG?.BKPAAS_SHARED_RES_URL) {
+        const url = `${window.PROJECT_CONFIG?.BKPAAS_SHARED_RES_URL}/gsekit/base.js`;
+        config = await getPlatformConfig(url, defaults);
+      } else {
+        config = await getPlatformConfig(defaults);
+      }
       context.commit('updatePlatformConfig', config);
     }
   }