对话框添加ESC关闭

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

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

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

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"

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"

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

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

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

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

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

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

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

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

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

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

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

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

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

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 *
+              (end_x * wall_width_scaler.value) /
-                wall_width_scaler.value) /
                 $store.state.device_screen_width,
-              (end_y *
+              (end_y * wall_height_scaler.value) /
-                wall_height_scaler.value) /
                 $store.state.device_screen_height
             )
           );