From e1986701323776ca2ab53b06eb8f25a0bf676688 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Tue, 22 Nov 2022 18:11:48 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E5=A4=B4=E5=83=8F=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E8=BF=87=E9=95=BF=E6=98=BE=E7=A4=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/components/UserAvatar.vue | 2 +- resources/assets/sass/components/user-avatar.scss | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/resources/assets/js/components/UserAvatar.vue b/resources/assets/js/components/UserAvatar.vue index bb962f7a4..ff690da46 100755 --- a/resources/assets/js/components/UserAvatar.vue +++ b/resources/assets/js/components/UserAvatar.vue @@ -8,7 +8,7 @@

{{$L('昵称')}}: {{user.nickname}}{{$L('已删除')}}{{$L('已离职')}}

-

{{$L('部门')}}: {{user.department_name || '-'}}

+

{{$L('部门')}}: {{user.department_name || '-'}}

{{$L('职位/职称')}}: {{user.profession || '-'}}

{{$L('删除时间')}}: {{user.delete_at}}

{{$L('离职时间')}}: {{user.disable_at}}

diff --git a/resources/assets/sass/components/user-avatar.scss b/resources/assets/sass/components/user-avatar.scss index 3b822bec5..4226f408e 100755 --- a/resources/assets/sass/components/user-avatar.scss +++ b/resources/assets/sass/components/user-avatar.scss @@ -80,6 +80,12 @@ line-height: 1.5; > p { padding: 1px 2px; + &.department-name { + max-width: 220px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } > em { font-style: normal; &.disabled,