openSourceRemote/mind-map
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix:不完美修复目录组织图概要和节点冲突的问题

Browse Source
This commit is contained in:
wanglin2 2023-09-09 15:42:21 +08:00
parent 4c9c34a0ea
commit fb41653d79
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
simple-mind-map/src/layouts/Base.js
View File

@ -202,9 +202,13 @@ class Base {
} }
// 递归计算节点的宽度 // 递归计算节点的宽度
getNodeAreaWidth(node) { getNodeAreaWidth(node, withGeneralization = false) {
let widthArr = [] let widthArr = []
let totalGeneralizationNodeWidth = 0
let loop = (node, width) => { let loop = (node, width) => {
if (withGeneralization && node.checkHasGeneralization()) {
totalGeneralizationNodeWidth += node._generalizationNodeWidth
}
if (node.children.length) { if (node.children.length) {
width += node.width / 2 width += node.width / 2
node.children.forEach(item => { node.children.forEach(item => {
@ -216,7 +220,7 @@ class Base {
} }
} }
loop(node, 0) loop(node, 0)
return Math.max(...widthArr) return Math.max(...widthArr) + totalGeneralizationNodeWidth
} }
// 二次贝塞尔曲线 // 二次贝塞尔曲线

8
simple-mind-map/src/layouts/CatalogOrganization.js
View File

@ -87,11 +87,11 @@ class CatalogOrganization extends Base {
totalLeft += cur.width + marginX totalLeft += cur.width + marginX
}) })
} else { } else {
let totalTop = node.top + node.height + marginY + (this.getNodeActChildrenLength(node) > 0 ? node.expandBtnSize : 0) let totalTop = node.top + this.getNodeHeightWithGeneralization(node) + marginY + (this.getNodeActChildrenLength(node) > 0 ? node.expandBtnSize : 0)
node.children.forEach(cur => { node.children.forEach(cur => {
cur.left = node.left + node.width * 0.5 cur.left = node.left + node.width * 0.5
cur.top = totalTop cur.top = totalTop
totalTop += cur.height + marginY + (this.getNodeActChildrenLength(cur) > 0 ? cur.expandBtnSize : 0) totalTop += this.getNodeHeightWithGeneralization(cur) + marginY + (this.getNodeActChildrenLength(cur) > 0 ? cur.expandBtnSize : 0)
}) })
} }
} }
@ -112,7 +112,7 @@ class CatalogOrganization extends Base {
} }
// 调整left // 调整left
if (parent && parent.isRoot) { if (parent && parent.isRoot) {
let areaWidth = this.getNodeAreaWidth(node) let areaWidth = this.getNodeAreaWidth(node, true)
let difference = areaWidth - node.width let difference = areaWidth - node.width
if (difference > 0) { if (difference > 0) {
this.updateBrothersLeft(node, difference) this.updateBrothersLeft(node, difference)
@ -124,7 +124,7 @@ class CatalogOrganization extends Base {
let marginY = this.getMarginY(layerIndex + 1) let marginY = this.getMarginY(layerIndex + 1)
let totalHeight = let totalHeight =
node.children.reduce((h, item) => { node.children.reduce((h, item) => {
return h + item.height + (this.getNodeActChildrenLength(item) > 0 ? item.expandBtnSize : 0) return h + this.getNodeHeightWithGeneralization(item) + (this.getNodeActChildrenLength(item) > 0 ? item.expandBtnSize : 0)
}, 0) + }, 0) +
len * marginY len * marginY
this.updateBrothersTop(node, totalHeight) this.updateBrothersTop(node, totalHeight)