diff --git a/index.html b/index.html
index 6b0c664a..e0667891 100644
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-一个简单的web思维导图实现 We're sorry but thoughts doesn't work properly without JavaScript enabled. Please enable it to continue.
\ No newline at end of file
+一个简单的web思维导图实现 We're sorry but thoughts doesn't work properly without JavaScript enabled. Please enable it to continue.
\ No newline at end of file
diff --git a/simple-mind-map/src/Node.js b/simple-mind-map/src/Node.js
index cd322882..bc05048b 100644
--- a/simple-mind-map/src/Node.js
+++ b/simple-mind-map/src/Node.js
@@ -707,27 +707,17 @@ class Node {
}
this.renderGeneralization()
let t = this.group.transform()
- // 节点使用横线风格，有两种结构需要调整节点的位置
- let nodeUseLineStyleOffset = 0
- if (
- ['logicalStructure', 'mindMap'].includes(this.mindMap.opt.layout) &&
- !this.isRoot &&
- !this.isGeneralization &&
- this.themeConfig.nodeUseLineStyle
- ) {
- nodeUseLineStyleOffset = this.height / 2
- }
if (!layout) {
this.group
.animate(300)
.translate(
this.left - t.translateX,
- this.top - t.translateY - nodeUseLineStyleOffset
+ this.top - t.translateY
)
} else {
this.group.translate(
this.left - t.translateX,
- this.top - t.translateY - nodeUseLineStyleOffset
+ this.top - t.translateY
)
}
}
diff --git a/simple-mind-map/src/layouts/LogicalStructure.js b/simple-mind-map/src/layouts/LogicalStructure.js
index 20636e93..5b28fa0d 100644
--- a/simple-mind-map/src/layouts/LogicalStructure.js
+++ b/simple-mind-map/src/layouts/LogicalStructure.js
@@ -1,267 +1,289 @@
-import Base from './Base'
-import { walk, asyncRun } from '../utils'
-
-// 逻辑结构图
-class LogicalStructure extends Base {
- // 构造函数
- constructor(opt = {}) {
- super(opt)
- }
-
- // 布局
- doLayout(callback) {
- let task = [
- () => {
- this.computedBaseValue()
- },
- () => {
- this.computedTopValue()
- },
- () => {
- this.adjustTopValue()
- },
- () => {
- callback(this.root)
- }
- ]
- asyncRun(task)
- }
-
- // 遍历数据计算节点的left、width、height
- computedBaseValue() {
- walk(
- this.renderer.renderTree,
- null,
- (cur, parent, isRoot, layerIndex) => {
- let newNode = this.createNode(cur, parent, isRoot, layerIndex)
- // 根节点定位在画布中心位置
- if (isRoot) {
- this.setNodeCenter(newNode)
- } else {
- // 非根节点
- // 定位到父节点右侧
- newNode.left =
- parent._node.left + parent._node.width + this.getMarginX(layerIndex)
- }
- if (!cur.data.expand) {
- return true
- }
- },
- (cur, parent, isRoot, layerIndex) => {
- // 返回时计算节点的areaHeight，也就是子节点所占的高度之和，包括外边距
- let len = cur.data.expand === false ? 0 : cur._node.children.length
- cur._node.childrenAreaHeight = len
- ? cur._node.children.reduce((h, item) => {
- return h + item.height
- }, 0) +
- (len + 1) * this.getMarginY(layerIndex + 1)
- : 0
- },
- true,
- 0
- )
- }
-
- // 遍历节点树计算节点的top
- computedTopValue() {
- walk(
- this.root,
- null,
- (node, parent, isRoot, layerIndex) => {
- if (
- node.nodeData.data.expand &&
- node.children &&
- node.children.length
- ) {
- let marginY = this.getMarginY(layerIndex + 1)
- // 第一个子节点的top值 = 该节点中心的top值 - 子节点的高度之和的一半
- let top = node.top + node.height / 2 - node.childrenAreaHeight / 2
- let totalTop = top + marginY
- node.children.forEach(cur => {
- cur.top = totalTop
- totalTop += cur.height + marginY
- })
- }
- },
- null,
- true
- )
- }
-
- // 调整节点top
- adjustTopValue() {
- walk(
- this.root,
- null,
- (node, parent, isRoot, layerIndex) => {
- if (!node.nodeData.data.expand) {
- return
- }
- // 判断子节点所占的高度之和是否大于该节点自身，大于则需要调整位置
- let difference =
- node.childrenAreaHeight -
- this.getMarginY(layerIndex + 1) * 2 -
- node.height
- if (difference > 0) {
- this.updateBrothers(node, difference / 2)
- }
- },
- null,
- true
- )
- }
-
- // 更新兄弟节点的top
- updateBrothers(node, addHeight) {
- if (node.parent) {
- let childrenList = node.parent.children
- let index = childrenList.findIndex(item => {
- return item === node
- })
- childrenList.forEach((item, _index) => {
- if (item === node || item.hasCustomPosition()) {
- // 适配自定义位置
- return
- }
- let _offset = 0
- // 上面的节点往上移
- if (_index < index) {
- _offset = -addHeight
- } else if (_index > index) {
- // 下面的节点往下移
- _offset = addHeight
- }
- item.top += _offset
- // 同步更新子节点的位置
- if (item.children && item.children.length) {
- this.updateChildren(item.children, 'top', _offset)
- }
- })
- // 更新父节点的位置
- this.updateBrothers(node.parent, addHeight)
- }
- }
-
- // 绘制连线，连接该节点到其子节点
- renderLine(node, lines, style, lineStyle) {
- if (lineStyle === 'curve') {
- this.renderLineCurve(node, lines, style)
- } else if (lineStyle === 'direct') {
- this.renderLineDirect(node, lines, style)
- } else {
- this.renderLineStraight(node, lines, style)
- }
- }
-
- // 直线风格连线
- renderLineStraight(node, lines, style) {
- if (node.children.length <= 0) {
- return []
- }
- let { left, top, width, height, expandBtnSize } = node
- let marginX = this.getMarginX(node.layerIndex + 1)
- let s1 = (marginX - expandBtnSize) * 0.6
- node.children.forEach((item, index) => {
- let x1 =
- node.layerIndex === 0 ? left + width : left + width + expandBtnSize
- let y1 = top + height / 2
- let x2 = item.left
- let y2 = item.top + item.height / 2
- // 节点使用横线风格，需要额外渲染横线
- let nodeUseLineStyleOffset = this.mindMap.themeConfig.nodeUseLineStyle
- ? item.width
- : 0
- let path = `M ${x1},${y1} L ${x1 + s1},${y1} L ${x1 + s1},${y2} L ${
- x2 + nodeUseLineStyleOffset
- },${y2}`
- lines[index].plot(path)
- style && style(lines[index], item)
- })
- }
-
- // 直连风格
- renderLineDirect(node, lines, style) {
- if (node.children.length <= 0) {
- return []
- }
- let { left, top, width, height, expandBtnSize } = node
- node.children.forEach((item, index) => {
- let x1 =
- node.layerIndex === 0 ? left + width / 2 : left + width + expandBtnSize
- let y1 = top + height / 2
- let x2 = item.left
- let y2 = item.top + item.height / 2
- // 节点使用横线风格，需要额外渲染横线
- let nodeUseLineStylePath = this.mindMap.themeConfig.nodeUseLineStyle
- ? ` L ${item.left + item.width},${y2}`
- : ''
- let path = `M ${x1},${y1} L ${x2},${y2}` + nodeUseLineStylePath
- lines[index].plot(path)
- style && style(lines[index], item)
- })
- }
-
- // 曲线风格连线
- renderLineCurve(node, lines, style) {
- if (node.children.length <= 0) {
- return []
- }
- let { left, top, width, height, expandBtnSize } = node
- node.children.forEach((item, index) => {
- let x1 =
- node.layerIndex === 0 ? left + width / 2 : left + width + expandBtnSize
- let y1 = top + height / 2
- let x2 = item.left
- let y2 = item.top + item.height / 2
- let path = ''
- // 节点使用横线风格，需要额外渲染横线
- let nodeUseLineStylePath = this.mindMap.themeConfig.nodeUseLineStyle
- ? ` L ${item.left + item.width},${y2}`
- : ''
- if (node.isRoot) {
- path = this.quadraticCurvePath(x1, y1, x2, y2) + nodeUseLineStylePath
- } else {
- path = this.cubicBezierPath(x1, y1, x2, y2) + nodeUseLineStylePath
- }
- lines[index].plot(path)
- style && style(lines[index], item)
- })
- }
-
- // 渲染按钮
- renderExpandBtn(node, btn) {
- let { width, height } = node
- let { translateX, translateY } = btn.transform()
- // 节点使用横线风格，需要调整展开收起按钮位置
- let nodeUseLineStyleOffset = this.mindMap.themeConfig.nodeUseLineStyle
- ? height / 2
- : 0
- btn.translate(
- width - translateX,
- height / 2 - translateY + nodeUseLineStyleOffset
- )
- }
-
- // 创建概要节点
- renderGeneralization(node, gLine, gNode) {
- let {
- top,
- bottom,
- right,
- generalizationLineMargin,
- generalizationNodeMargin
- } = this.getNodeBoundaries(node, 'h')
- let x1 = right + generalizationLineMargin
- let y1 = top
- let x2 = right + generalizationLineMargin
- let y2 = bottom
- let cx = x1 + 20
- let cy = y1 + (y2 - y1) / 2
- let path = `M ${x1},${y1} Q ${cx},${cy} ${x2},${y2}`
- gLine.plot(path)
- gNode.left = right + generalizationNodeMargin
- gNode.top = top + (bottom - top - gNode.height) / 2
- }
-}
-
-export default LogicalStructure
+import Base from './Base'
+import { walk, asyncRun } from '../utils'
+
+// 逻辑结构图
+
+class LogicalStructure extends Base {
+ // 构造函数
+
+ constructor(opt = {}) {
+ super(opt)
+ }
+
+ // 布局
+
+ doLayout(callback) {
+ let task = [
+ () => {
+ this.computedBaseValue()
+ },
+ () => {
+ this.computedTopValue()
+ },
+ () => {
+ this.adjustTopValue()
+ },
+ () => {
+ callback(this.root)
+ }
+ ]
+ asyncRun(task)
+ }
+
+ // 遍历数据计算节点的left、width、height
+
+ computedBaseValue() {
+ walk(
+ this.renderer.renderTree,
+ null,
+ (cur, parent, isRoot, layerIndex) => {
+ let newNode = this.createNode(cur, parent, isRoot, layerIndex)
+ // 根节点定位在画布中心位置
+ if (isRoot) {
+ this.setNodeCenter(newNode)
+ } else {
+ // 非根节点
+ // 定位到父节点右侧
+ newNode.left =
+ parent._node.left + parent._node.width + this.getMarginX(layerIndex)
+ }
+ if (!cur.data.expand) {
+ return true
+ }
+ },
+ (cur, parent, isRoot, layerIndex) => {
+ // 返回时计算节点的areaHeight，也就是子节点所占的高度之和，包括外边距
+ let len = cur.data.expand === false ? 0 : cur._node.children.length
+ cur._node.childrenAreaHeight = len
+ ? cur._node.children.reduce((h, item) => {
+ return h + item.height
+ }, 0) +
+ (len + 1) * this.getMarginY(layerIndex + 1)
+ : 0
+ },
+ true,
+ 0
+ )
+ }
+
+ // 遍历节点树计算节点的top
+
+ computedTopValue() {
+ walk(
+ this.root,
+ null,
+ (node, parent, isRoot, layerIndex) => {
+ if (
+ node.nodeData.data.expand &&
+ node.children &&
+ node.children.length
+ ) {
+ let marginY = this.getMarginY(layerIndex + 1)
+ // 第一个子节点的top值 = 该节点中心的top值 - 子节点的高度之和的一半
+ let top = node.top + node.height / 2 - node.childrenAreaHeight / 2
+ let totalTop = top + marginY
+ node.children.forEach(cur => {
+ cur.top = totalTop
+ totalTop += cur.height + marginY
+ })
+ }
+ },
+ null,
+ true
+ )
+ }
+
+ // 调整节点top
+
+ adjustTopValue() {
+ walk(
+ this.root,
+ null,
+ (node, parent, isRoot, layerIndex) => {
+ if (!node.nodeData.data.expand) {
+ return
+ }
+ // 判断子节点所占的高度之和是否大于该节点自身，大于则需要调整位置
+ let difference =
+ node.childrenAreaHeight -
+ this.getMarginY(layerIndex + 1) * 2 -
+ node.height
+ if (difference > 0) {
+ this.updateBrothers(node, difference / 2)
+ }
+ },
+ null,
+ true
+ )
+ }
+
+ // 更新兄弟节点的top
+
+ updateBrothers(node, addHeight) {
+ if (node.parent) {
+ let childrenList = node.parent.children
+ let index = childrenList.findIndex(item => {
+ return item === node
+ })
+ childrenList.forEach((item, _index) => {
+ if (item === node || item.hasCustomPosition()) {
+ // 适配自定义位置
+ return
+ }
+ let _offset = 0
+ // 上面的节点往上移
+ if (_index < index) {
+ _offset = -addHeight
+ } else if (_index > index) {
+ // 下面的节点往下移
+ _offset = addHeight
+ }
+ item.top += _offset
+ // 同步更新子节点的位置
+ if (item.children && item.children.length) {
+ this.updateChildren(item.children, 'top', _offset)
+ }
+ })
+ // 更新父节点的位置
+ this.updateBrothers(node.parent, addHeight)
+ }
+ }
+
+ // 绘制连线，连接该节点到其子节点
+
+ renderLine(node, lines, style, lineStyle) {
+ if (lineStyle === 'curve') {
+ this.renderLineCurve(node, lines, style)
+ } else if (lineStyle === 'direct') {
+ this.renderLineDirect(node, lines, style)
+ } else {
+ this.renderLineStraight(node, lines, style)
+ }
+ }
+
+ // 直线风格连线
+
+ renderLineStraight(node, lines, style) {
+ if (node.children.length <= 0) {
+ return []
+ }
+ let { left, top, width, height, expandBtnSize } = node
+ let marginX = this.getMarginX(node.layerIndex + 1)
+ let s1 = (marginX - expandBtnSize) * 0.6
+ let nodeUseLineStyle = this.mindMap.themeConfig.nodeUseLineStyle
+ node.children.forEach((item, index) => {
+ let x1 =
+ node.layerIndex === 0 ? left + width : left + width + expandBtnSize
+ let y1 = top + height / 2
+ let x2 = item.left
+ let y2 = item.top + item.height / 2
+ // 节点使用横线风格，需要额外渲染横线
+ let nodeUseLineStyleOffset = nodeUseLineStyle
+ ? item.width
+ : 0
+ y1 = nodeUseLineStyle && !node.isRoot ? y1 + height / 2 : y1
+ y2 = nodeUseLineStyle ? y2 + item.height / 2 : y2
+ let path = `M ${x1},${y1} L ${x1 + s1},${y1} L ${x1 + s1},${y2} L ${
+ x2 + nodeUseLineStyleOffset
+ },${y2}`
+ lines[index].plot(path)
+ style && style(lines[index], item)
+ })
+ }
+
+ // 直连风格
+
+ renderLineDirect(node, lines, style) {
+ if (node.children.length <= 0) {
+ return []
+ }
+ let { left, top, width, height, expandBtnSize } = node
+ let nodeUseLineStyle = this.mindMap.themeConfig.nodeUseLineStyle
+ node.children.forEach((item, index) => {
+ let x1 =
+ node.layerIndex === 0 ? left + width / 2 : left + width + expandBtnSize
+ let y1 = top + height / 2
+ let x2 = item.left
+ let y2 = item.top + item.height / 2
+ y1 = nodeUseLineStyle && !node.isRoot ? y1 + height / 2 : y1
+ y2 = nodeUseLineStyle ? y2 + item.height / 2 : y2
+ // 节点使用横线风格，需要额外渲染横线
+ let nodeUseLineStylePath = nodeUseLineStyle
+ ? ` L ${item.left + item.width},${y2}`
+ : ''
+ let path = `M ${x1},${y1} L ${x2},${y2}` + nodeUseLineStylePath
+ lines[index].plot(path)
+ style && style(lines[index], item)
+ })
+ }
+
+ // 曲线风格连线
+
+ renderLineCurve(node, lines, style) {
+ if (node.children.length <= 0) {
+ return []
+ }
+ let { left, top, width, height, expandBtnSize } = node
+ let nodeUseLineStyle = this.mindMap.themeConfig.nodeUseLineStyle
+ node.children.forEach((item, index) => {
+ let x1 =
+ node.layerIndex === 0 ? left + width / 2 : left + width + expandBtnSize
+ let y1 = top + height / 2
+ let x2 = item.left
+ let y2 = item.top + item.height / 2
+ let path = ''
+ y1 = nodeUseLineStyle && !node.isRoot ? y1 + height / 2 : y1
+ y2 = nodeUseLineStyle ? y2 + item.height / 2 : y2
+ // 节点使用横线风格，需要额外渲染横线
+ let nodeUseLineStylePath = nodeUseLineStyle
+ ? ` L ${item.left + item.width},${y2}`
+ : ''
+ if (node.isRoot) {
+ path = this.quadraticCurvePath(x1, y1, x2, y2) + nodeUseLineStylePath
+ } else {
+ path = this.cubicBezierPath(x1, y1, x2, y2) + nodeUseLineStylePath
+ }
+ lines[index].plot(path)
+ style && style(lines[index], item)
+ })
+ }
+
+ // 渲染按钮
+
+ renderExpandBtn(node, btn) {
+ let { width, height } = node
+ let { translateX, translateY } = btn.transform()
+ // 节点使用横线风格，需要调整展开收起按钮位置
+ let nodeUseLineStyleOffset = this.mindMap.themeConfig.nodeUseLineStyle
+ ? height / 2
+ : 0
+ btn.translate(
+ width - translateX,
+ height / 2 - translateY + nodeUseLineStyleOffset
+ )
+ }
+
+ // 创建概要节点
+
+ renderGeneralization(node, gLine, gNode) {
+ let {
+ top,
+ bottom,
+ right,
+ generalizationLineMargin,
+ generalizationNodeMargin
+ } = this.getNodeBoundaries(node, 'h')
+ let x1 = right + generalizationLineMargin
+ let y1 = top
+ let x2 = right + generalizationLineMargin
+ let y2 = bottom
+ let cx = x1 + 20
+ let cy = y1 + (y2 - y1) / 2
+ let path = `M ${x1},${y1} Q ${cx},${cy} ${x2},${y2}`
+ gLine.plot(path)
+ gNode.left = right + generalizationNodeMargin
+ gNode.top = top + (bottom - top - gNode.height) / 2
+ }
+}
+
+export default LogicalStructure
diff --git a/simple-mind-map/src/layouts/MindMap.js b/simple-mind-map/src/layouts/MindMap.js
index 99ebfa03..87e6ced3 100644
--- a/simple-mind-map/src/layouts/MindMap.js
+++ b/simple-mind-map/src/layouts/MindMap.js
@@ -208,11 +208,12 @@ class MindMap extends Base {
let { left, top, width, height, expandBtnSize } = node
let marginX = this.getMarginX(node.layerIndex + 1)
let s1 = (marginX - expandBtnSize) * 0.6
+ let nodeUseLineStyle = this.mindMap.themeConfig.nodeUseLineStyle
node.children.forEach((item, index) => {
let x1 = 0
let _s = 0
// 节点使用横线风格，需要额外渲染横线
- let nodeUseLineStyleOffset = this.mindMap.themeConfig.nodeUseLineStyle
+ let nodeUseLineStyleOffset = nodeUseLineStyle
? item.width
: 0
if (item.dir === 'left') {
@@ -226,6 +227,8 @@ class MindMap extends Base {
let y1 = top + height / 2
let x2 = item.dir === 'left' ? item.left + item.width : item.left
let y2 = item.top + item.height / 2
+ y1 = nodeUseLineStyle && !node.isRoot ? y1 + height / 2 : y1
+ y2 = nodeUseLineStyle ? y2 + item.height / 2 : y2
let path = `M ${x1},${y1} L ${x1 + _s},${y1} L ${x1 + _s},${y2} L ${
x2 + nodeUseLineStyleOffset
},${y2}`
@@ -241,6 +244,7 @@ class MindMap extends Base {
return []
}
let { left, top, width, height, expandBtnSize } = node
+ let nodeUseLineStyle = this.mindMap.themeConfig.nodeUseLineStyle
node.children.forEach((item, index) => {
let x1 =
node.layerIndex === 0
@@ -251,9 +255,11 @@ class MindMap extends Base {
let y1 = top + height / 2
let x2 = item.dir === 'left' ? item.left + item.width : item.left
let y2 = item.top + item.height / 2
+ y1 = nodeUseLineStyle && !node.isRoot ? y1 + height / 2 : y1
+ y2 = nodeUseLineStyle ? y2 + item.height / 2 : y2
// 节点使用横线风格，需要额外渲染横线
let nodeUseLineStylePath = ''
- if (this.mindMap.themeConfig.nodeUseLineStyle) {
+ if (nodeUseLineStyle) {
if (item.dir === 'left') {
nodeUseLineStylePath = ` L ${item.left},${y2}`
} else {
@@ -273,6 +279,7 @@ class MindMap extends Base {
return []
}
let { left, top, width, height, expandBtnSize } = node
+ let nodeUseLineStyle = this.mindMap.themeConfig.nodeUseLineStyle
node.children.forEach((item, index) => {
let x1 =
node.layerIndex === 0
@@ -284,6 +291,8 @@ class MindMap extends Base {
let x2 = item.dir === 'left' ? item.left + item.width : item.left
let y2 = item.top + item.height / 2
let path = ''
+ y1 = nodeUseLineStyle && !node.isRoot ? y1 + height / 2 : y1
+ y2 = nodeUseLineStyle ? y2 + item.height / 2 : y2
// 节点使用横线风格，需要额外渲染横线
let nodeUseLineStylePath = ''
if (this.mindMap.themeConfig.nodeUseLineStyle) {
diff --git a/web/src/pages/Doc/en/changelog/index.md b/web/src/pages/Doc/en/changelog/index.md
index b4654dd8..43d3568c 100644
--- a/web/src/pages/Doc/en/changelog/index.md
+++ b/web/src/pages/Doc/en/changelog/index.md
@@ -4,7 +4,7 @@
New：Automatic line wrapping function is added to node text.
-Fix: Fix the problem of deletion exceptions if there are root nodes in the batch deleted nodes.
+Fix: 1.Fix the problem of deletion exceptions if there are root nodes in the batch deleted nodes. 2.Fix the problem that high node height will overlap with other nodes in the case of bottom edge style.
## 0.3.3
diff --git a/web/src/pages/Doc/en/changelog/index.vue b/web/src/pages/Doc/en/changelog/index.vue
index be8aabfc..6aac7087 100644
--- a/web/src/pages/Doc/en/changelog/index.vue
+++ b/web/src/pages/Doc/en/changelog/index.vue
@@ -3,7 +3,7 @@
Changelog
0.3.4
New：Automatic line wrapping function is added to node text.
-Fix: Fix the problem of deletion exceptions if there are root nodes in the batch deleted nodes.
+Fix: 1.Fix the problem of deletion exceptions if there are root nodes in the batch deleted nodes. 2.Fix the problem that high node height will overlap with other nodes in the case of bottom edge style.
0.3.3
Fix: The root node text cannot wrap.
0.3.2
diff --git a/web/src/pages/Doc/zh/changelog/index.md b/web/src/pages/Doc/zh/changelog/index.md
index 05b2a006..fe60f530 100644
--- a/web/src/pages/Doc/zh/changelog/index.md
+++ b/web/src/pages/Doc/zh/changelog/index.md
@@ -4,7 +4,7 @@
New：节点文本增加自动换行功能。
-Fix：修复批量删除的节点中如果存在根节点会出现删除异常的问题。
+Fix：1.修复批量删除的节点中如果存在根节点会出现删除异常的问题。2.修复底边风格的情况下，节点高度过高会和其他节点重叠的问题。
## 0.3.3
diff --git a/web/src/pages/Doc/zh/changelog/index.vue b/web/src/pages/Doc/zh/changelog/index.vue
index dbdd4401..403e0e79 100644
--- a/web/src/pages/Doc/zh/changelog/index.vue
+++ b/web/src/pages/Doc/zh/changelog/index.vue
@@ -3,7 +3,7 @@
Changelog
0.3.4
New：节点文本增加自动换行功能。
-Fix：修复批量删除的节点中如果存在根节点会出现删除异常的问题。
+Fix：1.修复批量删除的节点中如果存在根节点会出现删除异常的问题。2.修复底边风格的情况下，节点高度过高会和其他节点重叠的问题。
0.3.3
修复：根节点文字无法换行的问题。
0.3.2