diff --git a/simple-mind-map/index.js b/simple-mind-map/index.js index ec5aa9be..fb5f002c 100644 --- a/simple-mind-map/index.js +++ b/simple-mind-map/index.js @@ -183,11 +183,11 @@ class MindMap { // 渲染,部分渲染 render(callback, source = '') { - // this.batchExecution.push('render', () => { + this.batchExecution.push('render', () => { this.initTheme() this.renderer.reRender = false this.renderer.render(callback, source) - // }) + }) } // 重新渲染 diff --git a/simple-mind-map/src/Node.js b/simple-mind-map/src/Node.js index 528f1635..3a787edc 100644 --- a/simple-mind-map/src/Node.js +++ b/simple-mind-map/src/Node.js @@ -389,7 +389,7 @@ class Node { // 右键菜单事件 this.group.on('contextmenu', e => { // 按住ctrl键点击鼠标左键不知为何触发的是contextmenu事件 - if (this.mindMap.opt.readonly || this.isGeneralization || e.ctrlKey) { + if (this.mindMap.opt.readonly || e.ctrlKey) {// || this.isGeneralization return } e.stopPropagation() diff --git a/simple-mind-map/src/Render.js b/simple-mind-map/src/Render.js index 74eb4f53..aac78ecd 100644 --- a/simple-mind-map/src/Render.js +++ b/simple-mind-map/src/Render.js @@ -251,7 +251,6 @@ class Render { // 渲染 render(callback = () => {}, source) { // 如果当前还没有渲染完毕,不再触发渲染 - console.log('this.isRendering', this.isRendering); if (this.isRendering) { // 等待当前渲染完毕后再进行一次渲染 this.hasWaitRendering = true diff --git a/web/src/pages/Edit/components/Contextmenu.vue b/web/src/pages/Edit/components/Contextmenu.vue index efc16f47..552fb0d9 100644 --- a/web/src/pages/Edit/components/Contextmenu.vue +++ b/web/src/pages/Edit/components/Contextmenu.vue @@ -13,7 +13,7 @@ {{ $t('contextmenu.insertSiblingNode') }} Enter -
+
{{ $t('contextmenu.insertChildNode') }} Tab
@@ -45,11 +45,11 @@ {{ $t('contextmenu.deleteNode') }} Delete
-
+
{{ $t('contextmenu.copyNode') }} Ctrl + C
-
+
{{ $t('contextmenu.cutNode') }} Ctrl + X
@@ -140,10 +140,10 @@ export default { ] }, insertNodeBtnDisabled() { - return !this.node || this.node.isRoot + return !this.node || this.node.isRoot || this.node.isGeneralization }, upNodeBtnDisabled() { - if (!this.node || this.node.isRoot) { + if (!this.node || this.node.isRoot || this.node.isGeneralization) { return true } let isFirst = @@ -153,7 +153,7 @@ export default { return isFirst }, downNodeBtnDisabled() { - if (!this.node || this.node.isRoot) { + if (!this.node || this.node.isRoot || this.node.isGeneralization) { return true } let children = this.node.parent.children @@ -163,6 +163,9 @@ export default { }) === children.length - 1 return isLast + }, + isGeneralization() { + return this.node.isGeneralization } }, created() { diff --git a/web/src/pages/Edit/components/Edit.vue b/web/src/pages/Edit/components/Edit.vue index bc7efae9..40873d10 100644 --- a/web/src/pages/Edit/components/Edit.vue +++ b/web/src/pages/Edit/components/Edit.vue @@ -308,7 +308,8 @@ export default { 'mode_change', 'node_tree_render_end', 'rich_text_selection_change', - 'transforming-dom-to-images' + 'transforming-dom-to-images', + 'generalization_node_contextmenu' ].forEach(event => { this.mindMap.on(event, (...args) => { this.$bus.$emit(event, ...args)