Merge pull request #663 from TencentBlueKing/master

TencentBlueKing · May 27, 2024 · 25751ab · 25751ab
2 parents d0c5ad8 + 1a84920
commit 25751ab
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/src/dashboard-front/src/common/auth.ts b/src/dashboard-front/src/common/auth.ts
@@ -14,6 +14,7 @@ let checkWindowTimer = -1;
 const getLoginUrl = (url: string, cUrl: string, size: string) => {
   const loginUrl = new URL(url);
   loginUrl.searchParams.append('size', size);
+  loginUrl.searchParams.append('is_from_logout', '1');
   loginUrl.searchParams.append('c_url', cUrl);
   return loginUrl.href;
 };

diff --git a/src/dashboard-front/src/language/lang.ts b/src/dashboard-front/src/language/lang.ts
@@ -12,7 +12,7 @@ const lang: ILANG = {
   '我的告警': ['My Alarms'],
   '问题反馈': ['Feedback'],
   '加入圈子': ['Join Us'],
-  '退出登录': ['Sign out'],
+  '退出登录': ['Logout'],
   '专享': ['Dedicated'],
   '简介': ['Introduction'],
   '系统管理': ['Systems'],
@@ -1397,7 +1397,7 @@ const lang: ILANG = {
   '变量列表': ['Variable list'],
   '（可在资源配置中使用）': ['(Can be used in resource allocation)'],
   '请输入组件名称': ['Please enter the component name'],
-  '退出登陆': ['Log out'],
+  '退出登陆': ['Logout'],
   '编辑后端服务【{name}】': ['Edit backend service【{name}】'],
   '各环境的服务配置': ['Service configuration for each environment'],
   '服务名称': ['Service name'],

diff --git a/src/dashboard-front/src/views/component-doc/components/searcher/index.vue b/src/dashboard-front/src/views/component-doc/components/searcher/index.vue
@@ -6,8 +6,8 @@
         <i class="ag-doc-icon doc-down-shape apigateway-icon icon-ag-down-shape"></i>
       </div>
       <template #content>
-        <bk-dropdown-menu class="bk-dropdown-list">
-          <bk-dropdown-item v-for="item in curVersionList" :key="item.board_label">
+        <bk-dropdown-menu class="dropdown-trigger-content bk-dropdown-list">
+          <bk-dropdown-item v-for="item in curVersionList" :key="item.board_label" :title="item.board_label">
             <a href="javascript:;" @click="triggerHandler(item)" class="f14">{{ item.board_label }}</a>
           </bk-dropdown-item>
         </bk-dropdown-menu>
@@ -91,6 +91,7 @@ const curVersion = ref<any>({
 });
 const popoverOptions = {
   boundary: 'body',
+  placement: 'bottom-start',
 };
 
 watch(
@@ -266,14 +267,21 @@ const handleKeyup = (e: any) => {
   }
 }
 
+.dropdown-trigger-content {
+  :deep(.bk-dropdown-item) {
+    max-width: 300px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
 
 .bk-dropdown-content {
   box-shadow: none !important;
   -webkit-box-shadow: none !important;
 
   .bk-dropdown-list {
-    width: 105px;
-
     a {
       color: #63656e;
 

diff --git a/src/dashboard-front/src/views/resource/setting/comps/tmpl-example-sideslider.vue b/src/dashboard-front/src/views/resource/setting/comps/tmpl-example-sideslider.vue
@@ -41,10 +41,8 @@ watch(() => props.isShow, (val) => {
 
 </script>
 <style scoped lang="scss">
-.tmpl-example-sideslider-wrapper {
-  .tmpl-example-monaco-editor {
-    width: 100%;
-    height: calc(100vh - 52px);
-  }
+.tmpl-example-monaco-editor {
+  width: 100%;
+  height: calc(100vh - 52px);
 }
 </style>