From 3accecee65d68660696d9f33589c2e3d9875f69c Mon Sep 17 00:00:00 2001
From: miao <2514145421@qq.com>
Date: Wed, 1 Feb 2023 09:26:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AD=94=E5=A2=99=EF=BC=9A=E5=B0=86=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=8C=89=E9=92=AE=E6=8D=A2=E6=88=90shift+s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ControlPanelDialog.vue | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/components/ControlPanelDialog.vue b/src/components/ControlPanelDialog.vue
index ad8c2b4..6ec2246 100644
--- a/src/components/ControlPanelDialog.vue
+++ b/src/components/ControlPanelDialog.vue
@@ -57,6 +57,11 @@
           //右
           alignRight();
         }
+        //保存魔墙配置
+        if (evt.keyCode==83&&evt.shiftKey) {
+          //右
+          export_magic_wall();
+        }
       }
     "
     @keyup="
@@ -555,6 +560,7 @@
         <q-separator />
         <q-card-actions>
           <q-btn
+          v-if="magic_isbutton"
             :loading="loading"
             flat
             :label="$t('export magic')"
@@ -640,13 +646,10 @@ import {
 } from "quasar";
 import { useI18n } from "vue-i18n";
 import GlobalData from "src/common/GlobalData";
-import { HttpProtocol } from "src/entities/HttpProtocol";
 import vue3ResizeDrag from "../third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
-import itemDrag from "src/third_lib/vue3-resize-drag/components/vue3-resize-drag/func/drag";
 import MagicWallConfig from "src/entities/MagicWallConfig";
 import { PointF } from "src/entities/RectF";
 import EventBus, { EventNamesDefine } from "src/common/EventBus";
-import { number } from "@intlify/core-base";
 
 export class test_monitor {
   uuid = "";
@@ -748,6 +751,7 @@ export default defineComponent({
     let $t = useI18n();
     let lcm = ref(0);
     let show_dialog = ref(false);
+    let magic_isbutton=ref(false)
     let loading = ref(false);
     let wall: Ref<HTMLElement | null> = ref(null);
     let current_index = ref(-1);
@@ -997,6 +1001,14 @@ export default defineComponent({
           point_right_bottom,
         ];
         return point_list;
+      }else{
+        const point_list =[
+          {x:item.currentx,y:item.currenty},//左上
+          {x:x2,y:item.currenty},//右上
+          {x:item.currentx,y:y2},//左下
+          {x:x2,y:y2}//右下
+        ]
+        return point_list;
       }
     };
     let offsetHeight = ref(0.0);
@@ -1272,6 +1284,7 @@ export default defineComponent({
       }
     });
     return {
+      magic_isbutton,
       refresh_all,
       getpx,
       lcm,
@@ -1361,7 +1374,6 @@ export default defineComponent({
                 extend(true, item, test_monitor_list.value[element.index]);
                 let sizeh = wall_dom.offsetHeight / element.background_h;
                 let sizew = wall_dom.offsetWidth / element.background_w;
-
                 item.currentx = element.lt.x * wall_dom.offsetWidth;
                 item.currenty = element.lt.y * wall_dom.offsetHeight;
                 percenter.value = parseFloat(element.percenter.toString());
@@ -1622,6 +1634,7 @@ export default defineComponent({
         test_monitor_wall.value[index].isShow = true;
         realtime_upload();
       },
+      //cache和与主存间的地址映射由硬件自动完成
       closeAllWindows() {
         current_index.value = -1;
         test_monitor_wall.value.forEach((ele) => {
@@ -1898,7 +1911,7 @@ export default defineComponent({
           }
         });
         res=res.replace(/\"/g,"");
-        const status = exportFile("important.txt", res);
+        const status = exportFile("magic_wall.txt", res);
         if (status === true) {
         } else {
           $q.notify({