From d070314118c10ff52034b0261459968c9252d077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=E6=98=B5=E7=A7=B0=E9=87=8D=E8=A6=81=E5=90=97O?= Date: Sun, 15 Mar 2026 18:33:33 +0800 Subject: [PATCH] =?UTF-8?q?refactor(window):=20=E4=BC=98=E5=8C=96=E6=82=AC?= =?UTF-8?q?=E6=B5=AE=E5=88=97=E8=A1=A8=E7=AA=97=E5=8F=A3=E7=9A=84=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E5=92=8C=E5=85=B3=E9=97=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 简化 close_float_list_window 命令的返回值处理 - 清理 create_float_list_window_impl 中的多余空行 - 修复悬浮列表组件中全员静音状态的变量引用 - 移除样式文件中的多余空行 - 更新教师端会议页面中组件卸载生命周期为 onBeforeUnmount - 在会议结束时确保关闭悬浮列表窗口 - 简化 Vite 配置中 VueDevTools 的配置选项 --- src-tauri/src/window/commands.rs | 3 +-- src-tauri/src/window/create_float_list_window.rs | 4 ++-- .../floating-list-window/aa-components/floating-list.vue | 2 +- src/styles/main/dom.scss | 2 -- src/views/meeting/meeting-room/meeting-room-teacher.vue | 8 +++----- vite.config.ts | 4 +--- 6 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src-tauri/src/window/commands.rs b/src-tauri/src/window/commands.rs index a19093d..59a2bf5 100644 --- a/src-tauri/src/window/commands.rs +++ b/src-tauri/src/window/commands.rs @@ -15,8 +15,7 @@ pub async fn create_float_list_window(app: AppHandle, is_teacher_muted: bool) -> /// 关闭悬浮列表窗口 #[tauri::command] pub fn close_float_list_window(app: AppHandle) -> Result { - close_float_list_window_impl(std::sync::Arc::new(app)) - .map(|_| "success".to_string()) + close_float_list_window_impl(std::sync::Arc::new(app)).map(|_| "success".to_string()) } /// 创建弹出框窗口 diff --git a/src-tauri/src/window/create_float_list_window.rs b/src-tauri/src/window/create_float_list_window.rs index 2026641..435436b 100644 --- a/src-tauri/src/window/create_float_list_window.rs +++ b/src-tauri/src/window/create_float_list_window.rs @@ -76,7 +76,7 @@ pub async fn create_float_list_window_impl(app: Arc>, i /// 关闭悬浮列表窗口（内部实现） pub fn close_float_list_window_impl(app: Arc>) -> Result<(), String> { use tauri::Manager; - + // 尝试获取悬浮列表窗口 if let Some(window) = app.get_webview_window(WindowLabel::FLOAT_LIST.as_ref()) { // 关闭窗口 @@ -85,7 +85,7 @@ pub fn close_float_list_window_impl(app: Arc>) -> Resul } else { log::warn!("悬浮列表窗口不存在，无需关闭"); } - + Ok(()) } diff --git a/src/other_pages/floating-list-window/aa-components/floating-list.vue b/src/other_pages/floating-list-window/aa-components/floating-list.vue index 8aaa614..c692c41 100644 --- a/src/other_pages/floating-list-window/aa-components/floating-list.vue +++ b/src/other_pages/floating-list-window/aa-components/floating-list.vue @@ -7,7 +7,7 @@
- +
全员静音 diff --git a/src/styles/main/dom.scss b/src/styles/main/dom.scss index 4dc0ef9..e4d3931 100644 --- a/src/styles/main/dom.scss +++ b/src/styles/main/dom.scss @@ -69,8 +69,6 @@ button:disabled { opacity: 0.6; } - - fieldset { padding: 0.35em 0.75em 0.625em; } diff --git a/src/views/meeting/meeting-room/meeting-room-teacher.vue b/src/views/meeting/meeting-room/meeting-room-teacher.vue index ccb9065..d80574c 100644 --- a/src/views/meeting/meeting-room/meeting-room-teacher.vue +++ b/src/views/meeting/meeting-room/meeting-room-teacher.vue @@ -181,7 +181,7 @@ import IconMdiVolumeHigh from '~icons/mdi/volume-high'; import IconMdiVolumeOff from '~icons/mdi/volume-off'; import { ElIcon, ElMessageBox, ElMessage as Toast } from 'element-plus'; - import { computed, onMounted, onUnmounted, ref, watchEffect } from 'vue'; + import { computed, onBeforeUnmount, onMounted, ref, watchEffect } from 'vue'; import { useRoute, useRouter } from 'vue-router'; import { useStreamType } from './useStreamType'; import { usePermissions } from './usePermissions'; @@ -1001,6 +1001,7 @@ role.value = String(route.query.role) === 'student' ? 'student' : 'teacher'; try { + await closeFloatListWindow(); // 使用 Hook 加入 WebSocket 房间获取房间数据 const roomData = await meetingSocket.joinRoom(socket); // 设置房间 ID（用于权限管理中的控制消息发送） @@ -1041,10 +1042,7 @@ /** * 组件卸载生命周期钩子 */ - onUnmounted(async () => { - if (isLeaving) { - return; - } + onBeforeUnmount(async () => { socket.off('message', onSocketMessage); // 关闭悬浮窗 await closeFloatListWindow(); diff --git a/vite.config.ts b/vite.config.ts index 16b087f..8747636 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -37,9 +37,7 @@ export default defineConfig(async ({ command }: ConfigEnv): Promise base: './', // 基础路径 plugins: [ - VueDevTools({ - appendTo: 'index.html', - }), + VueDevTools({}), Vue({}), // 自动导入API