diff --git a/src/components/UserName/index.tsx b/src/components/UserName/index.tsx
index e60c209..6189dbb 100644
--- a/src/components/UserName/index.tsx
+++ b/src/components/UserName/index.tsx
@@ -47,6 +47,10 @@ const UserName = forwardRef((props: any, ref: any) => {
onClick={async () => {
const stateInfo = await JSON.parse(storage.getItem('stateInfo') as string);
if (info.userName) {
+ if (info.userName.length > 10) {
+ message.error('用户名称最多10个字!')
+ return
+ }
PutAlterUname({
nickName: info.userName,
roomNum: stateInfo.channelId,
diff --git a/src/page/Home/User/index.tsx b/src/page/Home/User/index.tsx
index e297033..8ef9195 100644
--- a/src/page/Home/User/index.tsx
+++ b/src/page/Home/User/index.tsx
@@ -458,6 +458,9 @@ const User: React.FC = () => {
if (!addUserFrom.UserName && isCreateUser !== 'batch') {
return message.error('请输入用户名称!')
}
+ if (addUserFrom.UserName.length > 10) {
+ return message.error('用户名称最多10个字!')
+ }
if (addUserFrom.year === '') {
return message.error('请输入届!')
}
diff --git a/src/page/Login/index.tsx b/src/page/Login/index.tsx
index e722f49..2fb463b 100644
--- a/src/page/Login/index.tsx
+++ b/src/page/Login/index.tsx
@@ -315,6 +315,9 @@ const Login: React.FC = () => {
if (!anonInfo.nickName) {
return message.error('请输入参会昵称!')
}
+ if (anonInfo.nickName.length > 10) {
+ return message.error('参会昵称最多10个字!')
+ }
storage.setItem('loading', true)
PostAnonLogin(anonInfo).then(async (res) => {
if (res.code == 200) {
diff --git a/src/page/Meeting/ChatBigWindow/index.module.scss b/src/page/Meeting/ChatBigWindow/index.module.scss
index 6b65512..6c6b70b 100644
--- a/src/page/Meeting/ChatBigWindow/index.module.scss
+++ b/src/page/Meeting/ChatBigWindow/index.module.scss
@@ -46,6 +46,8 @@
font-size: 14px;
color: #F3F3F5;
margin-left: 4px;
+ display: flex;
+ align-items: center;
}
>div {}
@@ -77,6 +79,8 @@
>span {
font-size: 14px;
color: #F3F3F5;
+ display: flex;
+ align-items: center;
}
>div {
diff --git a/src/page/Meeting/ChatBigWindow/index.tsx b/src/page/Meeting/ChatBigWindow/index.tsx
index e87418b..a777ce3 100644
--- a/src/page/Meeting/ChatBigWindow/index.tsx
+++ b/src/page/Meeting/ChatBigWindow/index.tsx
@@ -206,19 +206,30 @@ const ChatBigWindow: React.FC = () => {
>移出会议 : null}
:
用户不在房间内
}>
-
+
{item.uid !== user.uid ?
-
{item.userName} {dayjs(item.timestamp).format('HH:mm:ss')} :
-
{dayjs(item.timestamp).format('HH:mm:ss')} {item.userName}
+
+ {item.userName}
+ {dayjs(item.timestamp).format('HH:mm:ss')}
+ :
+
+ {dayjs(item.timestamp).format('HH:mm:ss')}
+ {item.userName}
+
}
-
- :
+ :
{item.uid !== user.uid ?
-
{item.userName}{dayjs(item.timestamp).format('HH:mm:ss')} :
-
{dayjs(item.timestamp).format('HH:mm:ss')} {item.userName}
+
+ {item.userName}
+ {dayjs(item.timestamp).format('HH:mm:ss')}
+ :
+
+ {dayjs(item.timestamp).format('HH:mm:ss')}
+ {item.userName}
+
}
}
{item.message}
diff --git a/src/page/Meeting/ChatSmallWindow/index.module.scss b/src/page/Meeting/ChatSmallWindow/index.module.scss
index a5de0b3..b0dd6c1 100644
--- a/src/page/Meeting/ChatSmallWindow/index.module.scss
+++ b/src/page/Meeting/ChatSmallWindow/index.module.scss
@@ -31,7 +31,7 @@
display: flex;
>span:nth-child(1) {
- white-space: nowrap;
+ word-break: break-all;
color: #ff970f;
}
diff --git a/src/page/Meeting/NoticeWindow/index.tsx b/src/page/Meeting/NoticeWindow/index.tsx
index 6a00b7b..58930d2 100644
--- a/src/page/Meeting/NoticeWindow/index.tsx
+++ b/src/page/Meeting/NoticeWindow/index.tsx
@@ -21,7 +21,10 @@ const NoticeWindow: React.FC = () => {
api.open({
message: '',
description:
-
{noticeItem.uname}申请发言
+
+
{noticeItem.uname}
+
申请发言
+