Commit ebec957a authored by sixiaofeng's avatar sixiaofeng

成员名称/部门名称过长时显示调整

parent 1f176eee
......@@ -4,7 +4,7 @@ node_modules
/kor
/kor.zip
/oa
/oa.zip
/oa*.zip
/zip
/orginone
......
<template>
<div class="py-1.5 flex items-center" @click="clickMember">
<div class="py-1.5 flex items-center overflow-hidden" @click="clickMember">
<div class="h-9 w-9 flex-shrink-0">
<img v-if="member&&member.avatar" class="mx-w-full" :src="member.avatar" alt="">
<AppIcon
......
......@@ -4,12 +4,12 @@
<app-icon
type="png"
:path="primaryInfo.avator"
class-name="w-9 h-9"
class-name="w-9 h-9 flex-shrink-0"
/>
<div class="ml-3">{{ member.name }}</div>
<div
v-if="[0, 1].indexOf(member.role) > -1"
class="tag ml-1.5 text-xs text-white px-1 py-0.5 bg-color-primary rounded"
class="tag ml-1.5 text-xs flex-shrink-0 text-white px-1 py-0.5 bg-color-primary rounded"
>
{{ tagName(member) }}
</div>
......
......@@ -36,7 +36,7 @@
class="flex items-center"
>
<div
class="content flex-1 flex items-center mr-4"
class="content flex-1 w-full overflow-hidden flex items-center mr-4"
@click="selectTeam(t)"
>
<div v-if="t.id !== curDepId" class="radio-wrapper flex-shrink-0">
......@@ -56,8 +56,8 @@
></app-icon> -->
</div>
<div v-else class="w-4 h-4 rounded-full border"></div>
<div class="title flex-1 truncate py-3 ml-4">
{{ t.name }}{{ t.staffNum ? ` (${t.staffNum}) ` : '' }}
<div class="title flex-1 py-3 ml-4 flex w-full overflow-hidden">
<div class="truncate">{{ t.name }}</div><div class="flex-shrink-0">{{ t.staffNum ? ` (${t.staffNum}) ` : '' }}</div>
</div>
</div>
<div
......
......@@ -41,7 +41,10 @@
<!-- 横线 -->
<div class="absolute w-3 h-0.5 left-3 bg-border-lighter top-1/2 transform -translate-y-1/2" />
<!-- 标题 -->
<div class="title">{{ t.name }} {{ t.staffNum ? `(${t.staffNum})` : "" }}</div>
<div class="title w-full flex overflow-hidden pr-6">
<div class="truncate">{{ t.name }}</div>
<div class="flex-shrink-0 ml-1">{{ t.staffNum ? `(${t.staffNum})` : "" }}</div>
</div>
<!-- icon -->
<div
class="dot absolute right-3 top-1/2 transform -translate-y-1/2"
......
......@@ -151,8 +151,8 @@ export default Vue.extend({
const userInfoDev = {
depId: '168398222891421697',
entId: '168398222891421696',
id: '1K7cApKbEU9h5WySPVLNgdSd67i2XkSuoS',
// id: '1JSSTNLSJS1gctBLUSzbspd6LtmZ5XnAmd',
// id: '1K7cApKbEU9h5WySPVLNgdSd67i2XkSuoS',
id: '1JSSTNLSJS1gctBLUSzbspd6LtmZ5XnAmd',
joinTime: 1631090065,
name: '徐丹',
role: 3
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment