Merge pull request #909 from dataease/dev

Dev

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)
 

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

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')