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,