From 7d83a3635fa932992919d1164486eccf7279ec27 Mon Sep 17 00:00:00 2001
From: wanglin2 <1013335014@qq.com>
Date: Fri, 1 Dec 2023 09:49:02 +0800
Subject: [PATCH] =?UTF-8?q?Feat=EF=BC=9A=E5=9C=A8=E9=BC=A0=E6=A0=87?=
 =?UTF-8?q?=E6=BB=9A=E8=BD=AE=E8=A1=8C=E4=B8=BA=E4=B8=BA=E4=B8=8A=E4=B8=8B?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=94=BB=E5=B8=83=E6=97=B6=EF=BC=8C=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=8C=89=E4=BD=8FCtrl=E9=94=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=94=BE=E5=A4=A7=E7=BC=A9=E5=B0=8F=E7=94=BB=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 simple-mind-map/src/core/event/Event.js | 16 ++++------------
 simple-mind-map/src/core/view/View.js   |  2 +-
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/simple-mind-map/src/core/event/Event.js b/simple-mind-map/src/core/event/Event.js
index 5aa9faea..abb176f6 100644
--- a/simple-mind-map/src/core/event/Event.js
+++ b/simple-mind-map/src/core/event/Event.js
@@ -133,18 +133,10 @@ class Event extends EventEmitter {
     e.stopPropagation()
     e.preventDefault()
     let dir
-    // 解决mac触控板双指缩放方向相反的问题
-    if (e.ctrlKey) {
-      if (e.deltaY > 0) dir = CONSTANTS.DIR.UP
-      if (e.deltaY < 0) dir = CONSTANTS.DIR.DOWN
-      if (e.deltaX > 0) dir = CONSTANTS.DIR.LEFT
-      if (e.deltaX < 0) dir = CONSTANTS.DIR.RIGHT
-    } else {
-      if ((e.wheelDeltaY || e.detail) > 0) dir = CONSTANTS.DIR.UP
-      if ((e.wheelDeltaY || e.detail) < 0) dir = CONSTANTS.DIR.DOWN
-      if ((e.wheelDeltaX || e.detail) > 0) dir = CONSTANTS.DIR.LEFT
-      if ((e.wheelDeltaX || e.detail) < 0) dir = CONSTANTS.DIR.RIGHT
-    }
+    if (e.deltaY < 0) dir = CONSTANTS.DIR.UP
+    if (e.deltaY > 0) dir = CONSTANTS.DIR.DOWN
+    if (e.deltaX < 0) dir = CONSTANTS.DIR.LEFT
+    if (e.deltaX > 0) dir = CONSTANTS.DIR.RIGHT
     // 判断是否是触控板
     let isTouchPad = false
     // mac、windows
diff --git a/simple-mind-map/src/core/view/View.js b/simple-mind-map/src/core/view/View.js
index df580b1b..ddbb4531 100644
--- a/simple-mind-map/src/core/view/View.js
+++ b/simple-mind-map/src/core/view/View.js
@@ -72,7 +72,7 @@ class View {
         return customHandleMousewheel(e)
       }
       // 鼠标滚轮事件控制缩放
-      if (mousewheelAction === CONSTANTS.MOUSE_WHEEL_ACTION.ZOOM) {
+      if (mousewheelAction === CONSTANTS.MOUSE_WHEEL_ACTION.ZOOM || e.ctrlKey) {
         if (disableMouseWheelZoom) return
         const { x: clientX, y: clientY } = this.mindMap.toPos(
           e.clientX,