From d470ebd528b1f7f4765f86c734edc269ca25b84c Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Mon, 19 Aug 2024 10:19:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/page/Meeting/index.module.scss | 4 ++++
src/page/Meeting/index.tsx | 17 ++++++++++-------
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/page/Meeting/index.module.scss b/src/page/Meeting/index.module.scss
index 17a1c39..992b35d 100644
--- a/src/page/Meeting/index.module.scss
+++ b/src/page/Meeting/index.module.scss
@@ -37,6 +37,10 @@
>span {
font-size: 16px;
color: #EEEEEE;
+ flex-grow: 1;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
}
}
}
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index c181774..6150fb6 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -1060,7 +1060,7 @@ const Meeting: React.FC = () => {
}
- {meetingContentUser(currentLookUserAccount)}
+ {meetingContentUser(currentLookUserAccount, true)}
: null}
{currentLookUserStatus === 1 && currentLookUserAccount ?
@@ -1069,7 +1069,7 @@ const Meeting: React.FC = () => {
}
- {meetingContentUser(currentLookUserAccount)}
+ {meetingContentUser(currentLookUserAccount, true)}
{currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
: null}
{currentLookUserStatus === 2 && currentLookUserAccount ?
@@ -1079,7 +1079,7 @@ const Meeting: React.FC = () => {
- {meetingContentUser(currentLookUserAccount)}
+ {meetingContentUser(currentLookUserAccount, true)}
: null}
{currentLookUserStatus === 3 && currentLookUserAccount ?
@@ -1088,7 +1088,7 @@ const Meeting: React.FC = () => {
- {meetingContentUser(currentLookUserAccount)}
+ {meetingContentUser(currentLookUserAccount, true)}
{currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
: null}
{currentLookUserStatus === 4 && currentLookUserAccount ?
@@ -1098,7 +1098,7 @@ const Meeting: React.FC = () => {
- {meetingContentUser(currentLookUserAccount)}
+ {meetingContentUser(currentLookUserAccount, true)}
: null}
@@ -1380,7 +1380,7 @@ const Meeting: React.FC = () => {
)
}
-const meetingContentUser = (item: any) => {
+const meetingContentUser = (item: any, bool?: boolean) => {
return (
<>
@@ -1390,7 +1390,10 @@ const meetingContentUser = (item: any) => {
: null}
{!item.enableMicr ?
: ''}
- {item.userName}{item.roleId === '1' || item.isRoomManager ? item.roleId === '1' ? '(管理员)' : '(发言人)' : ''}
+
+ {item.userName}
+ {item.roleId === '1' || item.isRoomManager ? item.roleId === '1' ? '(管理员)' : '(发言人)' : ''}
+
>