From 7933ce95ada8b800ab1c1a93e9640865d2673b59 Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Thu, 16 Oct 2025 11:03:07 +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/assets/icon60-active.png | Bin 0 -> 339 bytes src/assets/icon60.png | Bin 0 -> 333 bytes src/assets/icon61-active.png | Bin 0 -> 315 bytes src/assets/icon61.png | Bin 0 -> 309 bytes src/page/Meeting/index.module.scss | 43 ++++++++++++++++++++++++++++- src/page/Meeting/index.tsx | 29 ++++++++++++++----- src/utils/package/imageUrl.ts | 8 ++++++ 7 files changed, 72 insertions(+), 8 deletions(-) create mode 100644 src/assets/icon60-active.png create mode 100644 src/assets/icon60.png create mode 100644 src/assets/icon61-active.png create mode 100644 src/assets/icon61.png diff --git a/src/assets/icon60-active.png b/src/assets/icon60-active.png new file mode 100644 index 0000000000000000000000000000000000000000..0839e5dbf63398dc692684b8971de1af6a1cd446 GIT binary patch literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFmiahIEGX(zL{nybVxzKRbDLa z#5t|7YhrN+4xLiANZ#@#=$Xd1dk5HV9_g9Pu-Grc_n@Dh0LO0q*^LGd&rf4KB&m_x z*!JNpyTuJ|G1<=da?auo_oTSmW<7lt6EpYL>Rj>Cw8}{F2UqRam?j>cQu+4ChC>@x z+-`JYXDGX)nVHl7^p45jAoc^BN)~SO+ws6SeEr;}aGnK4!u_7CqKw^)2To4$6y?y1 zEo6}V+i2u)?m&mJf_>kVt~Dzv*!t2Oy=r*{W=_~;J+JY~M5TWa`3XhBLh8hfh%o}QAm~r+$%ckEaHN%`A?e6`vrj|icz>Bx@{k%gAd)rO&uQJ{{Xb%jL|NoaO ha`gZiY@jeteOyrFzsQe|64UxL`AM#hWgsX@Y%3{{vzW3SIud%WeLpNW7|j{8xE zl?SS{8~!`3_srDo6g?n!A?s5%^Cj+EpOaX(2zypR7Z?RU;GsbMn5oH<$Fuf!Q;CrGAL=I1?_`%@ek7XSa7H%^lPGT1<& a!OURfZyPX;wc|5Tgu&C*&t;ucLK6U9B!M&l literal 0 HcmV?d00001 diff --git a/src/assets/icon61-active.png b/src/assets/icon61-active.png new file mode 100644 index 0000000000000000000000000000000000000000..0201ddfa23f4be0e240592c5adcb25233f2cb5b3 GIT binary patch literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ51uZLAr*{orWpz~83?$>YwVdY zS2X0BSlod_r<5&}BdRnlyY`xI=!}$LbDp%Z;i{VTPeqjtzkl#Xe|Ua^p^!Z*dXeHG z4o1CieXj14st-M2J`wJG^3DdE*sk`=25qG`El*3>9oS)?A6k%bbeVV3jl>nZN>eT| zHVEry{jx~j`SoD;X&3bS5Zy9=u8I7 zzl}x?WeV04WKZy=uy10{WM9%88`K%Un?FGMWt7V$$?O$N*B=zHYj|U}%xPByuV>!M zj|&AH_*#RUCsi-9IPgUAY;^m;e92e*cm-kiiD>J2Qjvt9Oou>yH@&MHoC? L{an^LB{Ts5@RNU- literal 0 HcmV?d00001 diff --git a/src/assets/icon61.png b/src/assets/icon61.png new file mode 100644 index 0000000000000000000000000000000000000000..4ba4c6fea9494a58677ea1e99f2f21060887381a GIT binary patch literal 309 zcmV-50m}Y~P)l%Y}vin1*0oP=fPyQG0R#P-S! zcn7=#-U07`cfdQ4>;MC5latg(JutukqNzn_GPa-{YD|6t13D!@6RZhCZk3r>8PF2~ zd#AZ~div { + width: 100%; + padding: 2px 10px; + box-sizing: border-box; + display: flex; + align-items: flex-start; + + >span { + display: flex; + align-items: center; + + >img { + height: 24px; + } + } + } + + >span { + font-size: 14px; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + color: white; + width: 100%; + padding: 0 10px; + box-sizing: border-box; + } + } + .meetingAbsoluteText { position: absolute; width: 100%; @@ -409,12 +447,15 @@ height: 160px; } } - .meetingContentBodyLeftSpeakerModeNoScrollbar{ + + .meetingContentBodyLeftSpeakerModeNoScrollbar { width: 246px !important; + &::-webkit-scrollbar { display: none; } } + // 单画面模式 .meetingContentBodyLeftSingleScreenMode { width: 100%; diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 7882a69..65f1efa 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -2141,7 +2141,7 @@ const Meeting: React.FC = () => { setKeyOpenChildWindow('shareScreenWindow', true) window.electron.setMainWindowSize({ width: 250, - height: 200, + height: 230, }) window.electron.setPosition('right') } @@ -2723,15 +2723,30 @@ const Meeting: React.FC = () => { setIsNetworkQuality(false) }}> {isScreenCapture ?
-
{currentSpeakUser.length ? '正在说话:' + currentSpeakUser.join(';') : '正在说话:'}
+
+
+ { + setIsExpand(!isExpand) + window.electron.setChildWindow({ + height: !isExpand ? 160 * 4 + 20 : 230, + width: 250, + key: 'main' + }) + }}> + + + +
+ {currentSpeakUser.length ? '正在说话:' + currentSpeakUser.join(';') : '正在说话:'} +
{ setIsExpand(!isExpand) window.electron.setChildWindow({ - height: !isExpand ? 160 * 4 + 20 : 200, + height: !isExpand ? 160 * 4 + 20 : 230, width: 250, key: 'main' }) - }}>{isExpand ? '收起' : '查看参会者'}
+ }}>{isExpand ? '收起' : '查看参会者'}
: null} {contextMenu ?
{
setShowCaret(true)} onMouseLeave={() => setShowCaret(false)}> {isAdmin && currentLookUserAccount && !isScreenCapture ? getSettingIcon() : null} @@ -3095,7 +3110,7 @@ const Meeting: React.FC = () => { container.scrollLeft += 100 }}> -
:
{ +
:
{ const container = document.getElementById('videoView') as HTMLElement; container.scrollTop += 100 }}> diff --git a/src/utils/package/imageUrl.ts b/src/utils/package/imageUrl.ts index d1d36c3..95aad5d 100644 --- a/src/utils/package/imageUrl.ts +++ b/src/utils/package/imageUrl.ts @@ -89,6 +89,10 @@ import icon56Active from '@/assets/icon56-active.png' import icon57 from '@/assets/icon57.png' import icon58 from '@/assets/icon58.png' import icon59 from '@/assets/icon59.png' +import icon60 from '@/assets/icon60.png' +import icon61 from '@/assets/icon61.png' +import icon60Active from '@/assets/icon60-active.png' +import icon61Active from '@/assets/icon61-active.png' export default { loading, icon, @@ -181,4 +185,8 @@ export default { icon57, icon58, icon59, + icon60, + icon61, + icon60Active, + icon61Active, } \ No newline at end of file