From 486aa814732191d2ca5cf5e37b96c8407bfbc3aa Mon Sep 17 00:00:00 2001
From: fangxiang <fangxiang@cloudview.work>
Date: Tue, 25 Jan 2022 19:41:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E6=A1=86=E6=B7=BB=E5=8A=A0ES?=
 =?UTF-8?q?C=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AboutDialog.vue             | 11 ++++++++++-
 src/components/BackgroundImageDialog.vue   | 13 ++++++++++++-
 src/components/ClockSignalSourceDialog.vue | 13 ++++++++++++-
 src/components/EditVolumeDialog.vue        | 11 ++++++++++-
 src/components/FileManageDialog.vue        | 13 ++++++++++++-
 src/components/GridSettingDialog.vue       | 13 ++++++++++++-
 src/components/ModeDialog.vue              | 13 ++++++++++++-
 src/components/ModeGroupDialog.vue         | 13 ++++++++++++-
 src/components/PlanDialog.vue              | 13 ++++++++++++-
 src/components/PlanGroupDialog.vue         | 13 ++++++++++++-
 src/components/PlaylistDialog.vue          | 13 ++++++++++++-
 src/components/PollingSettingDialog.vue    | 13 ++++++++++++-
 src/components/RecoveryDatabaseDialog.vue  | 13 ++++++++++++-
 src/components/SignalSourceDialog.vue      | 13 ++++++++++++-
 src/components/SignalSourceGroupDialog.vue | 13 ++++++++++++-
 src/components/SubtitleDialog.vue          |  7 +++++++
 src/components/SystemSettingDialog.vue     | 13 ++++++++++++-
 src/components/UpgradeDialog.vue           | 13 ++++++++++++-
 src/pages/WallPage.vue                     |  9 +++++----
 19 files changed, 212 insertions(+), 21 deletions(-)

diff --git a/src/components/AboutDialog.vue b/src/components/AboutDialog.vue
index 0c08945..199c0f8 100644
--- a/src/components/AboutDialog.vue
+++ b/src/components/AboutDialog.vue
@@ -1,5 +1,14 @@
 <template>
-  <q-dialog v-model="show_dialog">
+  <q-dialog
+    v-model="show_dialog"
+    @keydown="
+      (evt) => {
+        if (evt.keyCode == 27) {
+          show_dialog = false;
+        }
+      }
+    "
+  >
     <q-card class="overflow-hidden" style="overflow-y: scroll; max-width: 35vw">
       <q-card-section class="q-ma-none q-pa-sm">
         <div class="row">
diff --git a/src/components/BackgroundImageDialog.vue b/src/components/BackgroundImageDialog.vue
index 1976940..5bf0508 100644
--- a/src/components/BackgroundImageDialog.vue
+++ b/src/components/BackgroundImageDialog.vue
@@ -1,5 +1,16 @@
 <template>
-  <q-dialog persistent v-model="show_dialog" @before-hide="resetData">
+  <q-dialog
+    persistent
+    v-model="show_dialog"
+    @before-hide="resetData"
+    @keydown="
+      (evt) => {
+        if (evt.keyCode == 27) {
+          show_dialog = false;
+        }
+      }
+    "
+  >
     <q-card class="overflow-hidden" style="overflow-y: scroll; max-width: 35vw">
       <q-form @submit="onSubmit">
         <q-card-section class="q-ma-none q-pa-sm">
diff --git a/src/components/ClockSignalSourceDialog.vue b/src/components/ClockSignalSourceDialog.vue
index 9ff255b..6bbac4f 100644
--- a/src/components/ClockSignalSourceDialog.vue
+++ b/src/components/ClockSignalSourceDialog.vue
@@ -1,5 +1,16 @@
 <template>
-  <q-dialog persistent v-model="show_dialog" @before-hide="resetData">
+  <q-dialog
+    persistent
+    v-model="show_dialog"
+    @before-hide="resetData"
+    @keydown="
+      (evt) => {
+        if (evt.keyCode == 27) {
+          show_dialog = false;
+        }
+      }
+    "
+  >
     <q-card class="overflow-hidden" style="overflow-y: scroll; max-width: 60vw">
       <q-form @submit="onSubmit">
         <q-card-section class="q-ma-none q-pa-sm">
diff --git a/src/components/EditVolumeDialog.vue b/src/components/EditVolumeDialog.vue
index 9d1dcf6..518ffd2 100644
--- a/src/components/EditVolumeDialog.vue
+++ b/src/components/EditVolumeDialog.vue
@@ -1,5 +1,14 @@
 <template>
-  <q-dialog v-model="show_dialog">
+  <q-dialog
+    v-model="show_dialog"
+    @keydown="
+      (evt) => {
+        if (evt.keyCode == 27) {
+          show_dialog = false;
+        }
+      }
+    "
+  >
     <q-card
       class="overflow-hidden"
       style="overflow-y: scroll; max-width: 60vw; max-height: 40vh"
diff --git a/src/components/FileManageDialog.vue b/src/components/FileManageDialog.vue
index 928ef66..023b0a1 100644
--- a/src/components/FileManageDialog.vue
+++ b/src/components/FileManageDialog.vue
@@ -1,5 +1,16 @@
 <template>
-  <q-dialog persistent v-model="show_dialog" @before-hide="resetData">
+  <q-dialog
+    persistent
+    v-model="show_dialog"
+    @before-hide="resetData"
+    @keydown="
+      (evt) => {
+        if (evt.keyCode == 27) {
+          show_dialog = false;
+        }
+      }
+    "
+  >
     <q-card
       class="overflow-hidden"
       style="overflow-y: scroll; max-width: 60vw; max-height: 80vh"
diff --git a/src/components/GridSettingDialog.vue b/src/components/GridSettingDialog.vue
index 6ab61cd..87f2a18 100644
--- a/src/components/GridSettingDialog.vue
+++ b/src/components/GridSettingDialog.vue
@@ -1,5 +1,16 @@
 <template>
-  <q-dialog persistent v-model="show_dialog" @before-hide="resetData">
+  <q-dialog
+    persistent
+    v-model="show_dialog"
+    @before-hide="resetData"
+    @keydown="
+      (evt) => {
+        if (evt.keyCode == 27) {
+          show_dialog = false;
+        }
+      }
+    "
+  >
     <q-card class="overflow-hidden" style="overflow-y: scroll; max-width: 35vw">
       <q-form @submit="onSubmit">
         <q-card-section class="q-ma-none q-pa-sm">
diff --git a/src/components/ModeDialog.vue b/src/components/ModeDialog.vue
index 104709d..4b5281c 100644
--- a/src/components/ModeDialog.vue
+++ b/src/components/ModeDialog.vue
@@ -1,5 +1,16 @@
 <template>
-  <q-dialog persistent v-model="show_dialog" @before-hide="resetData">
+  <q-dialog
+    persistent
+    v-model="show_dialog"
+    @before-hide="resetData"
+    @keydown="
+      (evt) => {
+        if (evt.keyCode == 27) {
+          show_dialog = false;
+        }
+      }
+    "
+  >
     <q-card class="overflow-hidden" style="overflow-y: scroll; max-width: 45vw">
       <q-form @submit="onSubmit">
         <q-card-section class="q-ma-none q-pa-sm">
diff --git a/src/components/ModeGroupDialog.vue b/src/components/ModeGroupDialog.vue
index 193f6d2..fd98590 100644
--- a/src/components/ModeGroupDialog.vue
+++ b/src/components/ModeGroupDialog.vue
@@ -1,5 +1,16 @@
 <template>
-  <q-dialog persistent v-model="show_dialog" @before-hide="resetData">
+  <q-dialog
+    persistent
+    v-model="show_dialog"
+    @before-hide="resetData"
+    @keydown="
+      (evt) => {
+        if (evt.keyCode == 27) {
+          show_dialog = false;
+        }
+      }
+    "
+  >
     <q-card class="overflow-hidden" style="overflow-y: scroll; max-width: 45vw">
       <q-form @submit="onSubmit">
         <q-card-section class="q-ma-none q-pa-sm">
diff --git a/src/components/PlanDialog.vue b/src/components/PlanDialog.vue
index e3413e2..9505e2b 100644
--- a/src/components/PlanDialog.vue
+++ b/src/components/PlanDialog.vue
@@ -1,5 +1,16 @@
 <template>
-  <q-dialog persistent v-model="show_dialog" @before-hide="resetData">
+  <q-dialog
+    persistent
+    v-model="show_dialog"
+    @before-hide="resetData"
+    @keydown="
+      (evt) => {
+        if (evt.keyCode == 27) {
+          show_dialog = false;
+        }
+      }
+    "
+  >
     <q-card class="overflow-hidden" style="overflow-y: scroll; max-width: 50vw">
       <q-form @submit="onSubmit">
         <q-card-section class="q-ma-none q-pa-sm">
diff --git a/src/components/PlanGroupDialog.vue b/src/components/PlanGroupDialog.vue
index c8f9649..4452f87 100644
--- a/src/components/PlanGroupDialog.vue
+++ b/src/components/PlanGroupDialog.vue
@@ -1,5 +1,16 @@
 <template>
-  <q-dialog persistent v-model="show_dialog" @before-hide="resetData">
+  <q-dialog
+    persistent
+    v-model="show_dialog"
+    @before-hide="resetData"
+    @keydown="
+      (evt) => {
+        if (evt.keyCode == 27) {
+          show_dialog = false;
+        }
+      }
+    "
+  >
     <q-card class="overflow-hidden" style="overflow-y: scroll; max-width: 45vw">
       <q-form @submit="onSubmit">
         <q-card-section class="q-ma-none q-pa-sm">
diff --git a/src/components/PlaylistDialog.vue b/src/components/PlaylistDialog.vue
index 3e44e2e..9dfeb42 100644
--- a/src/components/PlaylistDialog.vue
+++ b/src/components/PlaylistDialog.vue
@@ -1,5 +1,16 @@
 <template>
-  <q-dialog persistent v-model="show_dialog" @before-hide="resetData">
+  <q-dialog
+    persistent
+    v-model="show_dialog"
+    @before-hide="resetData"
+    @keydown="
+      (evt) => {
+        if (evt.keyCode == 27) {
+          show_dialog = false;
+        }
+      }
+    "
+  >
     <q-card class="overflow-hidden" style="overflow-y: scroll; max-width: 60vw">
       <q-form @submit="onSubmit">
         <q-card-section class="q-ma-none q-pa-sm">
diff --git a/src/components/PollingSettingDialog.vue b/src/components/PollingSettingDialog.vue
index d8faa9a..71b0473 100644
--- a/src/components/PollingSettingDialog.vue
+++ b/src/components/PollingSettingDialog.vue
@@ -1,5 +1,16 @@
 <template>
-  <q-dialog persistent v-model="show_dialog" @before-hide="resetData">
+  <q-dialog
+    persistent
+    v-model="show_dialog"
+    @before-hide="resetData"
+    @keydown="
+      (evt) => {
+        if (evt.keyCode == 27) {
+          show_dialog = false;
+        }
+      }
+    "
+  >
     <q-card class="overflow-hidden" style="overflow-y: scroll; max-width: 50vw">
       <q-form @submit="onSubmit">
         <q-card-section class="q-ma-none q-pa-sm">
diff --git a/src/components/RecoveryDatabaseDialog.vue b/src/components/RecoveryDatabaseDialog.vue
index b345956..c767c68 100644
--- a/src/components/RecoveryDatabaseDialog.vue
+++ b/src/components/RecoveryDatabaseDialog.vue
@@ -1,5 +1,16 @@
 <template>
-  <q-dialog persistent v-model="show_dialog" @before-hide="resetData">
+  <q-dialog
+    persistent
+    v-model="show_dialog"
+    @before-hide="resetData"
+    @keydown="
+      (evt) => {
+        if (evt.keyCode == 27) {
+          show_dialog = false;
+        }
+      }
+    "
+  >
     <q-card class="overflow-hidden" style="overflow-y: scroll; max-width: 35vw">
       <q-form @submit="onSubmit">
         <q-card-section class="q-ma-none q-pa-sm">
diff --git a/src/components/SignalSourceDialog.vue b/src/components/SignalSourceDialog.vue
index 0a64151..48131ae 100644
--- a/src/components/SignalSourceDialog.vue
+++ b/src/components/SignalSourceDialog.vue
@@ -1,5 +1,16 @@
 <template>
-  <q-dialog persistent v-model="show_dialog" @before-hide="resetData">
+  <q-dialog
+    persistent
+    v-model="show_dialog"
+    @before-hide="resetData"
+    @keydown="
+      (evt) => {
+        if (evt.keyCode == 27) {
+          show_dialog = false;
+        }
+      }
+    "
+  >
     <q-card class="overflow-hidden" style="overflow-y: scroll; max-width: 45vw">
       <q-form @submit="onSubmit">
         <q-card-section class="q-ma-none q-pa-sm">
diff --git a/src/components/SignalSourceGroupDialog.vue b/src/components/SignalSourceGroupDialog.vue
index d040eeb..dcdc3c6 100644
--- a/src/components/SignalSourceGroupDialog.vue
+++ b/src/components/SignalSourceGroupDialog.vue
@@ -1,5 +1,16 @@
 <template>
-  <q-dialog persistent v-model="show_dialog" @before-hide="resetData">
+  <q-dialog
+    persistent
+    v-model="show_dialog"
+    @before-hide="resetData"
+    @keydown="
+      (evt) => {
+        if (evt.keyCode == 27) {
+          show_dialog = false;
+        }
+      }
+    "
+  >
     <q-card class="overflow-hidden" style="overflow-y: scroll; max-width: 45vw">
       <q-form @submit="onSubmit">
         <q-card-section class="q-ma-none q-pa-sm">
diff --git a/src/components/SubtitleDialog.vue b/src/components/SubtitleDialog.vue
index a052246..8e18b92 100644
--- a/src/components/SubtitleDialog.vue
+++ b/src/components/SubtitleDialog.vue
@@ -4,6 +4,13 @@
     v-model="show_dialog"
     @show="onShow"
     @before-hide="resetData"
+    @keydown="
+      (evt) => {
+        if (evt.keyCode == 27) {
+          show_dialog = false;
+        }
+      }
+    "
   >
     <q-card class="overflow-hidden" style="max-width: 70vw">
       <q-form @submit="onSubmit">
diff --git a/src/components/SystemSettingDialog.vue b/src/components/SystemSettingDialog.vue
index 0c5f27a..66d66ad 100644
--- a/src/components/SystemSettingDialog.vue
+++ b/src/components/SystemSettingDialog.vue
@@ -1,5 +1,16 @@
 <template>
-  <q-dialog persistent v-model="show_dialog" @before-hide="resetData">
+  <q-dialog
+    persistent
+    v-model="show_dialog"
+    @before-hide="resetData"
+    @keydown="
+      (evt) => {
+        if (evt.keyCode == 27) {
+          show_dialog = false;
+        }
+      }
+    "
+  >
     <q-card class="overflow-hidden" style="overflow-y: scroll; max-width: 60vw">
       <q-card-section class="q-ma-none q-pa-sm">
         <div class="row">
diff --git a/src/components/UpgradeDialog.vue b/src/components/UpgradeDialog.vue
index a4fd783..6cf99ef 100644
--- a/src/components/UpgradeDialog.vue
+++ b/src/components/UpgradeDialog.vue
@@ -1,5 +1,16 @@
 <template>
-  <q-dialog persistent v-model="show_dialog" @before-hide="resetData">
+  <q-dialog
+    persistent
+    v-model="show_dialog"
+    @before-hide="resetData"
+    @keydown="
+      (evt) => {
+        if (evt.keyCode == 27) {
+          show_dialog = false;
+        }
+      }
+    "
+  >
     <q-card class="overflow-hidden" style="overflow-y: scroll; max-width: 35vw">
       <q-form @submit="onSubmit">
         <q-card-section class="q-ma-none q-pa-sm">
diff --git a/src/pages/WallPage.vue b/src/pages/WallPage.vue
index be145ee..a88bf31 100644
--- a/src/pages/WallPage.vue
+++ b/src/pages/WallPage.vue
@@ -228,6 +228,9 @@ export default defineComponent({
     };
 
     const wallMouseDown = (evt: MouseEvent) => {
+      if (plan_running.value) {
+        return;
+      }
       if (evt.ctrlKey && wall.value) {
         let left =
           wall.value.offsetLeft + (wall.value.parentElement?.offsetLeft ?? 0);
@@ -286,11 +289,9 @@ export default defineComponent({
                 $store.state.device_screen_width,
               (start_y * wall_height_scaler.value) /
                 $store.state.device_screen_height,
-              (end_x *
-                wall_width_scaler.value) /
+              (end_x * wall_width_scaler.value) /
                 $store.state.device_screen_width,
-              (end_y *
-                wall_height_scaler.value) /
+              (end_y * wall_height_scaler.value) /
                 $store.state.device_screen_height
             )
           );