diff --git a/src/assets/icon45-active.png b/src/assets/icon45-active.png new file mode 100644 index 0000000..ea488cf Binary files /dev/null and b/src/assets/icon45-active.png differ diff --git a/src/assets/icon45.png b/src/assets/icon45.png new file mode 100644 index 0000000..1f79be2 Binary files /dev/null and b/src/assets/icon45.png differ diff --git a/src/components/SharedFilesModel/index.tsx b/src/components/SharedFilesModel/index.tsx index 8f17484..2e440af 100644 --- a/src/components/SharedFilesModel/index.tsx +++ b/src/components/SharedFilesModel/index.tsx @@ -139,7 +139,14 @@ const SharedFilesModel = forwardRef((props: any, ref: any) => { DeleteRoomFile(selectedRowKeys).then(res => { if (res.code === 200) { message.success('删除成功!') - getRoomFile() + if (fileList.pageIndex === 1) { + getRoomFile() + } else { + setFileList({ + ...fileList, + pageIndex: 1 + }) + } } }) } else { diff --git a/src/components/StupWizard/index.tsx b/src/components/StupWizard/index.tsx index 9323f44..1468f5d 100644 --- a/src/components/StupWizard/index.tsx +++ b/src/components/StupWizard/index.tsx @@ -28,8 +28,8 @@ const StupWizard = forwardRef((props: any, ref: any) => { const [list, setList] = useState([ { title: '通用', - icon: ImageUrl.icon39, - iconActive: ImageUrl.icon39Active, + icon: ImageUrl.icon45, + iconActive: ImageUrl.icon45Active, active: true, }, { diff --git a/src/page/Meeting/index.module.scss b/src/page/Meeting/index.module.scss index 836a483..5ea7095 100644 --- a/src/page/Meeting/index.module.scss +++ b/src/page/Meeting/index.module.scss @@ -476,7 +476,6 @@ overflow-y: auto; padding: 20px; box-sizing: border-box; - border-bottom: 1px solid #23272E; .meetingUserChatContentLeft { display: flex; @@ -542,6 +541,18 @@ } + .meetingUserChatButton { + display: flex; + flex-shrink: 0; + flex-wrap: wrap; + padding: 10px 20px; + box-sizing: border-box; + + >button { + margin: 4px 4px 0; + } + } + .meetingUserChatInput { flex-shrink: 0; padding: 10px 20px; @@ -550,6 +561,7 @@ display: flex; flex-direction: column; align-items: flex-end; + border-top: 1px solid #23272E; } } } diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 486b0a1..9694624 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -122,6 +122,12 @@ const Meeting: React.FC = () => { const [isShareUser, setIsShareUser] = useState(null) const [currentLookUserStatus, setCurrentLookUserStatus] = useState<0 | 1 | 2 | 3 | 4>(1) const [clickCurrentLookUserStatus, setClickCurrentLookUserStatus] = useState(true) + const [commonlyChatList] = useState([ + '能听到我说话吗?', + '听得到', + '听不到', + '我要发言', + ]) let userInfo = JSON.parse(storage.getItem('user') as string) const msgTips = '您不是管理员或发言人,无法开启此功能!' useEffect(() => { @@ -740,16 +746,17 @@ const Meeting: React.FC = () => { } }; // 聊天发送 - const sendMsg = (): void => { - if (textMsg) { + const sendMsg = (text?: string): void => { + let msg = text ? text : textMsg; + if (msg) { onInvoke('sendChannelMsg', { roomNum: state.channelId, - msg: textMsg, + msg: msg, }) setChatList((newChatList: any) => [...newChatList, { uid: state.uid, userName: user.userName, - message: textMsg, + message: msg, }]) setTextMsg('') } else { @@ -980,13 +987,13 @@ const Meeting: React.FC = () => { {meetingContentUser(item)} - {item.enableCamera ? null : meetingContentError(currentVideoId, item)} + {item.enableCamera ? null : meetingContentError(currentVideoId, item, item.roleId === '1' || item.isRoomManager)} {String(isShare) === item.screenShareId ?
屏幕分享中
: null} {user.roleId === '1' ? - + >全员看Ta : null} {item.uid !== user.uid ? : null} - : null} + {item.isRoomManager ? - : null} + {item.isRoomManager ? + >{item.enableCamera ? '关闭视频' : '打开视频'} : null} }>
@@ -1075,7 +1082,7 @@ const Meeting: React.FC = () => {
} {meetingContentUser(currentLookUserAccount, true)} - {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount, true)} + {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)} : null} {currentLookUserStatus === 2 && currentLookUserAccount ?
@@ -1094,7 +1101,7 @@ const Meeting: React.FC = () => {
{meetingContentUser(currentLookUserAccount, true)} - {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount, true)} + {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)} : null} {currentLookUserStatus === 4 && currentLookUserAccount ?
@@ -1194,7 +1201,7 @@ const Meeting: React.FC = () => { }) } }} - >{item.isRoomManager ? '取消房间发言人' : '设为房间发言人'} + >{item.isRoomManager ? '取消房间发言人' : '设为发言人'} : null} + {item.uid !== user.uid ? : null} + {item.uid !== user.uid ? : null} + {item.isRoomManager ? : null} + {item.isRoomManager ? : null} +
+ }> +
+
+ {item.userName} +
+
:
{item.userName} -
+ }
{item.message}
)} +
+ { + commonlyChatList.map((item: string, index: number) => { + return + }) + } +
{ setTextMsg(e.target.value) }}> - +
} @@ -1409,7 +1496,7 @@ const meetingContentError = (currentVideoId: any, item: any, bool?: boolean) => <>
diff --git a/src/utils/package/imageUrl.ts b/src/utils/package/imageUrl.ts index 8e072f4..4c184f5 100644 --- a/src/utils/package/imageUrl.ts +++ b/src/utils/package/imageUrl.ts @@ -55,6 +55,8 @@ import icon42 from '@/assets/icon42.png' import icon42Active from '@/assets/icon42-active.png' import icon43 from '@/assets/icon43.png' import icon44 from '@/assets/icon44.png' +import icon45 from '@/assets/icon45.png' +import icon45Active from '@/assets/icon45-active.png' export default { error, icon, @@ -113,4 +115,6 @@ export default { icon42Active, icon43, icon44, + icon45, + icon45Active, } \ No newline at end of file