test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 修复组织和空间名过长显示不正确 

Closes #1693
This commit is contained in:
shiziyuan9527 2021-03-23 21:39:35 +08:00
parent 44f289f752
commit 01d2f96ff6
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
frontend/src/business/components/common/head/HeaderOrgWs.vue
View File

@ -8,7 +8,11 @@
<el-menu-item index="1" v-show="false">Placeholder</el-menu-item> <el-menu-item index="1" v-show="false">Placeholder</el-menu-item>
<el-submenu index="1" popper-class="org-ws-submenu" <el-submenu index="1" popper-class="org-ws-submenu"
v-roles="['org_admin', 'test_manager', 'test_user', 'test_viewer']"> 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')" <el-input :placeholder="$t('project.search_by_name')"
prefix-icon="el-icon-search" prefix-icon="el-icon-search"
v-model="searchOrg" v-model="searchOrg"
@ -17,14 +21,20 @@
size="small"/> size="small"/>
<div class="org-ws-menu"> <div class="org-ws-menu">
<el-menu-item @click="changeOrg(item)" v-for="(item,index) in organizationList" :key="index"> <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" <i class="el-icon-check"
v-if="item.id === currentUserInfo.lastOrganizationId"></i> v-if="item.id === currentUserInfo.lastOrganizationId"></i>
</el-menu-item> </el-menu-item>
</div> </div>
</el-submenu> </el-submenu>
<el-submenu index="2" popper-class="submenu" v-roles="['test_manager', 'test_user', 'test_viewer']"> <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')" <el-input :placeholder="$t('project.search_by_name')"
prefix-icon="el-icon-search" prefix-icon="el-icon-search"
v-model="searchWs" v-model="searchWs"
@ -33,7 +43,9 @@
size="small"/> size="small"/>
<div class="org-ws-menu"> <div class="org-ws-menu">
<el-menu-item @click="changeWs(item)" v-for="(item,index) in workspaceList" :key="index"> <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> <i class="el-icon-check" v-if="item.id === currentUserInfo.lastWorkspaceId"></i>
</el-menu-item> </el-menu-item>
</div> </div>
@ -219,4 +231,23 @@ export default {
color: #d2ced8; color: #d2ced8;
border-color: #b4aebe; 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> </style>