From 01d2f96ff6731da2fcb763aa6b5bbbcc81705a98 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 23 Mar 2021 21:39:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=92=8C=E7=A9=BA=E9=97=B4=E5=90=8D=E8=BF=87=E9=95=BF=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #1693
---
 .../components/common/head/HeaderOrgWs.vue    | 39 +++++++++++++++++--
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/common/head/HeaderOrgWs.vue b/frontend/src/business/components/common/head/HeaderOrgWs.vue
index afb0f29954..9011b9a76e 100644
--- a/frontend/src/business/components/common/head/HeaderOrgWs.vue
+++ b/frontend/src/business/components/common/head/HeaderOrgWs.vue
@@ -8,7 +8,11 @@
     <el-menu-item index="1" v-show="false">Placeholder</el-menu-item>
     <el-submenu index="1" popper-class="org-ws-submenu"
                 v-roles="['org_admin', 'test_manager', 'test_user', 'test_viewer']">
-      <template v-slot:title>{{ $t('commons.organization') }}: {{ currentOrganizationName }}</template>
+      <template v-slot:title>{{ $t('commons.organization') }}:
+        <span class="org-ws-name" :title="currentOrganizationName">
+          {{ currentOrganizationName }}
+        </span>
+      </template>
       <el-input :placeholder="$t('project.search_by_name')"
                 prefix-icon="el-icon-search"
                 v-model="searchOrg"
@@ -17,14 +21,20 @@
                 size="small"/>
       <div class="org-ws-menu">
         <el-menu-item @click="changeOrg(item)" v-for="(item,index) in organizationList" :key="index">
-          {{ item.name }}
+          <span class="title">
+            {{ item.name }}
+          </span>
           <i class="el-icon-check"
              v-if="item.id === currentUserInfo.lastOrganizationId"></i>
         </el-menu-item>
       </div>
     </el-submenu>
     <el-submenu index="2" popper-class="submenu" v-roles="['test_manager', 'test_user', 'test_viewer']">
-      <template v-slot:title>{{ $t('commons.workspace') }}: {{ currentWorkspaceName }}</template>
+      <template v-slot:title>{{ $t('commons.workspace') }}:
+        <span class="org-ws-name" :title="currentWorkspaceName">
+          {{ currentWorkspaceName }}
+        </span>
+      </template>
       <el-input :placeholder="$t('project.search_by_name')"
                 prefix-icon="el-icon-search"
                 v-model="searchWs"
@@ -33,7 +43,9 @@
                 size="small"/>
       <div class="org-ws-menu">
         <el-menu-item @click="changeWs(item)" v-for="(item,index) in workspaceList" :key="index">
-          {{ item.name }}
+          <span class="title">
+            {{ item.name }}
+          </span>
           <i class="el-icon-check" v-if="item.id === currentUserInfo.lastWorkspaceId"></i>
         </el-menu-item>
       </div>
@@ -219,4 +231,23 @@ export default {
   color: #d2ced8;
   border-color: #b4aebe;
 }
+
+.title {
+  display: inline-block;
+  padding-left: 15px;
+  max-width: 150px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.org-ws-name {
+  display: inline-block;
+  padding-left: 15px;
+  max-width: 110px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
 </style>