From 027e31f192a3c495ee6a237b63db95cfcf6f6770 Mon Sep 17 00:00:00 2001 From: fangxiang Date: Sat, 19 Mar 2022 16:29:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=89=80?= =?UTF-8?q?=E6=9C=89=E5=AF=B9=E8=AF=9D=E6=A1=86=E5=9C=A8=E7=AD=89=E5=BE=85?= =?UTF-8?q?=E6=97=B6=E5=8F=AF=E4=BB=A5=E4=BD=BF=E7=94=A8ESC=E4=B8=AD?= =?UTF-8?q?=E6=96=AD=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/common/ClientConnection.ts | 20 +++ src/components/BackgroundImageDialog.vue | 2 +- src/components/ClockSignalSourceDialog.vue | 2 +- src/components/EdgeBlendingDialog.vue | 2 +- src/components/EditVolumeDialog.vue | 3 +- src/components/FileManageDialog.vue | 197 ++++++++++++++++++++- src/components/GridSettingDialog.vue | 2 +- src/components/ModeDialog.vue | 2 +- src/components/ModeGroupDialog.vue | 2 +- src/components/ModeTree.vue | 1 - src/components/PlanDialog.vue | 2 +- src/components/PlanGroupDialog.vue | 2 +- src/components/PlanTree.vue | 1 - src/components/PlaylistDialog.vue | 2 +- src/components/PollingSettingDialog.vue | 2 +- src/components/PollingTree.vue | 1 - src/components/RecoveryDatabaseDialog.vue | 2 +- src/components/RegisterDialog.vue | 2 +- src/components/SignalSourceDialog.vue | 2 +- src/components/SignalSourceGroupDialog.vue | 2 +- src/components/SignalSourceTree.vue | 1 - src/components/SubtitleDialog.vue | 2 +- src/components/SystemSettingDialog.vue | 2 +- src/components/UpgradeDialog.vue | 2 +- src/entities/WSProtocol.ts | 44 +++++ src/i18n/zh-CN/index.ts | 12 ++ 27 files changed, 285 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index 41d95da..5efe5bc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "media_player_client", - "version": "1.2.6", + "version": "1.3.1", "description": "A Quasar Framework app", "productName": "MediaPlayerClient", "author": "fangxiang ", diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts index 47d6cec..0b3e598 100644 --- a/src/common/ClientConnection.ts +++ b/src/common/ClientConnection.ts @@ -852,6 +852,26 @@ export default class ClientConnection { } } + public async fileOperator( + from_path: string, + to_path: string, + operator_type: string, + force_operator: boolean = true + ) { + try { + return await this.doRpc( + new Protocol.FileOperatorRequestEntity( + from_path, + to_path, + operator_type, + force_operator + ) + ); + } catch (e) { + console.error(e); + } + } + public async getEdgeBlendingInfo() { return await this.doRpc( new Protocol.GetEdgeBlendingInfoRequestEntity(0) diff --git a/src/components/BackgroundImageDialog.vue b/src/components/BackgroundImageDialog.vue index ccb6b71..36f2703 100644 --- a/src/components/BackgroundImageDialog.vue +++ b/src/components/BackgroundImageDialog.vue @@ -5,7 +5,7 @@ @before-hide="resetData" @keydown=" (evt) => { - if (evt.keyCode == 27) { + if (!loading && evt.keyCode == 27) { show_dialog = false; } } diff --git a/src/components/ClockSignalSourceDialog.vue b/src/components/ClockSignalSourceDialog.vue index 6bbac4f..1e7d01c 100644 --- a/src/components/ClockSignalSourceDialog.vue +++ b/src/components/ClockSignalSourceDialog.vue @@ -5,7 +5,7 @@ @before-hide="resetData" @keydown=" (evt) => { - if (evt.keyCode == 27) { + if (!loading && evt.keyCode == 27) { show_dialog = false; } } diff --git a/src/components/EdgeBlendingDialog.vue b/src/components/EdgeBlendingDialog.vue index b8f8b3d..b5fe895 100644 --- a/src/components/EdgeBlendingDialog.vue +++ b/src/components/EdgeBlendingDialog.vue @@ -5,7 +5,7 @@ @before-hide="resetData" @keydown=" (evt) => { - if (evt.keyCode == 27) { + if (!loading && evt.keyCode == 27) { show_dialog = false; } } diff --git a/src/components/EditVolumeDialog.vue b/src/components/EditVolumeDialog.vue index 518ffd2..c671d3f 100644 --- a/src/components/EditVolumeDialog.vue +++ b/src/components/EditVolumeDialog.vue @@ -1,9 +1,8 @@