From 5d133f74cfdc0c9dac1857986586ae21a6cf31a5 Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Mon, 28 Aug 2023 09:41:08 +0800 Subject: [PATCH] =?UTF-8?q?Feat=EF=BC=9A=E5=88=A0=E9=99=A4=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E8=8A=82=E7=82=B9=E6=BF=80=E6=B4=BB=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simple-mind-map/src/core/render/Render.js | 30 ++++--------------- .../src/core/render/node/nodeCommandWraps.js | 8 ++--- .../core/render/node/nodeCreateContents.js | 8 ++--- 3 files changed, 11 insertions(+), 35 deletions(-) diff --git a/simple-mind-map/src/core/render/Render.js b/simple-mind-map/src/core/render/Render.js index b7bb3ba1..3a274fa5 100644 --- a/simple-mind-map/src/core/render/Render.js +++ b/simple-mind-map/src/core/render/Render.js @@ -921,19 +921,9 @@ class Render { } // 设置节点样式 - setNodeStyle(node, prop, value, isActive) { - let data = {} - if (isActive) { - data = { - activeStyle: { - ...(node.nodeData.data.activeStyle || {}), - [prop]: value - } - } - } else { - data = { - [prop]: value - } + setNodeStyle(node, prop, value) { + let data = { + [prop]: value } // 如果开启了富文本,则需要应用到富文本上 if (this.mindMap.richText) { @@ -954,18 +944,8 @@ class Render { } // 设置节点多个样式 - setNodeStyles(node, style, isActive) { - let data = {} - if (isActive) { - data = { - activeStyle: { - ...(node.nodeData.data.activeStyle || {}), - ...style - } - } - } else { - data = style - } + setNodeStyles(node, style) { + let data = { ...style } // 如果开启了富文本,则需要应用到富文本上 if (this.mindMap.richText) { let config = this.mindMap.richText.normalStyleToRichTextStyle(style) diff --git a/simple-mind-map/src/core/render/node/nodeCommandWraps.js b/simple-mind-map/src/core/render/node/nodeCommandWraps.js index 8745fa7f..1a51130e 100644 --- a/simple-mind-map/src/core/render/node/nodeCommandWraps.js +++ b/simple-mind-map/src/core/render/node/nodeCommandWraps.js @@ -39,13 +39,13 @@ function setShape(shape) { } // 修改某个样式 -function setStyle(prop, value, isActive) { - this.mindMap.execCommand('SET_NODE_STYLE', this, prop, value, isActive) +function setStyle(prop, value) { + this.mindMap.execCommand('SET_NODE_STYLE', this, prop, value) } // 修改多个样式 -function setStyles(style, isActive) { - this.mindMap.execCommand('SET_NODE_STYLES', this, style, isActive) +function setStyles(style) { + this.mindMap.execCommand('SET_NODE_STYLES', this, style) } export default { diff --git a/simple-mind-map/src/core/render/node/nodeCreateContents.js b/simple-mind-map/src/core/render/node/nodeCreateContents.js index d18d8ee0..9ff93cf5 100644 --- a/simple-mind-map/src/core/render/node/nodeCreateContents.js +++ b/simple-mind-map/src/core/render/node/nodeCreateContents.js @@ -160,12 +160,8 @@ function createTextNode() { return this.createRichTextNode() } let g = new G() - let fontSize = this.getStyle('fontSize', false, this.nodeData.data.isActive) - let lineHeight = this.getStyle( - 'lineHeight', - false, - this.nodeData.data.isActive - ) + let fontSize = this.getStyle('fontSize', false) + let lineHeight = this.getStyle('lineHeight', false) // 文本超长自动换行 let textStyle = this.style.getTextFontStyle() let textArr = this.nodeData.data.text.split(/\n/gim)