From e9acd3862109b43ac3018820e41fd4557e36d7d1 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 12 Oct 2021 14:18:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=92=A4=E9=94=80=E6=88=96=E8=80=85?=
 =?UTF-8?q?=E9=87=8D=E5=81=9A=E6=97=B6=EF=BC=8C=E8=A7=86=E5=9B=BE=E7=9F=A9?=
 =?UTF-8?q?=E9=98=B5=E6=A8=A1=E5=BC=8F=E8=AE=B0=E5=BD=95=E9=95=9C=E5=83=8F?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=B8=8D=E5=87=86=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/DeDrag/index.vue               | 10 +++++++---
 .../src/components/canvas/components/Editor/index.vue  |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue
index 0050af25ec..33b186f51b 100644
--- a/frontend/src/components/DeDrag/index.vue
+++ b/frontend/src/components/DeDrag/index.vue
@@ -1254,11 +1254,15 @@ export default {
         // this.recordMatrixCurStyle()
         setTimeout(() => {
           this.recordMatrixCurShadowStyle()
+          this.hasMove && this.$store.commit('recordSnapshot', 'handleUp')
+          // 记录snapshot后 移动已记录设置为false
+          this.hasMove = false
         }, 100)
+      }else{
+        this.hasMove && this.$store.commit('recordSnapshot', 'handleUp')
+        // 记录snapshot后 移动已记录设置为false
+        this.hasMove = false
       }
-      this.hasMove && this.$store.commit('recordSnapshot', 'handleUp')
-      // 记录snapshot后 移动已记录设置为false
-      this.hasMove = false
 
       removeEvent(document.documentElement, eventsFor.move, this.move)
 
diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index 1b30868ac8..8e1107895f 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -1024,7 +1024,7 @@ export default {
     // 镜像索引有变化 刷新一下矩阵（撤销重做等）
     snapshotIndex: {
       handler(newVal, oldVla) {
-        console.log('snapshotIndexChange:' + newVal)
+        // console.log('snapshotIndexChange:' + newVal)
         this.initMatrix()
       },
       deep: true

From a50747c8e3db469849ef306267e92f3bb5dd0fb2 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 12 Oct 2021 14:25:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E5=8E=BB=E6=8E=89=E7=94=BB?=
 =?UTF-8?q?=E5=B8=83=E9=94=AE=E7=9B=98=E4=BA=8B=E4=BB=B6=20=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2=E5=85=B6=E4=BB=96=E8=8F=9C=E5=8D=95=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E7=B2=98=E8=B4=B4=E6=8A=A5=E9=94=99=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/canvas/utils/shortcutKey.js    | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/frontend/src/components/canvas/utils/shortcutKey.js b/frontend/src/components/canvas/utils/shortcutKey.js
index a9df0dbdd4..a1966267ce 100644
--- a/frontend/src/components/canvas/utils/shortcutKey.js
+++ b/frontend/src/components/canvas/utils/shortcutKey.js
@@ -53,31 +53,31 @@ const unlockMap = {
 
 let isCtrlDown = false
 // 全局监听按键操作并执行相应命令
-export function listenGlobalKeyDown() {
-  window.onkeydown = (e) => {
-    const { curComponent } = store.state
-    if (e.keyCode === ctrlKey) {
-      isCtrlDown = true
-    } else if (e.keyCode === deleteKey && curComponent) {
-      store.commit('deleteComponent')
-      store.commit('recordSnapshot')
-    } else if (isCtrlDown) {
-      if (!curComponent || !curComponent.isLock) {
-        e.preventDefault()
-        unlockMap[e.keyCode] && unlockMap[e.keyCode]()
-      } else if (curComponent && curComponent.isLock) {
-        e.preventDefault()
-        lockMap[e.keyCode] && lockMap[e.keyCode]()
-      }
-    }
-  }
-
-  window.onkeyup = (e) => {
-    if (e.keyCode === ctrlKey) {
-      isCtrlDown = false
-    }
-  }
-}
+// export function listenGlobalKeyDown() {
+//   window.onkeydown = (e) => {
+//     const { curComponent } = store.state
+//     if (e.keyCode === ctrlKey) {
+//       isCtrlDown = true
+//     } else if (e.keyCode === deleteKey && curComponent) {
+//       store.commit('deleteComponent')
+//       store.commit('recordSnapshot')
+//     } else if (isCtrlDown) {
+//       if (!curComponent || !curComponent.isLock) {
+//         e.preventDefault()
+//         unlockMap[e.keyCode] && unlockMap[e.keyCode]()
+//       } else if (curComponent && curComponent.isLock) {
+//         e.preventDefault()
+//         lockMap[e.keyCode] && lockMap[e.keyCode]()
+//       }
+//     }
+//   }
+//
+//   window.onkeyup = (e) => {
+//     if (e.keyCode === ctrlKey) {
+//       isCtrlDown = false
+//     }
+//   }
+// }
 
 function copy() {
   store.commit('copy')