fix: #189; !#zh: 修正点击左侧组件，在画布中组件会出现2次

ly525 · Jul 4, 2020 · 2a3a7df · 2a3a7df
1 parent 67b129a
commit 2a3a7df
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/front-end/h5/src/components/core/editor/drag-mixin.js b/front-end/h5/src/components/core/editor/drag-mixin.js
@@ -122,6 +122,9 @@ export default {
       document.body.removeChild(dragDom)
       dragDom = null
 
+      const canMousedown = this.checkCanMousedown(e, { minOffset: 10 })
+      if (!canMousedown) return
+
       const canvasWrapper = document.querySelector('.canvas-wrapper')
       const position = canvasWrapper.getBoundingClientRect()
       this.dragElement && this.clone({
@@ -131,6 +134,12 @@ export default {
           top: e.clientY - layerY - position.top
         }
       })
+    },
+    checkCanMousedown (e, { minOffsetX, minOffsetY, minOffset }) {
+      const offsetX = e.clientX - dragConfig.origin.clientX
+      const offsetY = e.clientY - dragConfig.origin.clientY
+
+      return offsetX >= (minOffsetX || minOffset) || offsetY >= (minOffsetY || minOffset)
     }
   },
   updated () {

diff --git a/front-end/h5/src/locales/lang/en-US.js b/front-end/h5/src/locales/lang/en-US.js
@@ -98,7 +98,7 @@ export default {
     },
     tip: {
       componentUsage: 'Tip: just {0} on component',
-      click: 'click'
+      click: 'click/drag'
     }
   }
 }
diff --git a/front-end/h5/src/locales/lang/zh-CN.js b/front-end/h5/src/locales/lang/zh-CN.js
@@ -107,7 +107,7 @@ export default {
     },
     tip: {
       componentUsage: '使用提示: {0} 组件即可',
-      click: '点击'
+      click: '点击或拖拽'
     }
   }
 }