From 5dae4c3c7122b3caa629077f93b33e76bb231a2f Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 19 Apr 2024 10:59:53 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E9=BC=A0=E6=A0=87=E5=92=8CMac=E8=A7=A6?=
 =?UTF-8?q?=E6=8E=A7=E6=9D=BF=E6=96=B9=E5=90=91=E6=8E=A2=E6=B5=8B=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E9=92=88=E5=AF=B9Mac=E8=A7=A6=E6=8E=A7?=
 =?UTF-8?q?=E6=9D=BF=E7=9A=84=E5=86=85=E5=A4=96=E4=BC=B8=E7=BC=A9=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E7=9B=B4=E6=8E=A5=E6=8E=A7=E5=88=B6=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E7=BC=A9=E6=94=BE=EF=BC=8C=E9=BC=A0=E6=A0=87=E6=BB=9A=E8=BD=AE?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=AAY=E8=BD=B4=E6=96=B9=E5=90=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-visualization/ComponentToolBar.vue   | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue b/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue
index 447decf6c1..9191e29206 100644
--- a/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue
+++ b/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue
@@ -63,33 +63,31 @@ const checkDialog = () => {
 }
 
 const handleMouseWheel = e => {
-  if (editMode.value === 'preview' || checkDialog()) {
+  if (
+    editMode.value === 'preview' ||
+    checkDialog() ||
+    (Math.abs(e.deltaX) !== 0 && Math.abs(e.deltaY) !== 0)
+  ) {
     return
   }
-  let dvMain = document.getElementById('dv-main-center')
-  let dvMainLeftSlide = document.getElementById('dv-main-left-sidebar')
-  let areaLeftWidth = dvMainLeftSlide.clientWidth
-  let areaRight = dvMain.clientWidth + areaLeftWidth
-  if (areaLeftWidth < e.clientX && e.clientX < areaRight) {
-    const delta = e.wheelDelta ? e.wheelDelta : -e.detail
-    if ((lastWheelNum === 240 && delta === 240) || delta > 240) {
-      //放大
-      scaleIncrease(3)
-    } else if ((lastWheelNum === -240 && delta === -240) || delta < -240) {
-      // 缩小
+  if (e.ctrlKey) {
+    if (e.deltaY > 0) {
+      //向内 缩小
       scaleDecrease(3)
-    }
-
-    if (delta >= 240 || delta <= -240) {
       e.stopPropagation()
       e.preventDefault()
     }
-    lastWheelNum = delta
+    if (e.deltaY < 0) {
+      //向外 放大
+      scaleIncrease(3)
+      e.stopPropagation()
+      e.preventDefault()
+    }
   }
 }
 
 onMounted(() => {
-  window.addEventListener('mousewheel', handleMouseWheel, { passive: false })
+  window.addEventListener('wheel', handleMouseWheel, { passive: false })
   setTimeout(() => {
     scale.value = canvasStyleData.value.scale
     nextTick(() => {
@@ -99,7 +97,7 @@ onMounted(() => {
 })
 
 onUnmounted(() => {
-  window.removeEventListener('mousewheel', handleMouseWheel)
+  window.removeEventListener('wheel', handleMouseWheel)
 })
 </script>
 <template>