diff --git a/simple-mind-map/src/core/command/KeyCommand.js b/simple-mind-map/src/core/command/KeyCommand.js index 331c4a2d..32ec181a 100644 --- a/simple-mind-map/src/core/command/KeyCommand.js +++ b/simple-mind-map/src/core/command/KeyCommand.js @@ -44,13 +44,10 @@ export default class KeyCommand { this.isInSvg = true }) this.mindMap.on('svg_mouseleave', () => { - if (this.mindMap.richText && this.mindMap.richText.showTextEdit) { - return - } + if (this.mindMap.renderer.textEdit.isShowTextEdit()) return if ( - this.mindMap.renderer.textEdit.showTextEdit || - (this.mindMap.associativeLine && - this.mindMap.associativeLine.showTextEdit) + this.mindMap.associativeLine && + this.mindMap.associativeLine.showTextEdit ) { return } diff --git a/simple-mind-map/src/core/render/Render.js b/simple-mind-map/src/core/render/Render.js index 5fafa7b1..54aa33bb 100644 --- a/simple-mind-map/src/core/render/Render.js +++ b/simple-mind-map/src/core/render/Render.js @@ -276,9 +276,6 @@ class Render { }) // 插入同级节点 this.mindMap.keyCommand.addShortcut('Enter', () => { - if (this.textEdit.showTextEdit) { - return - } this.mindMap.execCommand('INSERT_NODE') }) // 插入父节点 diff --git a/simple-mind-map/src/core/render/TextEdit.js b/simple-mind-map/src/core/render/TextEdit.js index 9641716c..7fc1b1dd 100644 --- a/simple-mind-map/src/core/render/TextEdit.js +++ b/simple-mind-map/src/core/render/TextEdit.js @@ -126,6 +126,14 @@ export default class TextEdit { }) } + // 获取当前文本编辑框是否处于显示状态,也就是是否处在文本编辑状态 + isShowTextEdit() { + if (this.mindMap.richText) { + return this.mindMap.richText.showTextEdit + } + return this.showTextEdit + } + // 显示文本编辑框 // isInserting:是否是刚创建的节点 // isFromKeyDown:是否是在按键事件进入的编辑