From 1d21fdb988ab4405a28a50dfdcfc500c2388e5fa Mon Sep 17 00:00:00 2001 From: jeo young <1414294708@qq.com> Date: Sat, 17 Dec 2022 01:32:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8C=89=E4=BD=8F=E9=BC=A0=E6=A0=87?= =?UTF-8?q?=E4=B8=AD=E9=94=AE=20=E5=8F=AF=E4=BB=A5=E6=8B=96=E6=8B=BD?= =?UTF-8?q?=E7=94=BB=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContentEdit/components/EditRule/ruler.vue | 14 ++++++++------ src/views/chart/ContentEdit/hooks/useDrag.hook.ts | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/views/chart/ContentEdit/components/EditRule/ruler.vue b/src/views/chart/ContentEdit/components/EditRule/ruler.vue index 0fe42a01..cd53e0c0 100644 --- a/src/views/chart/ContentEdit/components/EditRule/ruler.vue +++ b/src/views/chart/ContentEdit/components/EditRule/ruler.vue @@ -46,7 +46,7 @@ const handleWheel = (e: any) => { // const nextScale = parseFloat(Math.max(.2, scale.value - e.deltaY / canvasBox().height).toFixed(2)) // chartEditStore.setScale(nextScale) - chartEditStore.setScale(e.wheelDelta >= 120 ? scale.value + 0.01 : e.wheelDelta <= 120 ? scale.value - 0.01 : scale.value) + chartEditStore.setScale(e.wheelDelta >= 120 ? scale.value + 0.02 : e.wheelDelta <= 120 ? scale.value - 0.02 : scale.value) } } @@ -108,14 +108,15 @@ onUnmounted(() => { }) const dragCanvas = (e: any) => { - if (!window.$KeyboardActive?.space) return - - // @ts-ignore - document.activeElement?.blur() - e.preventDefault() e.stopPropagation() + if (e.which == 2) { + window.onKeySpacePressHold?.(true) + } else if (!window.$KeyboardActive?.space) return + // @ts-ignore + document.activeElement?.blur() + const startX = e.pageX const startY = e.pageY @@ -138,6 +139,7 @@ const dragCanvas = (e: any) => { un2() prevMoveXVallue = [0, 0] prevMoveYVallue = [0, 0] + window.onKeySpacePressHold?.(false) }) } diff --git a/src/views/chart/ContentEdit/hooks/useDrag.hook.ts b/src/views/chart/ContentEdit/hooks/useDrag.hook.ts index 654e9405..11f1bcae 100644 --- a/src/views/chart/ContentEdit/hooks/useDrag.hook.ts +++ b/src/views/chart/ContentEdit/hooks/useDrag.hook.ts @@ -62,6 +62,8 @@ export const mousedownHandleUnStop = (e: MouseEvent, item?: CreateComponentType // * 框选 export const mousedownBoxSelect = (e: MouseEvent, item?: CreateComponentType | CreateComponentGroupType) => { + if (e.which == 2) return + mousedownHandleUnStop(e) // 记录点击初始位置