+
- {item.userName}
- :
+ {item.userName}:
{item.message}
diff --git a/src/page/Meeting/CurrentSpeakUserWindow/index.tsx b/src/page/Meeting/CurrentSpeakUserWindow/index.tsx
index b3b42c9..3187d09 100644
--- a/src/page/Meeting/CurrentSpeakUserWindow/index.tsx
+++ b/src/page/Meeting/CurrentSpeakUserWindow/index.tsx
@@ -22,7 +22,7 @@ const CurrentSpeakUserWindow: React.FC = () => {
return (
<>
-
+
{inputValue ? `正在说话:${inputValue}` : '无人说话'}
diff --git a/src/page/Meeting/ShareScreenWindow/index.module.scss b/src/page/Meeting/ShareScreenWindow/index.module.scss
index 7f5136c..6bdae31 100644
--- a/src/page/Meeting/ShareScreenWindow/index.module.scss
+++ b/src/page/Meeting/ShareScreenWindow/index.module.scss
@@ -28,14 +28,9 @@
flex-grow: 1;
align-items: center;
justify-content: space-between;
- opacity: 0;
background-color: #07090B;
display: flex;
- &:hover {
- opacity: 1 !important;
- }
-
.shareScreenWindowContentList {
display: flex;
flex-grow: 1;
@@ -74,4 +69,17 @@
}
}
}
+
+ .shareScreenWindowExpand {
+ display: flex;
+ align-items: center;
+ margin: 0 auto;
+ background-color: lighten(#07090B, 4%);
+ padding: 0 6px;
+ cursor: pointer;
+
+ >span {
+ font-size: 12px;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/page/Meeting/ShareScreenWindow/index.tsx b/src/page/Meeting/ShareScreenWindow/index.tsx
index 8e8aa13..8e93a31 100644
--- a/src/page/Meeting/ShareScreenWindow/index.tsx
+++ b/src/page/Meeting/ShareScreenWindow/index.tsx
@@ -4,6 +4,7 @@ import styles from '@/page/Meeting/ShareScreenWindow/index.module.scss'
import { storage } from '@/utils';
import ImageUrl from '@/utils/package/imageUrl';
import { getKeyOpenChildWindow, setKeyOpenChildWindow } from '@/utils/package/public';
+import { CaretDownOutlined, CaretUpOutlined } from '@ant-design/icons';
import { Button } from 'antd';
import { useEffect, useState } from "react";
const ShareScreenWindow: React.FC = () => {
@@ -23,7 +24,7 @@ const ShareScreenWindow: React.FC = () => {
select: false,
},
{
- title: '成员列表',
+ title: '成员',
icon: ImageUrl.icon30,
iconSelect: ImageUrl.icon30Select,
active: false,
@@ -46,7 +47,7 @@ const ShareScreenWindow: React.FC = () => {
},
])
const [time, setTime] = useState('')
- const [isHover, setIsHover] = useState(true)
+ const [isExpand, setIsExpand] = useState(false)
const [roomUserLists, setRoomUserLists] = useState
([])
const channel = new BroadcastChannel('meeting_channel');
const userInfo = JSON.parse(storage.getItem('user') as string)
@@ -109,19 +110,16 @@ const ShareScreenWindow: React.FC = () => {
}
return (
<>
-
+
{time} 共享中
- {isHover ? {
+ {isExpand ? {
channel.postMessage({
type: 'shareScreenWindowClose'
});
- }}>结束共享 : null}
+ }}>结束共享 : 结束共享}
-
setIsHover(false)}
- onMouseLeave={() => setIsHover(true)}
- >
+ {isExpand ? null :
{footerLists.map((item: any, index: number) => {
return (
@@ -174,18 +172,29 @@ const ShareScreenWindow: React.FC = () => {
: ''}
{item.select ?

:

}
-
{item.title}{item.title === '成员列表' ? `(${roomUserLists.filter((item: any) => item.isRoom).length})` : ''}
+
{item.title}{item.title === '成员' ? `(${roomUserLists.filter((item: any) => item.isRoom).length})` : ''}
)
})}
-
}
+ {
+ setIsExpand(!isExpand)
+ window.electron.setChildWindow({
+ width: isExpand ? 440 : 440 / 2,
+ height: 80,
+ key: 'shareScreenWindow',
+ })
+ }}>
+ {isExpand ? '展开' : '收起'}
+ {isExpand ? : }
>
diff --git a/src/page/Meeting/index.module.scss b/src/page/Meeting/index.module.scss
index 262c256..cbb972d 100644
--- a/src/page/Meeting/index.module.scss
+++ b/src/page/Meeting/index.module.scss
@@ -937,6 +937,7 @@
width: 144px;
height: 94px;
box-sizing: border-box;
+ border: 5px solid transparent;
>img {
width: 100%;
@@ -953,14 +954,16 @@
&:hover {
>div {
- border: 1px solid #EBEBEB;
+ border: 5px solid yellow;
+ box-sizing: border-box;
}
}
}
.active {
>div {
- border: 1px solid #EBEBEB;
+ border: 5px solid yellow;
+ box-sizing: border-box;
}
}
}
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 917c431..84247ed 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -1512,14 +1512,14 @@ const Meeting: React.FC = () => {
if (!isOpen) {
window.electron.createChildWindow({
url: location.origin + `/#/shareScreenWindow`,
- width: 540,
- height: 70,
+ width: 400,
+ height: 80,
key: 'shareScreenWindow',
})
window.electron.createChildWindow({
url: location.origin + `/#/chatSmallWindow`,
width: 200,
- height: 300,
+ height: 150,
key: 'chatSmallWindow',
})
window.electron.createChildWindow({
diff --git a/src/render.d.ts b/src/render.d.ts
index 7c85640..71555a0 100644
--- a/src/render.d.ts
+++ b/src/render.d.ts
@@ -19,6 +19,7 @@ export interface IElectronAPI {
setRegistry: (uuid: string) => any;
getRegistry: () => any;
createChildWindow: (config: any) => void;
+ setChildWindow: (config: any) => void;
closeChildWindow: (key: string) => void;
mainWindowCenter: () => any;
mainWindowHide: () => any;