From 2323fe9bc011230751b164ac7d27e693e1522c35 Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Mon, 19 Jun 2023 22:31:12 +0800 Subject: [PATCH] =?UTF-8?q?Fix:=E4=BF=AE=E5=A4=8D=E5=B0=86=E9=BC=A0?= =?UTF-8?q?=E6=A0=87=E6=BB=9A=E5=8A=A8=E6=94=B9=E4=B8=BA=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=94=BB=E5=B8=83=E8=A1=8C=E4=B8=BA=E5=90=8E=EF=BC=8C=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E8=A7=A6=E6=8E=A7=E6=9D=BF=E6=93=8D=E4=BD=9C=E6=97=B6?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=81=B5=E6=95=8F=E5=BA=A6=E8=BF=87=E9=AB=98?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simple-mind-map/package.json | 2 +- simple-mind-map/src/core/event/Event.js | 8 +++++++- simple-mind-map/src/core/view/View.js | 14 +++++++++----- web/src/pages/Doc/en/changelog/index.md | 6 +++++- web/src/pages/Doc/en/changelog/index.vue | 4 +++- web/src/pages/Doc/en/constructor/index.md | 2 +- web/src/pages/Doc/en/constructor/index.vue | 2 +- web/src/pages/Doc/zh/changelog/index.md | 6 +++++- web/src/pages/Doc/zh/changelog/index.vue | 4 +++- web/src/pages/Doc/zh/constructor/index.md | 2 +- web/src/pages/Doc/zh/constructor/index.vue | 2 +- 11 files changed, 37 insertions(+), 15 deletions(-) diff --git a/simple-mind-map/package.json b/simple-mind-map/package.json index eee3314e..fe2faea2 100644 --- a/simple-mind-map/package.json +++ b/simple-mind-map/package.json @@ -1,6 +1,6 @@ { "name": "simple-mind-map", - "version": "0.6.0-fix.1", + "version": "0.6.1", "description": "一个简单的web在线思维导图", "authors": [ { diff --git a/simple-mind-map/src/core/event/Event.js b/simple-mind-map/src/core/event/Event.js index 67d7fb59..3eb36d51 100644 --- a/simple-mind-map/src/core/event/Event.js +++ b/simple-mind-map/src/core/event/Event.js @@ -140,7 +140,13 @@ class Event extends EventEmitter { if ((e.wheelDeltaX || e.detail) > 0) dir = CONSTANTS.DIR.LEFT if ((e.wheelDeltaX || e.detail) < 0) dir = CONSTANTS.DIR.RIGHT } - this.emit('mousewheel', e, dir, this) + // 判断是否是触控板 + let isTouchPad = false + // mac、windows + if (e.wheelDeltaY === e.deltaY * -3 || Math.abs(e.wheelDeltaY) <= 10) { + isTouchPad = true + } + this.emit('mousewheel', e, dir, this, isTouchPad) } // 鼠标右键菜单事件 diff --git a/simple-mind-map/src/core/view/View.js b/simple-mind-map/src/core/view/View.js index fa464f37..98df7ee0 100644 --- a/simple-mind-map/src/core/view/View.js +++ b/simple-mind-map/src/core/view/View.js @@ -59,7 +59,7 @@ class View { this.firstDrag = true }) // 放大缩小视图 - this.mindMap.event.on('mousewheel', (e, dir) => { + this.mindMap.event.on('mousewheel', (e, dir, event, isTouchPad) => { if ( this.mindMap.opt.customHandleMousewheel && typeof this.mindMap.opt.customHandleMousewheel === 'function' @@ -82,22 +82,26 @@ class View { break } } else { + let step = this.mindMap.opt.mousewheelMoveStep + if (isTouchPad) { + step = 5 + } switch (dir) { // 上移 case CONSTANTS.DIR.DOWN: - this.translateY(-this.mindMap.opt.mousewheelMoveStep) + this.translateY(-step) break // 下移 case CONSTANTS.DIR.UP: - this.translateY(this.mindMap.opt.mousewheelMoveStep) + this.translateY(step) break // 右移 case CONSTANTS.DIR.LEFT: - this.translateX(-this.mindMap.opt.mousewheelMoveStep) + this.translateX(-step) break // 左移 case CONSTANTS.DIR.RIGHT: - this.translateX(this.mindMap.opt.mousewheelMoveStep) + this.translateX(step) break } } diff --git a/web/src/pages/Doc/en/changelog/index.md b/web/src/pages/Doc/en/changelog/index.md index 58b1b498..714becd0 100644 --- a/web/src/pages/Doc/en/changelog/index.md +++ b/web/src/pages/Doc/en/changelog/index.md @@ -1,8 +1,12 @@ # Changelog +## 0.6.1 + +Fix: 1.Fixed the issue of high movement sensitivity when using the touchpad when changing mouse scrolling to moving the canvas behavior. + ## 0.6.0-fix.1 -1.Fixed the issue of destroying mind maps without setting a background style and reporting errors. +Fix: 1.Fixed the issue of destroying mind maps without setting a background style and reporting errors. ## 0.6.0 diff --git a/web/src/pages/Doc/en/changelog/index.vue b/web/src/pages/Doc/en/changelog/index.vue index 6de1fb1f..ce71b82a 100644 --- a/web/src/pages/Doc/en/changelog/index.vue +++ b/web/src/pages/Doc/en/changelog/index.vue @@ -1,8 +1,10 @@