Merge pull request #2614 from hLinx/hotfix_master

Hotfix master
TencentBlueKing · Nov 14, 2023 · 524bc63 · 524bc63
2 parents 3c0e227 + e7afbc2
commit 524bc63
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 7 deletions.
diff --git a/src/frontend/src/App.vue b/src/frontend/src/App.vue
@@ -253,12 +253,12 @@
        */
       handleToggleLang(lang) {
         Cookie.remove('blueking_language', { path: '' });
-        Cookie.set('blueking_language', lang, {
+        Cookie.set('blueking_language', lang.toLocaleLowerCase(), {
           expires: 3600,
           domain: this.envConfig.bkDomain,
         });
         setLocale(lang);
-        jsonp(`${this.envConfig['esb.url']}/api/c/compapi/v2/usermanage/fe_update_user_language/?language=${lang}`);
+        jsonp(`${this.envConfig['esb.url']}/api/c/compapi/v2/usermanage/fe_update_user_language/?language=${lang.toLocaleLowerCase()}`);
       },
       /**
        * @desc 显示版本更新日志

diff --git a/src/frontend/src/components/jb-breadcrumb/index.vue b/src/frontend/src/components/jb-breadcrumb/index.vue
@@ -28,6 +28,8 @@
 <script>
   import _ from 'lodash';
 
+  import I18n from '@/i18n';
+
   export default {
     name: '',
     props: {
@@ -104,7 +106,7 @@
             },
           },
           attrs: {
-            'tippy-tips': '返回上一级',
+            'tippy-tips': I18n.t('返回上一级'),
           },
           style: {
             cursor: 'pointer',

diff --git a/src/frontend/src/components/system-log/index.vue b/src/frontend/src/components/system-log/index.vue
@@ -80,6 +80,8 @@
 
   import ScrollFaker from '@components/scroll-faker';
 
+  import I18n from '@/i18n';
+
   export default {
     name: 'SystemVersionLog',
     components: {
@@ -158,8 +160,8 @@
         }
         this.popperInstance.setContent(`
                     <div style="width: 220px; font-size: 12px; line-height: 20px; color: #63656E;">
-                        <div style="color: #979BA5">Job 小贴士：</div>
-                        <div> 想要再次查阅「版本日志」也可以从此处进入喔～</div>
+                        <div style="color: #979BA5">${I18n.t('Job 小贴士：')}</div>
+                        <div>${I18n.t('想要再次查阅「版本日志」也可以从此处进入喔～')}</div>
                     </div>
                 `);
         this.popperInstance.show();

diff --git a/src/frontend/src/i18n/local.js b/src/frontend/src/i18n/local.js
@@ -597,4 +597,7 @@ export default {
   无该应用的访问权限: 'Do not have access permission for the current application.',
   '所有 IP': 'All IP',
   '异常 IP': 'Copy abnormal',
+  返回上一级: 'Back',
+  'Job 小贴士：': 'JOB Tips:',
+  '想要再次查阅「版本日志」也可以从此处进入喔～': 'Click here to access all the \'Release notes\', to stay updated on all changes and improvements.',
 };
diff --git a/src/frontend/src/views/executive-history/step-detail/components/ip-list/index-new.vue b/src/frontend/src/views/executive-history/step-detail/components/ip-list/index-new.vue
@@ -113,10 +113,11 @@
         </template>
       </bk-table-column>
       <bk-table-column
+        fixed="right"
         label-class-name="setting-column"
         :render-header="renderSettingHeader"
         :resizable="false"
-        :width="45">
+        :width="46">
         <template slot-scope="{ row }">
           <icon
             v-if="row.key === selectRowKey"
@@ -279,6 +280,12 @@
   const selectRowKey = ref('');
 
   const styles = computed(() => {
+    if (!listRef.value) {
+      return {};
+    }
+    const { left } = listRef.value.getBoundingClientRect();
+    const windowInnerWidth = window.innerWidth;
+    const maxWidth = windowInnerWidth - left - 800 - 24;
     const allShowColumnMap = makeMap(allShowColumn.value);
     const allShowColumnWidth = columnList.value.reduce((result, item) => {
       if (allShowColumnMap[item.name]) {
@@ -288,7 +295,7 @@
     }, 65);
 
     return {
-      width: `${Math.max(allShowColumnWidth, 217)}px`,
+      width: `${Math.min(Math.max(allShowColumnWidth, 217), maxWidth)}px`,
     };
   });
 
@@ -474,6 +481,17 @@
           color: #63656e;
         }
       }
+
+      .bk-table-fixed-right{
+        bottom: 0 !important;
+        width: 45px !important;
+
+        .bk-table-row-last{
+          td.is-last{
+            border-bottom: 1px solid #dfe0e5;
+          }
+        }
+      }
     }
 
     .ip-box{