Merge pull request #8179 from TencentBlueKing/v3.11.x

Merge v3.11.x into v3.13.x

src/ui/src/assets/icon/bk-icon-cmdb/style.css

@@ -26,6 +26,9 @@ url("fonts/iconcool.eot?#iefix") format("embedded-opentype");
 .icon-cc-refresh:before {
 	content: "\e3b9";
 }
+.icon-cc-help:before {
+	content: "\e3eb";
+}
 .icon-cc-remind:before {
 	content: "\e3b8";
 }
@@ -791,6 +794,9 @@ url("fonts/iconcool.eot?#iefix") format("embedded-opentype");
 .icon-cc-lock-line:before {
 	content: "\e3a9";
 }
+.icon-copy:before {
+	content: "\e3ea";
+}
 .icon-finger-line:before {
 	content: "\e3ab";
 }

src/ui/src/components/layout/header.vue

@@ -57,7 +57,7 @@
           animateFill: false,
           hideOnClick: false
         }">
-        <i class="question-icon icon-cc-default"></i>
+        <i class="question-icon icon-cc-help"></i>
         <template slot="content">
           <a class="link-item" target="_blank" :href="helpDocUrl">{{$t('产品文档')}}</a>
           <a class="link-item" target="_blank" @click="handleChangeLog()" style="cursor:pointer">{{$t('版本日志')}}</a>
@@ -233,8 +233,8 @@
       vertical-align: middle;
       height: 58px;
       line-height: 58px;
-      margin-left: 23px;
-      padding-left: 38px;
+      margin-left: 24px;
+      padding-left: 44px;
       color: #fff;
       font-size: 16px;
       background: v-bind(appLogo) no-repeat 0 center;
@@ -251,11 +251,11 @@
         height: 58px;
         line-height: 58px;
         padding: 0 25px;
-        color: #979ba5;
+        color: #96A2B9;
         font-size: 14px;
       &:hover {
           background-color: rgba(49, 64, 94, 0.5);
-          color: #fff;
+          color: #C2CEE5;
       }
       &.router-link-active,
       &.active {
@@ -272,7 +272,7 @@
   }
   .info-item {
       @include inlineBlock;
-      margin: 0 20px 0 0;
+      margin: 0 18px 0 0;
       text-align: left;
       font-size: 0;
       cursor: pointer;
@@ -290,15 +290,23 @@
     .question-icon,
     .lang-icon {
         font-size: 16px;
-        color: #DCDEE5;
+        color: #96A2B9;
+        width: 32px;
+        height: 32px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
         &:hover {
             color: #fff;
+            background: linear-gradient(270deg,#253047,#263247);
+            border-radius: 100%;
         }
     }
     .info-user {
         font-size: 14px;
         font-weight: bold;
-        color: #fff;
+        color: #96A2B9;
       .user-name {
           max-width: 150px;
           @include inlineBlock;
@@ -308,8 +316,14 @@
           margin-left: -4px;
           transition: transform .2s linear;
           font-size: 20px;
-          color: #fff;
+          color: #96A2B9;
       }
+      &:hover {
+           color: #fff;
+           .user-icon {
+              color: #fff;
+          }
+        }
     }
     .lang-icon {
         font-size: 20px;

src/ui/src/i18n/constants.js

@@ -19,16 +19,16 @@ export const LANG_KEYS = Object.freeze({
 })
 
 export const LANG_SET = Object.freeze([
-  {
-    id: LANG_KEYS.EN,
-    name: 'English',
-    icon: 'english'
-  },
   {
     id: LANG_KEYS.ZH_CN,
     alias: ['zh-cn'],
     name: '中文',
     apiLocale: 'zh-cn',
     icon: 'chinese'
+  },
+  {
+    id: LANG_KEYS.EN,
+    name: 'English',
+    icon: 'english'
   }
 ])

src/ui/src/i18n/index.js

@@ -41,7 +41,7 @@ export const changeLocale = async (locale) => {
   Cookies.remove(LANG_COOKIE_NAME, { path: '' })
   const cookieValue = LANG_SET.find(lang => lang.id === locale)?.apiLocale || locale
   Cookies.set(LANG_COOKIE_NAME, cookieValue, {
-    expires: 3600,
+    expires: 366,
     domain: siteConfig?.cookieDomain || window.location.hostname.replace(/^.*(\.[^.]+\.[^.]+)$/, '$1'),
   })
 

src/ui/src/i18n/lang/en.json

@@ -33,7 +33,7 @@
     "管理员": "Admin",
     "普通用户": "User",
     "注销": "Log out",
-    "退出登录": "Sign out",
+    "退出登录": "Sign Out",
     "业务": "Business",
     "已选N项": "{N} items selected",
     "已选N行": "{N} rows selected",
@@ -126,9 +126,9 @@
     "获取人员列表失败": "Failed to get user list",
     "其他筛选项": "Other filters",
     "清空": "Clear",
-    "产品文档": "Documents",
+    "产品文档": "Documentation",
     "问题反馈": "Feedback",
-    "开源社区": "Community",
+    "开源社区": "Open Source",
     "确定离开页面？": "Make sure to leave the page?",
     "系统不会保存您所做的修改，确认要离开？": "Your changes will not be saved. Are you sure you want to leave?",
     "确定删除选中的实例": "Confirm to delete selected instance(s)?",
@@ -1678,8 +1678,8 @@
     "分组暂无模型提示": "There are no models in this group yet, please {btn}",
     "主机需在“空闲机池”下才允许转移至主机池": "Hosts must be in '{idleSet}' to be allowed to transfer to host pool",
     "主机需在“空闲机池”下才允许转移至其他业务": "Hosts must be in '{idleSet}' to be allowed to transfer to other businesses",
-    "版本日志":"ChangeLog",
-    "暂无版本日志":"No ChangeLog",
+    "版本日志":"Release Notes",
+    "暂无版本日志":"No Release Notes",
     "空Pod节点提示语": "If there are no pod running on the Container Cluster Node (Node), they will all belong to \"Empty Pod Node(s)\".",
     "无Pod运行的节点": "Node runs with no Pod",
     "（模板创建）": "(By Template)",