From 7ff2e48b84cdc6e6f767f6087c2a6bfb1863c104 Mon Sep 17 00:00:00 2001 From: fangxiang Date: Wed, 27 Jul 2022 19:39:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=9A=E8=BF=87=E5=8F=B3?= =?UTF-8?q?=E9=94=AE=E6=89=93=E5=BC=80=E8=BD=AE=E8=AF=A2=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BF=A1=E5=8F=B7=E6=BA=90?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E7=9A=84BUG=20=E4=BF=AE=E5=A4=8DPAD=E4=B8=8B?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=9B=BF=E6=8D=A2=E8=BD=AE=E8=AF=A2=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/components/PollingSettingDialog.vue | 4 +++- src/pad/ContentWall.vue | 15 +++++---------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 72160d0..5c11a29 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "media_player_client", - "version": "1.4.21", + "version": "1.4.22", "description": "A Quasar Framework app", "productName": "MediaPlayerClient", "author": "fangxiang ", diff --git a/src/components/PollingSettingDialog.vue b/src/components/PollingSettingDialog.vue index 8c182f7..84c12ba 100644 --- a/src/components/PollingSettingDialog.vue +++ b/src/components/PollingSettingDialog.vue @@ -320,6 +320,8 @@ export default defineComponent({ }, showDialog(name: string, options: StringKeyValueEntity[] | null) { show_dialog.value = true; + signals.value = GlobalData.getInstance().signal_source; + if (options) { datas.value = []; if (options.length % 2) { @@ -345,8 +347,8 @@ export default defineComponent({ _resolve = null; } _resolve = resolve; - show_dialog.value = true; + signals.value = GlobalData.getInstance().signal_source; if (options) { datas.value = []; diff --git a/src/pad/ContentWall.vue b/src/pad/ContentWall.vue index a07e6fc..75e140c 100644 --- a/src/pad/ContentWall.vue +++ b/src/pad/ContentWall.vue @@ -739,16 +739,11 @@ export default defineComponent({ switch (evt.type) { case "polling": { - if (signal_sources.length) { - const signal_source = signal_sources[0]; - if (signal_source) { - client?.replaceWindow2( - window.window_id, - evt.data.uuid, - true - ); - } - } + client?.replaceWindow2( + window.window_id, + evt.data.uuid, + true + ); } break;