From b817d4239aa0522153db7a9cc7a9cb5cbf95533b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A1=97=E8=A7=92=E5=B0=8F=E6=9E=97?= <1013335014@qq.com>
Date: Thu, 24 Apr 2025 10:46:01 +0800
Subject: [PATCH] =?UTF-8?q?Feat=EF=BC=9A=E6=94=AF=E6=8C=81=E7=A9=BA?=
 =?UTF-8?q?=E6=A0=BC=E9=94=AE+=E5=B7=A6=E9=94=AE=E6=8B=96=E5=8A=A8?=
 =?UTF-8?q?=E7=94=BB=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/core/command/KeyCommand.js            | 21 ++++++++++++++++++-
 simple-mind-map/src/core/event/Event.js       |  6 ++++--
 simple-mind-map/src/plugins/Select.js         |  5 ++++-
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/simple-mind-map/src/core/command/KeyCommand.js b/simple-mind-map/src/core/command/KeyCommand.js
index a51bdcc6..fd64349b 100644
--- a/simple-mind-map/src/core/command/KeyCommand.js
+++ b/simple-mind-map/src/core/command/KeyCommand.js
@@ -1,4 +1,4 @@
-import { keyMap } from './keyMap'
+import { keyMap, isKey } from './keyMap'
 
 //  快捷按键、命令处理类
 export default class KeyCommand {
@@ -13,6 +13,7 @@ export default class KeyCommand {
     this.isPause = false
     this.isInSvg = false
     this.isStopCheckInSvg = false
+    this.currentKeyCode = ''
     this.defaultEnableCheck = this.defaultEnableCheck.bind(this)
     this.bindEvent()
   }
@@ -78,6 +79,7 @@ export default class KeyCommand {
   //  绑定事件
   bindEvent() {
     this.onKeydown = this.onKeydown.bind(this)
+    this.onKeyup = this.onKeyup.bind(this)
     // 只有当鼠标在画布内才响应快捷键
     this.mindMap.on('svg_mouseenter', () => {
       this.isInSvg = true
@@ -86,6 +88,7 @@ export default class KeyCommand {
       this.isInSvg = false
     })
     window.addEventListener('keydown', this.onKeydown)
+    window.addEventListener('keyup', this.onKeyup)
     this.mindMap.on('beforeDestroy', () => {
       this.unBindEvent()
     })
@@ -94,6 +97,7 @@ export default class KeyCommand {
   // 解绑事件
   unBindEvent() {
     window.removeEventListener('keydown', this.onKeydown)
+    window.removeEventListener('keyup', this.onKeyup)
   }
 
   // 根据事件目标判断是否响应快捷键事件
@@ -109,8 +113,23 @@ export default class KeyCommand {
     return false
   }
 
+  // 当前键盘是否存在按下的按键，是的的话判断按键是否只指定按键
+  // keyName：键名称，比如：Enter、Spacebar等，完整名称列表可通过以下方法打印查看：
+  /*
+    import { keyMap } from 'simple-mind-map/src/core/command/keyMap'
+    console.log(keyMap)
+  */
+  currentIsKey(keyName) {
+    return this.currentKeyCode && isKey(this.currentKeyCode, keyName)
+  }
+
+  onKeyup() {
+    this.currentKeyCode = ''
+  }
+
   // 按键事件
   onKeydown(e) {
+    this.currentKeyCode = e.keyCode
     const {
       enableShortcutOnlyWhenMouseInSvg,
       beforeShortcutRun,
diff --git a/simple-mind-map/src/core/event/Event.js b/simple-mind-map/src/core/event/Event.js
index a0e75c29..c7a38ac8 100644
--- a/simple-mind-map/src/core/event/Event.js
+++ b/simple-mind-map/src/core/event/Event.js
@@ -122,8 +122,10 @@ class Event extends EventEmitter {
     this.emit('mousemove', e, this)
     if (
       this.isMiddleMousedown ||
-      (useLeftKeySelectionRightKeyDrag
-        ? this.isRightMousedown
+      (useLeftKeySelectionRightKeyDrag// 是否左键多选节点，右键拖动画布
+        ? this.isRightMousedown ||
+          (this.isLeftMousedown &&
+            this.mindMap.keyCommand.currentIsKey('Spacebar'))// 右键、或者左键+空格
         : this.isLeftMousedown)
     ) {
       e.preventDefault()
diff --git a/simple-mind-map/src/plugins/Select.js b/simple-mind-map/src/plugins/Select.js
index eaf93f9b..57358895 100644
--- a/simple-mind-map/src/plugins/Select.js
+++ b/simple-mind-map/src/plugins/Select.js
@@ -48,7 +48,10 @@ class Select {
     let { useLeftKeySelectionRightKeyDrag } = this.mindMap.opt
     if (
       !(e.ctrlKey || e.metaKey) &&
-      (useLeftKeySelectionRightKeyDrag ? e.which !== 1 : e.which !== 3)
+      (useLeftKeySelectionRightKeyDrag// 是否开启了左键多选节点右键拖动画布
+        ? e.which !== 1 ||// 非左键直接返回
+          (e.which === 1 && this.mindMap.keyCommand.currentIsKey('Spacebar'))// 是左键+空格也返回，因为是拖动画布
+        : e.which !== 3)// 非右键直接返回
     ) {
       return
     }