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 @@