From 9221c404eec2e0133a589753724112e8f07a287d Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Fri, 13 Oct 2023 11:28:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=9A1.?= =?UTF-8?q?=E5=B0=86render=E7=B1=BB=E7=9A=84addActiveNode=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E5=90=8D=E7=A7=B0=E6=94=B9=E4=B8=BAaddNodeToActiveLis?= =?UTF-8?q?t=EF=BC=9B2.=E5=B0=86=E8=B0=83=E7=94=A8render=E7=B1=BB=E7=9A=84?= =?UTF-8?q?setNodeActive=E6=96=B9=E6=B3=95=E7=9A=84=E5=9C=B0=E6=96=B9?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=B0=83=E7=94=A8SET=5FNODE=5FACTIVE?= =?UTF-8?q?=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simple-mind-map/src/core/render/Render.js | 12 ++++++------ simple-mind-map/src/core/render/node/Node.js | 4 ++-- .../src/core/render/node/nodeGeneralization.js | 2 +- simple-mind-map/src/layouts/Base.js | 2 +- simple-mind-map/src/plugins/AssociativeLine.js | 6 +++--- simple-mind-map/src/plugins/Drag.js | 10 +++++----- simple-mind-map/src/plugins/Select.js | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/simple-mind-map/src/core/render/Render.js b/simple-mind-map/src/core/render/Render.js index ecb6a18d..461256be 100644 --- a/simple-mind-map/src/core/render/Render.js +++ b/simple-mind-map/src/core/render/Render.js @@ -412,14 +412,14 @@ class Render { // 清除当前激活的节点列表 clearActiveNodeList() { this.activeNodeList.forEach(item => { - this.setNodeActive(item, false) + this.mindMap.execCommand('SET_NODE_ACTIVE', item, false) }) this.activeNodeList = [] } - // 添加节点到激活列表里 - addActiveNode(node) { - let index = this.findActiveNodeIndex(node) + // 添加节点到激活列表里 + addNodeToActiveList(node) { + const index = this.findActiveNodeIndex(node) if (index === -1) { this.activeNodeList.push(node) } @@ -449,7 +449,7 @@ class Render { node => { if (!node.nodeData.data.isActive) { node.nodeData.data.isActive = true - this.addActiveNode(node) + this.addNodeToActiveList(node) // 激活节点需要显示展开收起按钮 node.showExpandBtn() setTimeout(() => { @@ -1030,7 +1030,7 @@ class Render { // 激活被删除节点的兄弟节点或父节点 if (needActiveNode) { this.activeNodeList.push(needActiveNode) - this.setNodeActive(needActiveNode, true) + this.mindMap.execCommand('SET_NODE_ACTIVE', needActiveNode, true) needActiveNode = null } this.mindMap.emit('node_active', null, [...this.activeNodeList]) diff --git a/simple-mind-map/src/core/render/node/Node.js b/simple-mind-map/src/core/render/node/Node.js index ea7eb8f8..342c1482 100644 --- a/simple-mind-map/src/core/render/node/Node.js +++ b/simple-mind-map/src/core/render/node/Node.js @@ -438,7 +438,7 @@ class Node { this.renderer.activeNodeList ) this.mindMap.execCommand('SET_NODE_ACTIVE', this, !isActive) - this.mindMap.renderer[isActive ? 'removeActiveNode' : 'addActiveNode']( + this.mindMap.renderer[isActive ? 'removeActiveNode' : 'addNodeToActiveList']( this ) this.mindMap.emit('node_active', isActive ? null : this, [ @@ -517,7 +517,7 @@ class Node { this.mindMap.emit('before_node_active', this, this.renderer.activeNodeList) this.renderer.clearActiveNodeList() this.mindMap.execCommand('SET_NODE_ACTIVE', this, true) - this.renderer.addActiveNode(this) + this.renderer.addNodeToActiveList(this) this.mindMap.emit('node_active', this, [...this.renderer.activeNodeList]) } diff --git a/simple-mind-map/src/core/render/node/nodeGeneralization.js b/simple-mind-map/src/core/render/node/nodeGeneralization.js index 3ab1cc5f..462332a2 100644 --- a/simple-mind-map/src/core/render/node/nodeGeneralization.js +++ b/simple-mind-map/src/core/render/node/nodeGeneralization.js @@ -28,7 +28,7 @@ function createGeneralizationNode() { this._generalizationNodeHeight = this._generalizationNode.height this._generalizationNode.generalizationBelongNode = this if (this.nodeData.data.generalization.isActive) { - this.renderer.addActiveNode(this._generalizationNode) + this.renderer.addNodeToActiveList(this._generalizationNode) } } } diff --git a/simple-mind-map/src/layouts/Base.js b/simple-mind-map/src/layouts/Base.js index 64abca4e..43d3713e 100644 --- a/simple-mind-map/src/layouts/Base.js +++ b/simple-mind-map/src/layouts/Base.js @@ -127,7 +127,7 @@ class Base { // 数据关联实际节点 data._node = newNode if (data.data.isActive) { - this.renderer.addActiveNode(newNode) + this.renderer.addNodeToActiveList(newNode) } } // 如果当前节点在激活节点列表里，那么添加上激活的状态 diff --git a/simple-mind-map/src/plugins/AssociativeLine.js b/simple-mind-map/src/plugins/AssociativeLine.js index a7773043..c6c124a9 100644 --- a/simple-mind-map/src/plugins/AssociativeLine.js +++ b/simple-mind-map/src/plugins/AssociativeLine.js @@ -365,7 +365,7 @@ class AssociativeLine { this.overlapNode = null bfsWalk(this.mindMap.renderer.root, node => { if (node.nodeData.data.isActive) { - this.mindMap.renderer.setNodeActive(node, false) + this.mindMap.execCommand('SET_NODE_ACTIVE', node, false) } if (node.uid === this.creatingStartNode.uid || this.overlapNode) { return @@ -378,7 +378,7 @@ class AssociativeLine { } }) if (this.overlapNode && !this.overlapNode.nodeData.data.isActive) { - this.mindMap.renderer.setNodeActive(this.overlapNode, true) + this.mindMap.execCommand('SET_NODE_ACTIVE', this.overlapNode, true) } } @@ -387,7 +387,7 @@ class AssociativeLine { if (this.creatingStartNode.uid === node.uid) return this.addLine(this.creatingStartNode, node) if (this.overlapNode && this.overlapNode.nodeData.data.isActive) { - this.mindMap.renderer.setNodeActive(this.overlapNode, false) + this.mindMap.execCommand('SET_NODE_ACTIVE', this.overlapNode, false) } this.isCreatingLine = false this.creatingStartNode = null diff --git a/simple-mind-map/src/plugins/Drag.js b/simple-mind-map/src/plugins/Drag.js index 2b9ce554..4ee095cf 100644 --- a/simple-mind-map/src/plugins/Drag.js +++ b/simple-mind-map/src/plugins/Drag.js @@ -115,7 +115,7 @@ class Drag extends Base { let nextNodeUid = this.nextNode ? this.nextNode.nodeData.data.uid : '' // 存在重叠子节点，则移动作为其子节点 if (this.overlapNode) { - this.mindMap.renderer.setNodeActive(this.overlapNode, false) + this.mindMap.execCommand('SET_NODE_ACTIVE', this.overlapNode, false) this.mindMap.execCommand( 'MOVE_NODE_TO', this.beingDragNodeList, @@ -123,7 +123,7 @@ class Drag extends Base { ) } else if (this.prevNode) { // 存在前一个相邻节点，作为其下一个兄弟节点 - this.mindMap.renderer.setNodeActive(this.prevNode, false) + this.mindMap.execCommand('SET_NODE_ACTIVE', this.prevNode, false) this.mindMap.execCommand( 'INSERT_AFTER', this.beingDragNodeList, @@ -131,7 +131,7 @@ class Drag extends Base { ) } else if (this.nextNode) { // 存在下一个相邻节点，作为其前一个兄弟节点 - this.mindMap.renderer.setNodeActive(this.nextNode, false) + this.mindMap.execCommand('SET_NODE_ACTIVE', this.nextNode, false) this.mindMap.execCommand( 'INSERT_BEFORE', this.beingDragNodeList, @@ -318,7 +318,7 @@ class Drag extends Base { this.placeholder.size(0, 0) this.nodeList.forEach(node => { if (node.nodeData.data.isActive) { - this.mindMap.renderer.setNodeActive(node, false) + this.mindMap.execCommand('SET_NODE_ACTIVE', node, false) } if (this.overlapNode || (this.prevNode && this.nextNode)) { return @@ -353,7 +353,7 @@ class Drag extends Base { } }) if (this.overlapNode) { - this.mindMap.renderer.setNodeActive(this.overlapNode, true) + this.mindMap.execCommand('SET_NODE_ACTIVE', this.overlapNode, true) } } diff --git a/simple-mind-map/src/plugins/Select.js b/simple-mind-map/src/plugins/Select.js index bf5c0173..8bacbe69 100644 --- a/simple-mind-map/src/plugins/Select.js +++ b/simple-mind-map/src/plugins/Select.js @@ -221,13 +221,13 @@ class Select { if (node.nodeData.data.isActive) { return } - this.mindMap.renderer.setNodeActive(node, true) - this.mindMap.renderer.addActiveNode(node) + this.mindMap.execCommand('SET_NODE_ACTIVE', node, true) + this.mindMap.renderer.addNodeToActiveList(node) } else if (node.nodeData.data.isActive) { if (!node.nodeData.data.isActive) { return } - this.mindMap.renderer.setNodeActive(node, false) + this.mindMap.execCommand('SET_NODE_ACTIVE', node, false) this.mindMap.renderer.removeActiveNode(node) } })