diff --git a/README.md b/README.md index 0e52b3a1..3dda2b1b 100644 --- a/README.md +++ b/README.md @@ -87,9 +87,7 @@ const mindMap = new MindMap({ # 微信交流群 - - -如果已过期，可以微信添加`wanglinguanfang`拉你入群。 +群聊人数较多，无法通过二维码入群，可以微信添加`wanglinguanfang`拉你入群。 # 请作者喝杯咖啡 @@ -97,7 +95,7 @@ const mindMap = new MindMap({ > 厚椰乳一盒 + 纯牛奶半盒 + 冰块 + 咖啡液 = 生椰拿铁 yyds -> 转账请备注【思维导图】。你的头像和名字将会出现在下面和[文档页面](https://wanglin2.github.io/mind-map/#/doc/zh/introduction/%E8%AF%B7%E4%BD%9C%E8%80%85%E5%96%9D%E6%9D%AF%E5%92%96%E5%95%A1) +> 推荐使用支付宝，微信获取不到头像。转账请备注【思维导图】。你的头像和名字将会出现在下面和[文档页面](https://wanglin2.github.io/mind-map/#/doc/zh/introduction/%E8%AF%B7%E4%BD%9C%E8%80%85%E5%96%9D%E6%9D%AF%E5%92%96%E5%95%A1)

@@ -153,4 +151,24 @@ const mindMap = new MindMap({ 才镇 + + + 小米bbᯤ²ᴳ + + + + *棐 + + + + Luke + + + + 布林 + + + + 南风 +

\ No newline at end of file diff --git a/index.html b/index.html index 3f8309c1..7bc10e79 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ 思绪思维导图
+ } diff --git a/qrcode.jpg b/qrcode.jpg deleted file mode 100644 index b39a4ac2..00000000 Binary files a/qrcode.jpg and /dev/null differ diff --git a/simple-mind-map/full.js b/simple-mind-map/full.js index 3d140c83..8ee27854 100644 --- a/simple-mind-map/full.js +++ b/simple-mind-map/full.js @@ -13,6 +13,7 @@ import NodeImgAdjust from './src/plugins/NodeImgAdjust.js' import TouchEvent from './src/plugins/TouchEvent.js' import Search from './src/plugins/Search.js' import Painter from './src/plugins/Painter.js' +import Scrollbar from './src/plugins/Scrollbar.js' import xmind from './src/parse/xmind.js' import markdown from './src/parse/markdown.js' import icons from './src/svg/icons.js' @@ -42,5 +43,6 @@ MindMap .usePlugin(NodeImgAdjust) .usePlugin(Search) .usePlugin(Painter) + .usePlugin(Scrollbar) export default MindMap \ No newline at end of file diff --git a/simple-mind-map/index.d.ts b/simple-mind-map/index.d.ts new file mode 100644 index 00000000..88636563 --- /dev/null +++ b/simple-mind-map/index.d.ts @@ -0,0 +1,14 @@ +// declare module "simple-mind-map"; +declare module 'simple-mind-map'{ + class MindMap { + constructor(opt:any); + handleOpt(opt:any):void; + render(callback:any, source:string):void; + reRender(callback:any, source:string):void; + resize():void; + on(event:any, fn:any):void; + setFullData(data:any):void; + getData(withConfig:any):any; + } + export default MindMap; +} diff --git a/simple-mind-map/index.js b/simple-mind-map/index.js index c5b6edc6..26715799 100644 --- a/simple-mind-map/index.js +++ b/simple-mind-map/index.js @@ -7,10 +7,18 @@ import Style from './src/core/render/node/Style' import KeyCommand from './src/core/command/KeyCommand' import Command from './src/core/command/Command' import BatchExecution from './src/utils/BatchExecution' -import { layoutValueList, CONSTANTS, commonCaches } from './src/constants/constant' +import { + layoutValueList, + CONSTANTS, + commonCaches, + ERROR_TYPES, + cssContent +} from './src/constants/constant' import { SVG } from '@svgdotjs/svg.js' -import { simpleDeepClone, getType } from './src/utils' -import defaultTheme, { checkIsNodeSizeIndependenceConfig } from './src/themes/default' +import { simpleDeepClone, getType, getObjectChangedProps } from './src/utils' +import defaultTheme, { + checkIsNodeSizeIndependenceConfig +} from './src/themes/default' import { defaultOpt } from './src/constants/defaultOptions' // 思维导图 @@ -22,11 +30,17 @@ class MindMap { // 容器元素 this.el = this.opt.el + if (!this.el) throw new Error('缺少容器元素el') this.elRect = this.el.getBoundingClientRect() // 画布宽高 this.width = this.elRect.width this.height = this.elRect.height + if (this.width <= 0 || this.height <= 0) throw new Error('容器元素el的宽高不能为0') + + // 添加css + this.cssEl = null + this.addCss() // 画布 this.svg = SVG().addTo(this.el).size(this.width, this.height) @@ -68,7 +82,7 @@ class MindMap { this.batchExecution = new BatchExecution() // 注册插件 - MindMap.pluginList.forEach((plugin) => { + MindMap.pluginList.forEach(plugin => { this.initPlugin(plugin) }) @@ -92,6 +106,19 @@ class MindMap { return opt } + // 添加必要的css样式到页面 + addCss() { + this.cssEl = document.createElement('style') + this.cssEl.type = 'text/css' + this.cssEl.innerHTML = cssContent + document.head.appendChild(this.cssEl) + } + + // 移除css + removeCss() { + document.head.removeChild(this.cssEl) + } + // 渲染，部分渲染 render(callback, source = '') { this.batchExecution.push('render', () => { @@ -136,10 +163,10 @@ class MindMap { // 初始化缓存数据 initCache() { - Object.keys(commonCaches).forEach((key) => { + Object.keys(commonCaches).forEach(key => { let type = getType(commonCaches[key]) let value = '' - switch(type) { + switch (type) { case 'Boolean': value = false break @@ -164,7 +191,7 @@ class MindMap { this.renderer.clearAllActive() this.opt.theme = theme this.render(null, CONSTANTS.CHANGE_THEME) - this.emit('view_theme_change', theme) + this.emit('view_theme_change', theme) } // 获取当前主题 @@ -174,9 +201,11 @@ class MindMap { // 设置主题配置 setThemeConfig(config) { + // 计算改变了的配置 + const changedConfig = getObjectChangedProps(this.themeConfig, config) this.opt.themeConfig = config // 检查改变的是否是节点大小无关的主题属性 - let res = checkIsNodeSizeIndependenceConfig(config) + let res = checkIsNodeSizeIndependenceConfig(changedConfig) this.render(null, res ? '' : CONSTANTS.CHANGE_THEME) } @@ -278,8 +307,12 @@ class MindMap { // 导出 async export(...args) { - let result = await this.doExport.export(...args) - return result + try { + let result = await this.doExport.export(...args) + return result + } catch (error) { + this.opt.errorHandler(ERROR_TYPES.EXPORT_ERROR, error) + } } // 转换位置 @@ -317,17 +350,23 @@ class MindMap { // 获取变换后的位置尺寸信息，其实是getBoundingClientRect方法的包装方法 const rect = draw.rbox() // 内边距 - rect.width += paddingX - rect.height += paddingY - draw.translate(paddingX / 2, paddingY / 2) + rect.width += paddingX * 2 + rect.height += paddingY * 2 + draw.translate(paddingX, paddingY) // 将svg设置为实际内容的宽高 svg.size(rect.width, rect.height) // 把实际内容变换 draw.translate(-rect.x + elRect.left, -rect.y + elRect.top) // 克隆一份数据 let clone = svg.clone() + // 添加必要的样式 + clone.add(SVG(``)) // 如果实际图形宽高超出了屏幕宽高，且存在水印的话需要重新绘制水印，否则会出现超出部分没有水印的问题 - if ((rect.width > origWidth || rect.height > origHeight) && this.watermark && this.watermark.hasWatermark()) { + if ( + (rect.width > origWidth || rect.height > origHeight) && + this.watermark && + this.watermark.hasWatermark() + ) { this.width = rect.width this.height = rect.height this.watermark.draw() @@ -388,7 +427,10 @@ class MindMap { // 销毁 destroy() { // 移除插件 - [...MindMap.pluginList].forEach((plugin) => { + ;[...MindMap.pluginList].forEach(plugin => { + if (this[plugin.instanceName].beforePluginDestroy) { + this[plugin.instanceName].beforePluginDestroy() + } this[plugin.instanceName] = null }) // 解绑事件 @@ -397,7 +439,9 @@ class MindMap { this.svg.remove() // 去除给容器元素设置的背景样式 Style.removeBackgroundStyle(this.el) + this.el.innerHTML = '' this.el = null + this.removeCss() } } @@ -408,8 +452,8 @@ MindMap.usePlugin = (plugin, opt = {}) => { MindMap.pluginList.push(plugin) return MindMap } -MindMap.hasPlugin = (plugin) => { - return MindMap.pluginList.findIndex((item) => { +MindMap.hasPlugin = plugin => { + return MindMap.pluginList.findIndex(item => { return item === plugin }) } diff --git a/simple-mind-map/package-lock.json b/simple-mind-map/package-lock.json index a3858abc..d05ccda1 100644 --- a/simple-mind-map/package-lock.json +++ b/simple-mind-map/package-lock.json @@ -1,16 +1,15 @@ { "name": "simple-mind-map", - "version": "0.6.13", + "version": "0.6.15-fix.2", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "0.6.13", + "version": "0.6.15-fix.2", "license": "MIT", "dependencies": { "@svgdotjs/svg.js": "^3.0.16", "deepmerge": "^1.5.2", - "dom-to-image-more": "^3.1.6", "eventemitter3": "^4.0.7", "jspdf": "^2.5.1", "jszip": "^3.10.1", @@ -518,11 +517,6 @@ "node": ">=6.0.0" } }, - "node_modules/dom-to-image-more": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/dom-to-image-more/-/dom-to-image-more-3.1.6.tgz", - "integrity": "sha512-VMO0jNme32T06mWtkOC9QXfj+1npoJxkaTFW0DCwBLguwBKMjqwndiDANxDnbZ0kvNEecwxkv0Zmgdr96cGtAA==" - }, "node_modules/dompurify": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.1.tgz", @@ -2660,11 +2654,6 @@ "esutils": "^2.0.2" } }, - "dom-to-image-more": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/dom-to-image-more/-/dom-to-image-more-3.1.6.tgz", - "integrity": "sha512-VMO0jNme32T06mWtkOC9QXfj+1npoJxkaTFW0DCwBLguwBKMjqwndiDANxDnbZ0kvNEecwxkv0Zmgdr96cGtAA==" - }, "dompurify": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.1.tgz", diff --git a/simple-mind-map/package.json b/simple-mind-map/package.json index bbbec57d..30feca85 100644 --- a/simple-mind-map/package.json +++ b/simple-mind-map/package.json @@ -1,6 +1,6 @@ { "name": "simple-mind-map", - "version": "0.6.14", + "version": "0.7.0", "description": "一个简单的web在线思维导图", "authors": [ { @@ -26,7 +26,6 @@ "dependencies": { "@svgdotjs/svg.js": "^3.0.16", "deepmerge": "^1.5.2", - "dom-to-image-more": "^3.1.6", "eventemitter3": "^4.0.7", "jspdf": "^2.5.1", "jszip": "^3.10.1", diff --git a/simple-mind-map/src/constants/constant.js b/simple-mind-map/src/constants/constant.js index 3b991fe4..cc316228 100644 --- a/simple-mind-map/src/constants/constant.js +++ b/simple-mind-map/src/constants/constant.js @@ -325,10 +325,49 @@ export const nodeDataNoStylePropList = [ 'uid', 'activeStyle', 'associativeLineTargets', - 'associativeLineTargetControlOffsets' + 'associativeLineTargetControlOffsets', + 'associativeLinePoint', + 'associativeLineText' ] // 数据缓存 export const commonCaches = { - measureCustomNodeContentSizeEl: null -} \ No newline at end of file + measureCustomNodeContentSizeEl: null, + measureRichtextNodeTextSizeEl: null +} + +// 错误类型 +export const ERROR_TYPES = { + READ_CLIPBOARD_ERROR: 'read_clipboard_error', + PARSE_PASTE_DATA_ERROR: 'parse_paste_data_error', + CUSTOM_HANDLE_CLIPBOARD_TEXT_ERROR: 'custom_handle_clipboard_text_error', + LOAD_CLIPBOARD_IMAGE_ERROR: 'load_clipboard_image_error', + BEFORE_TEXT_EDIT_ERROR: 'before_text_edit_error', + EXPORT_ERROR: 'export_error' +} + +// a4纸的宽高 +export const a4Size = { + width: 592.28, + height: 841.89 +} + +// css +export const cssContent = ` + /* 鼠标hover和激活时渲染的矩形 */ + .smm-hover-node{ + display: none; + opacity: 0.6; + stroke-width: 1; + } + + .smm-node:hover .smm-hover-node{ + display: block; + } + + .smm-node.active .smm-hover-node{ + display: block; + opacity: 1; + stroke-width: 2; + } +` \ No newline at end of file diff --git a/simple-mind-map/src/constants/defaultOptions.js b/simple-mind-map/src/constants/defaultOptions.js index 7453122d..1f1b5709 100644 --- a/simple-mind-map/src/constants/defaultOptions.js +++ b/simple-mind-map/src/constants/defaultOptions.js @@ -18,8 +18,6 @@ export const defaultOpt = { mouseScaleCenterUseMousePosition: true, // 最多显示几个标签 maxTag: 5, - // 导出图片时的内边距 - exportPadding: 20, // 展开收缩按钮尺寸 expandBtnSize: 20, // 节点里图片和文字的间距 @@ -70,18 +68,26 @@ export const defaultOpt = { // 展开收起按钮的颜色 expandBtnStyle: { color: '#808080', - fill: '#fff' + fill: '#fff', + fontSize: 13, + strokeColor: '#333333' }, // 自定义展开收起按钮的图标 expandBtnIcon: { open: '', // svg字符串 close: '' }, + // 处理收起节点数量 + expandBtnNumHandler: num => { + return num + }, + // 是否显示带数量的收起按钮 + isShowExpandNum: true, // 是否只有当鼠标在画布内才响应快捷键事件 enableShortcutOnlyWhenMouseInSvg: true, // 初始根节点的位置 initRootNodePosition: null, - // 导出png、svg、pdf时的图形内边距 + // 导出png、svg、pdf时的图形内边距，注意是单侧内边距 exportPaddingX: 10, exportPaddingY: 10, // 节点文本编辑框的z-index @@ -151,5 +157,30 @@ export const defaultOpt = { } */ // 如果你的处理逻辑存在异步逻辑，也可以返回一个promise - customHandleClipboardText: null + customHandleClipboardText: null, + // 禁止鼠标滚轮缩放，你仍旧可以使用api进行缩放 + disableMouseWheelZoom: false, + // 错误处理函数 + errorHandler: (code, error) => { + console.error(code, error) + }, + // 设置导出图片和svg时，针对富文本节点内容，也就是嵌入到svg中的html节点的默认样式覆盖 + // 如果不覆盖，会发生偏移问题 + resetCss: ` + * { + margin: 0; + padding: 0; + box-sizing: border-box; + } + `, + // 开启鼠标双击复位思维导图位置及缩放 + enableDblclickReset: false, + // 导出图片时canvas的缩放倍数，该配置会和window.devicePixelRatio值取最大值 + minExportImgCanvasScale: 2, + // 节点鼠标hover和激活时显示的矩形边框的颜色 + hoverRectColor: 'rgb(94, 200, 248)', + // 节点鼠标hover和激活时显示的矩形边框距节点内容的距离 + hoverRectPadding: 2, + // 双击节点进入节点文本编辑时是否默认选中文本，默认只在创建新节点时会选中 + selectTextOnEnterEditText: false } diff --git a/simple-mind-map/src/core/render/Render.js b/simple-mind-map/src/core/render/Render.js index 02e11ff9..3aa2500e 100644 --- a/simple-mind-map/src/core/render/Render.js +++ b/simple-mind-map/src/core/render/Render.js @@ -17,7 +17,7 @@ import { } from '../../utils' import { shapeList } from './node/Shape' import { lineStyleProps } from '../../themes/default' -import { CONSTANTS } from '../../constants/constant' +import { CONSTANTS, ERROR_TYPES } from '../../constants/constant' // 布局列表 const layouts = { @@ -342,7 +342,7 @@ class Render { } }) }) - this.mindMap.emit('node_active', null, this.activeNodeList) + this.mindMap.emit('node_active', null, [...this.activeNodeList]) } // 清除当前激活的节点 @@ -407,7 +407,7 @@ class Render { // 激活节点需要显示展开收起按钮 node.showExpandBtn() setTimeout(() => { - node.updateNodeShape() + node.updateNodeActive() }, 0) } }, @@ -416,6 +416,7 @@ class Render { 0, 0 ) + this.mindMap.emit('node_active', null, [...this.activeNodeList]) } // 回退 @@ -629,6 +630,7 @@ class Render { // 粘贴事件 async onPaste() { + const { errorHandler } = this.mindMap.opt // 读取剪贴板的文字和图片 let text = null let img = null @@ -647,7 +649,7 @@ class Render { } } } catch (error) { - console.log(error) + errorHandler(ERROR_TYPES.READ_CLIPBOARD_ERROR, error) } } // 检查剪切板数据是否有变化 @@ -682,7 +684,9 @@ class Render { text = String(res) } } - } catch (error) {} + } catch (error) { + errorHandler(ERROR_TYPES.CUSTOM_HANDLE_CLIPBOARD_TEXT_ERROR, error) + } } // 默认处理 if (useDefault) { @@ -691,7 +695,9 @@ class Render { if (parsedData && parsedData.simpleMindMap) { smmData = parsedData.data } - } catch (error) {} + } catch (error) { + errorHandler(ERROR_TYPES.PARSE_PASTE_DATA_ERROR, error) + } } if (smmData) { this.mindMap.execCommand( @@ -724,7 +730,7 @@ class Render { }) } } catch (error) { - console.log(error) + errorHandler(ERROR_TYPES.LOAD_CLIPBOARD_IMAGE_ERROR, error) } } } else { @@ -849,7 +855,7 @@ class Render { } } } - this.mindMap.emit('node_active', null, this.activeNodeList) + this.mindMap.emit('node_active', null, [...this.activeNodeList]) this.mindMap.render() } @@ -881,7 +887,7 @@ class Render { let copyData = copyNodeTree({}, node, true) this.removeActiveNode(node) this.removeOneNode(node) - this.mindMap.emit('node_active', null, this.activeNodeList) + this.mindMap.emit('node_active', null, [...this.activeNodeList]) this.mindMap.render() if (callback && typeof callback === 'function') { callback(copyData) @@ -896,7 +902,7 @@ class Render { // let copyData = copyNodeTree({}, node, false, true) this.removeActiveNode(node) this.removeOneNode(node) - this.mindMap.emit('node_active', null, this.activeNodeList) + this.mindMap.emit('node_active', null, [...this.activeNodeList]) toNode.nodeData.children.push(node.nodeData) this.mindMap.render() if (toNode.isRoot) { @@ -916,19 +922,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) { @@ -949,18 +945,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) @@ -995,7 +981,7 @@ class Render { } else { node.hideExpandBtn() } - node.updateNodeShape() + node.updateNodeActive() } // 设置节点是否展开 diff --git a/simple-mind-map/src/core/render/TextEdit.js b/simple-mind-map/src/core/render/TextEdit.js index 7ca0cc8e..fe5faf95 100644 --- a/simple-mind-map/src/core/render/TextEdit.js +++ b/simple-mind-map/src/core/render/TextEdit.js @@ -1,4 +1,5 @@ -import { getStrWithBrFromHtml, checkNodeOuter, isMobile } from '../../utils' +import { getStrWithBrFromHtml, checkNodeOuter } from '../../utils' +import { ERROR_TYPES } from '../../constants/constant' // 节点文字编辑类 export default class TextEdit { @@ -62,7 +63,7 @@ export default class TextEdit { const node = activeNodeList[0] // 当正在输入中文或英文或数字时，如果没有按下组合键，那么自动进入文本编辑模式 if (node && this.checkIsAutoEnterTextEditKey(e)) { - this.show(node) + this.show(node, e, false, true) } }) } @@ -92,7 +93,8 @@ export default class TextEdit { // 显示文本编辑框 // isInserting：是否是刚创建的节点 - async show(node, e, isInserting = false) { + // isFromKeyDown：是否是在按键事件进入的编辑 + async show(node, e, isInserting = false, isFromKeyDown = false) { // 使用了自定义节点内容那么不响应编辑事件 if (node.isUseCustomNodeContent()) { return @@ -104,6 +106,7 @@ export default class TextEdit { isShow = await beforeTextEdit(node, isInserting) } catch (error) { isShow = false + this.mindMap.opt.errorHandler(ERROR_TYPES.BEFORE_TEXT_EDIT_ERROR, error) } if (!isShow) return } @@ -112,10 +115,10 @@ export default class TextEdit { this.mindMap.view.translateXY(offsetLeft, offsetTop) let rect = node._textData.node.node.getBoundingClientRect() if (this.mindMap.richText) { - this.mindMap.richText.showEditText(node, rect, isInserting) + this.mindMap.richText.showEditText(node, rect, isInserting, isFromKeyDown) return } - this.showEditTextBox(node, rect, isInserting) + this.showEditTextBox(node, rect, isInserting, isFromKeyDown) } // 处理画布缩放 @@ -133,8 +136,10 @@ export default class TextEdit { } // 显示文本编辑框 - showEditTextBox(node, rect, isInserting) { + showEditTextBox(node, rect, isInserting, isFromKeyDown) { if (this.showTextEdit) return + const { nodeTextEditZIndex, textAutoWrapWidth, selectTextOnEnterEditText } = + this.mindMap.opt this.mindMap.emit('before_show_text_edit') this.registerTmpShortcut() if (!this.textEditNode) { @@ -167,15 +172,14 @@ export default class TextEdit { ) let isMultiLine = node._textData.node.attr('data-ismultiLine') === 'true' node.style.domText(this.textEditNode, scale, isMultiLine) - this.textEditNode.style.zIndex = this.mindMap.opt.nodeTextEditZIndex + this.textEditNode.style.zIndex = nodeTextEditZIndex this.textEditNode.innerHTML = textLines.join('
') this.textEditNode.style.minWidth = rect.width + 10 + 'px' this.textEditNode.style.minHeight = rect.height + 6 + 'px' this.textEditNode.style.left = rect.left + 'px' this.textEditNode.style.top = rect.top + 'px' this.textEditNode.style.display = 'block' - this.textEditNode.style.maxWidth = - this.mindMap.opt.textAutoWrapWidth * scale + 'px' + this.textEditNode.style.maxWidth = textAutoWrapWidth * scale + 'px' if (isMultiLine && lineHeight !== 1) { this.textEditNode.style.transform = `translateY(${ -((lineHeight * fontSize - fontSize) / 2) * scale @@ -186,7 +190,7 @@ export default class TextEdit { // if (!this.cacheEditingText) { // this.selectNodeText() // } - if (isInserting) { + if (isInserting || (selectTextOnEnterEditText && !isFromKeyDown)) { this.selectNodeText() } else { this.focus() diff --git a/simple-mind-map/src/core/render/node/Node.js b/simple-mind-map/src/core/render/node/Node.js index e614e36b..9bca88b9 100644 --- a/simple-mind-map/src/core/render/node/Node.js +++ b/simple-mind-map/src/core/render/node/Node.js @@ -1,10 +1,11 @@ import Style from './Style' import Shape from './Shape' -import { G, Rect, ForeignObject, SVG } from '@svgdotjs/svg.js' +import { G, ForeignObject, SVG, Rect } from '@svgdotjs/svg.js' import nodeGeneralizationMethods from './nodeGeneralization' import nodeExpandBtnMethods from './nodeExpandBtn' import nodeCommandWrapsMethods from './nodeCommandWraps' import nodeCreateContentsMethods from './nodeCreateContents' +import nodeExpandBtnPlaceholderRectMethods from './nodeExpandBtnPlaceholderRect' import { CONSTANTS } from '../../../constants/constant' // 节点类 @@ -57,6 +58,7 @@ class Node { // 节点内容的容器 this.group = null this.shapeNode = null // 节点形状节点 + this.hoverNode = null // 节点hover和激活的节点 // 节点内容对象 this._customNodeContent = null this._imgData = null @@ -107,6 +109,10 @@ class Node { Object.keys(nodeExpandBtnMethods).forEach(item => { this[item] = nodeExpandBtnMethods[item].bind(this) }) + // 展开收起按钮占位元素相关方法 + Object.keys(nodeExpandBtnPlaceholderRectMethods).forEach(item => { + this[item] = nodeExpandBtnPlaceholderRectMethods[item].bind(this) + }) // 命令的相关方法 Object.keys(nodeCommandWrapsMethods).forEach(item => { this[item] = nodeCommandWrapsMethods[item].bind(this) @@ -252,9 +258,11 @@ class Node { this.shapeInstance.getShapePadding(_width, _height, paddingX, paddingY) this.shapePadding.paddingX = shapePaddingX this.shapePadding.paddingY = shapePaddingY + // 边框宽度，因为边框是以中线向两端发散，所以边框会超出节点 + const borderWidth = this.getBorderWidth() return { - width: _width + paddingX * 2 + shapePaddingX * 2, - height: _height + paddingY * 2 + margin + shapePaddingY * 2 + width: _width + paddingX * 2 + shapePaddingX * 2 + borderWidth, + height: _height + paddingY * 2 + margin + shapePaddingY * 2 + borderWidth } } @@ -262,27 +270,41 @@ class Node { layout() { // 清除之前的内容 this.group.clear() + const { hoverRectPadding } = this.mindMap.opt let { width, height, textContentItemMargin } = this let { paddingY } = this.getPaddingVale() - paddingY += this.shapePadding.paddingY + const halfBorderWidth = this.getBorderWidth() / 2 + paddingY += this.shapePadding.paddingY + halfBorderWidth // 节点形状 this.shapeNode = this.shapeInstance.createShape() this.shapeNode.addClass('smm-node-shape') + this.shapeNode.translate(halfBorderWidth, halfBorderWidth) + this.style.shape(this.shapeNode) this.group.add(this.shapeNode) - this.updateNodeShape() // 渲染一个隐藏的矩形区域，用来触发展开收起按钮的显示 this.renderExpandBtnPlaceholderRect() // 概要节点添加一个带所属节点id的类名 if (this.isGeneralization && this.generalizationBelongNode) { this.group.addClass('generalization_' + this.generalizationBelongNode.uid) } + // 激活hover和激活边框 + const addHoverNode = () => { + this.hoverNode = new Rect() + .size(width + hoverRectPadding * 2, height + hoverRectPadding * 2) + .x(-hoverRectPadding) + .y(-hoverRectPadding) + this.hoverNode.addClass('smm-hover-node') + this.style.hoverNode(this.hoverNode, width, height) + this.group.add(this.hoverNode) + } // 如果存在自定义节点内容，那么使用自定义节点内容 if (this.isUseCustomNodeContent()) { let foreignObject = new ForeignObject() foreignObject.width(width) foreignObject.height(height) - foreignObject.add(SVG(this._customNodeContent)) + foreignObject.add(this._customNodeContent) this.group.add(foreignObject) + addHoverNode() return } // 图片节点 @@ -356,27 +378,7 @@ class Node { : 0) ) this.group.add(textContentNested) - } - - // 渲染展开收起按钮的隐藏占位元素 - renderExpandBtnPlaceholderRect() { - if (!this.mindMap.opt.alwaysShowExpandBtn) { - let { width, height } = this - if (!this._unVisibleRectRegionNode) { - this._unVisibleRectRegionNode = new Rect() - this._unVisibleRectRegionNode.fill({ - color: 'transparent' - }) - } - this.group.add(this._unVisibleRectRegionNode) - this.renderer.layout.renderExpandBtnRect( - this._unVisibleRectRegionNode, - this.expandBtnSize, - width, - height, - this - ) - } + addHoverNode() } // 给节点绑定事件 @@ -392,14 +394,23 @@ class Node { this.active(e) }) this.group.on('mousedown', e => { - if (this.isRoot && e.which === 3 && !this.mindMap.opt.readonly) { - e.stopPropagation() - } - if (!this.isRoot && e.which !== 2 && !this.mindMap.opt.readonly) { - e.stopPropagation() + const { readonly, enableCtrlKeyNodeSelection, useLeftKeySelectionRightKeyDrag } = this.mindMap.opt + // 只读模式不需要阻止冒泡 + if (!readonly) { + if (this.isRoot) { + // 根节点，右键拖拽画布模式下不需要阻止冒泡 + if (e.which === 3 && !useLeftKeySelectionRightKeyDrag) { + e.stopPropagation() + } + } else { + // 非根节点，且按下的是非鼠标中键，需要阻止事件冒泡 + if (e.which !== 2) { + e.stopPropagation() + } + } } // 多选和取消多选 - if (e.ctrlKey && this.mindMap.opt.enableCtrlKeyNodeSelection) { + if (e.ctrlKey && enableCtrlKeyNodeSelection) { this.isMultipleChoice = true let isActive = this.nodeData.data.isActive if (!isActive) @@ -415,7 +426,7 @@ class Node { this.mindMap.emit( 'node_active', isActive ? null : this, - this.mindMap.renderer.activeNodeList + [...this.mindMap.renderer.activeNodeList] ) } this.mindMap.emit('node_mousedown', this, e) @@ -447,13 +458,17 @@ class Node { }) // 右键菜单事件 this.group.on('contextmenu', e => { + const { readonly, useLeftKeySelectionRightKeyDrag } = this.mindMap.opt // 按住ctrl键点击鼠标左键不知为何触发的是contextmenu事件 - if (this.mindMap.opt.readonly || e.ctrlKey) { - // || this.isGeneralization + if (readonly || e.ctrlKey) { return } e.stopPropagation() e.preventDefault() + // 如果是多选节点结束，那么不要触发右键菜单事件 + if(!useLeftKeySelectionRightKeyDrag && this.mindMap.select.hasSelectRange()) { + return + } if (this.nodeData.data.isActive) { this.renderer.clearActive() } @@ -475,14 +490,15 @@ class Node { this.renderer.clearActive() this.mindMap.execCommand('SET_NODE_ACTIVE', this, true) this.renderer.addActiveNode(this) - this.mindMap.emit('node_active', this, this.renderer.activeNodeList) + this.mindMap.emit('node_active', this, [...this.renderer.activeNodeList]) } // 更新节点 - update(isLayout = false) { + update() { if (!this.group) { return } + this.updateNodeActive() let { alwaysShowExpandBtn } = this.mindMap.opt if (alwaysShowExpandBtn) { // 需要移除展开收缩按钮 @@ -555,13 +571,11 @@ class Node { return sizeChange } - // 更新节点形状样式 - updateNodeShape() { - if (!this.shapeNode) return - const shape = this.getShape() - this.style[shape === CONSTANTS.SHAPE.RECTANGLE ? 'rect' : 'shape']( - this.shapeNode - ) + // 更新节点激活状态 + updateNodeActive() { + if (!this.group) return + const isActive = this.nodeData.data.isActive + this.group[isActive ? 'addClass' : 'removeClass']('active') } // 递归渲染 @@ -569,9 +583,7 @@ class Node { // 节点 // 重新渲染连线 this.renderLine() - let isLayout = false if (!this.group) { - isLayout = true // 创建组 this.group = new G() this.group.addClass('smm-node') @@ -581,17 +593,14 @@ class Node { this.bindGroupEvent() this.draw.add(this.group) this.layout() - this.update(isLayout) + this.update() } else { this.draw.add(this.group) if (this.needLayout) { this.needLayout = false this.layout() } - if (this.needRerenderExpandBtnPlaceholderRect) { - this.needRerenderExpandBtnPlaceholderRect = false - this.renderExpandBtnPlaceholderRect() - } + this.updateExpandBtnPlaceholderRect() this.update() } // 子节点 @@ -818,8 +827,8 @@ class Node { } // 获取某个样式 - getStyle(prop, root, isActive) { - let v = this.style.merge(prop, root, isActive) + getStyle(prop, root) { + let v = this.style.merge(prop, root) return v === undefined ? '' : v } @@ -846,6 +855,11 @@ class Node { ) // 父级 } + // 获取节点非节点状态的边框大小 + getBorderWidth() { + return this.style.merge('borderWidth', false) || 0 + } + // 获取数据 getData(key) { return key ? this.nodeData.data[key] || '' : this.nodeData.data diff --git a/simple-mind-map/src/core/render/node/Shape.js b/simple-mind-map/src/core/render/node/Shape.js index d53d8881..380a8447 100644 --- a/simple-mind-map/src/core/render/node/Shape.js +++ b/simple-mind-map/src/core/render/node/Shape.js @@ -62,11 +62,10 @@ export default class Shape { // 创建形状节点 createShape() { const shape = this.node.getShape() - let { width, height } = this.node let node = null // 矩形 if (shape === CONSTANTS.SHAPE.RECTANGLE) { - node = new Rect().size(width, height) + node = this.createRect() } else if (shape === CONSTANTS.SHAPE.DIAMOND) { // 菱形 node = this.createDiamond() @@ -95,9 +94,41 @@ export default class Shape { return node } + // 获取节点减去节点边框宽度、hover节点边框宽度后的尺寸 + getNodeSize() { + const borderWidth = this.node.getBorderWidth() + let { width, height } = this.node + width -= borderWidth + height -= borderWidth + return { + width, + height + } + } + + // 创建矩形 + createRect() { + let { width, height } = this.getNodeSize() + let borderRadius = this.node.style.merge('borderRadius') + return new Path().plot(` + M${borderRadius},0 + L${width - borderRadius},0 + C${width - borderRadius},0 ${width},${0} ${width},${borderRadius} + L${width},${height - borderRadius} + C${width},${height - borderRadius} ${width},${height} ${ + width - borderRadius + },${height} + L${borderRadius},${height} + C${borderRadius},${height} ${0},${height} ${0},${height - borderRadius} + L${0},${borderRadius} + C${0},${borderRadius} ${0},${0} ${borderRadius},${0} + Z + `) + } + // 创建菱形 createDiamond() { - let { width, height } = this.node + let { width, height } = this.getNodeSize() let halfWidth = width / 2 let halfHeight = height / 2 let topX = halfWidth @@ -120,7 +151,7 @@ export default class Shape { createParallelogram() { let { paddingX } = this.node.getPaddingVale() paddingX = paddingX || this.node.shapePadding.paddingX - let { width, height } = this.node + let { width, height } = this.getNodeSize() return new Polygon().plot([ [paddingX, 0], [width, 0], @@ -131,7 +162,7 @@ export default class Shape { // 创建圆角矩形 createRoundedRectangle() { - let { width, height } = this.node + let { width, height } = this.getNodeSize() let halfHeight = height / 2 return new Path().plot(` M${halfHeight},0 @@ -145,7 +176,7 @@ export default class Shape { // 创建八角矩形 createOctagonalRectangle() { let w = 5 - let { width, height } = this.node + let { width, height } = this.getNodeSize() return new Polygon().plot([ [0, w], [w, 0], @@ -162,7 +193,7 @@ export default class Shape { createOuterTriangularRectangle() { let { paddingX } = this.node.getPaddingVale() paddingX = paddingX || this.node.shapePadding.paddingX - let { width, height } = this.node + let { width, height } = this.getNodeSize() return new Polygon().plot([ [paddingX, 0], [width - paddingX, 0], @@ -177,7 +208,7 @@ export default class Shape { createInnerTriangularRectangle() { let { paddingX } = this.node.getPaddingVale() paddingX = paddingX || this.node.shapePadding.paddingX - let { width, height } = this.node + let { width, height } = this.getNodeSize() return new Polygon().plot([ [0, 0], [width, 0], @@ -190,7 +221,7 @@ export default class Shape { // 创建椭圆 createEllipse() { - let { width, height } = this.node + let { width, height } = this.getNodeSize() let halfWidth = width / 2 let halfHeight = height / 2 return new Path().plot(` @@ -203,7 +234,7 @@ export default class Shape { // 创建圆 createCircle() { - let { width, height } = this.node + let { width, height } = this.getNodeSize() let halfWidth = width / 2 let halfHeight = height / 2 return new Path().plot(` diff --git a/simple-mind-map/src/core/render/node/Style.js b/simple-mind-map/src/core/render/node/Style.js index 9cd452d2..98341bee 100644 --- a/simple-mind-map/src/core/render/node/Style.js +++ b/simple-mind-map/src/core/render/node/Style.js @@ -1,6 +1,15 @@ -import { tagColorList, nodeDataNoStylePropList } from '../../../constants/constant' +import { + tagColorList, + nodeDataNoStylePropList +} from '../../../constants/constant' const rootProp = ['paddingX', 'paddingY'] -const backgroundStyleProps = ['backgroundColor', 'backgroundImage', 'backgroundRepeat', 'backgroundPosition', 'backgroundSize'] +const backgroundStyleProps = [ + 'backgroundColor', + 'backgroundImage', + 'backgroundRepeat', + 'backgroundPosition', + 'backgroundSize' +] // 样式类 class Style { @@ -10,12 +19,18 @@ class Style { if (!Style.cacheStyle) { Style.cacheStyle = {} let style = window.getComputedStyle(el) - backgroundStyleProps.forEach((prop) => { + backgroundStyleProps.forEach(prop => { Style.cacheStyle[prop] = style[prop] }) } // 设置新样式 - let { backgroundColor, backgroundImage, backgroundRepeat, backgroundPosition, backgroundSize } = themeConfig + let { + backgroundColor, + backgroundImage, + backgroundRepeat, + backgroundPosition, + backgroundSize + } = themeConfig el.style.backgroundColor = backgroundColor if (backgroundImage && backgroundImage !== 'none') { el.style.backgroundImage = `url(${backgroundImage})` @@ -30,7 +45,7 @@ class Style { // 移除背景样式 static removeBackgroundStyle(el) { if (!Style.cacheStyle) return - backgroundStyleProps.forEach((prop) => { + backgroundStyleProps.forEach(prop => { el.style[prop] = Style.cacheStyle[prop] }) Style.cacheStyle = null @@ -42,7 +57,7 @@ class Style { } // 合并样式 - merge(prop, root, isActive) { + merge(prop, root) { let themeConfig = this.ctx.mindMap.themeConfig // 三级及以下节点 let defaultConfig = themeConfig.node @@ -59,17 +74,6 @@ class Style { // 二级节点 defaultConfig = themeConfig.second } - // 激活状态 - if (isActive !== undefined ? isActive : this.ctx.nodeData.data.isActive) { - if ( - this.ctx.nodeData.data.activeStyle && - this.ctx.nodeData.data.activeStyle[prop] !== undefined - ) { - return this.ctx.nodeData.data.activeStyle[prop] - } else if (defaultConfig.active && defaultConfig.active[prop]) { - return defaultConfig.active[prop] - } - } // 优先使用节点本身的样式 return this.getSelfStyle(prop) !== undefined ? this.getSelfStyle(prop) @@ -77,8 +81,8 @@ class Style { } // 获取某个样式值 - getStyle(prop, root, isActive) { - return this.merge(prop, root, isActive) + getStyle(prop, root) { + return this.merge(prop, root) } // 获取自身自定义样式 @@ -142,10 +146,10 @@ class Style { // 获取文本样式 getTextFontStyle() { - return { - italic: this.merge('fontStyle') === 'italic', - bold: this.merge('fontWeight'), - fontSize: this.merge('fontSize'), + return { + italic: this.merge('fontStyle') === 'italic', + bold: this.merge('fontWeight'), + fontSize: this.merge('fontSize'), fontFamily: this.merge('fontFamily') } } @@ -201,25 +205,43 @@ class Style { // 展开收起按钮 iconBtn(node, node2, fillNode) { - let { color, fill } = this.ctx.mindMap.opt.expandBtnStyle || { + let { color, fill, fontSize, fontColor } = this.ctx.mindMap.opt + .expandBtnStyle || { color: '#808080', - fill: '#fff' + fill: '#fff', + fontSize: 12, + strokeColor: '#333333', + fontColor: '#333333' } node.fill({ color: color }) node2.fill({ color: color }) fillNode.fill({ color: fill }) + if (this.ctx.mindMap.opt.isShowExpandNum) { + node.attr({ 'font-size': fontSize, 'font-color': fontColor }) + } } // 是否设置了自定义的样式 hasCustomStyle() { let res = false - Object.keys(this.ctx.nodeData.data).forEach((item) => { + Object.keys(this.ctx.nodeData.data).forEach(item => { if (!nodeDataNoStylePropList.includes(item)) { res = true } }) return res } + + // hover和激活节点 + hoverNode(node) { + const { hoverRectColor } = this.ctx.mindMap.opt + node + .radius(5) + .fill('none') + .stroke({ + color: hoverRectColor + }) + } } Style.cacheStyle = null 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 2d5268bf..9ff93cf5 100644 --- a/simple-mind-map/src/core/render/node/nodeCreateContents.js +++ b/simple-mind-map/src/core/render/node/nodeCreateContents.js @@ -1,4 +1,10 @@ -import { measureText, resizeImgSize, removeHtmlStyle, addHtmlStyle, checkIsRichText } from '../../../utils' +import { + measureText, + resizeImgSize, + removeHtmlStyle, + addHtmlStyle, + checkIsRichText +} from '../../../utils' import { Image, SVG, A, G, Rect, Text, ForeignObject } from '@svgdotjs/svg.js' import iconsSvg from '../../../svg/icons' import { CONSTANTS, commonCaches } from '../../../constants/constant' @@ -54,7 +60,10 @@ function createIconNode() { } let iconSize = this.mindMap.themeConfig.iconSize return _data.icon.map(item => { - let src = iconsSvg.getNodeIconListIcon(item, this.mindMap.opt.iconList || []) + let src = iconsSvg.getNodeIconListIcon( + item, + this.mindMap.opt.iconList || [] + ) let node = null // svg图标 if (/^${this.nodeData.data.text}` - let div = document.createElement('div') + if (!commonCaches.measureRichtextNodeTextSizeEl) { + commonCaches.measureRichtextNodeTextSizeEl = document.createElement('div') + commonCaches.measureRichtextNodeTextSizeEl.style.position = 'fixed' + commonCaches.measureRichtextNodeTextSizeEl.style.left = '-999999px' + this.mindMap.el.appendChild(commonCaches.measureRichtextNodeTextSizeEl) + } + let div = commonCaches.measureRichtextNodeTextSizeEl div.innerHTML = html - div.style.cssText = `position: fixed; left: -999999px;` let el = div.children[0] el.classList.add('smm-richtext-node-wrap') el.setAttribute('xmlns', 'http://www.w3.org/1999/xhtml') - el.style.maxWidth = this.mindMap.opt.textAutoWrapWidth + 'px' - this.mindMap.el.appendChild(div) + el.style.maxWidth = textAutoWrapWidth + 'px' let { width, height } = el.getBoundingClientRect() - width = Math.ceil(width) + 1// 修复getBoundingClientRect方法对实际宽度是小数的元素获取到的值是整数，导致宽度不够文本发生换行的问题 + // 如果文本为空，那么需要计算一个默认高度 + if (height <= 0) { + div.innerHTML = '

abc123我和你

' + let elTmp = div.children[0] + elTmp.classList.add('smm-richtext-node-wrap') + height = elTmp.getBoundingClientRect().height + } + width = Math.ceil(width) + 1 // 修复getBoundingClientRect方法对实际宽度是小数的元素获取到的值是整数，导致宽度不够文本发生换行的问题 height = Math.ceil(height) g.attr('data-width', width) g.attr('data-height', height) - html = div.innerHTML - this.mindMap.el.removeChild(div) let foreignObject = new ForeignObject() foreignObject.width(width) foreignObject.height(height) - foreignObject.add(SVG(html)) + foreignObject.add(div.children[0]) g.add(foreignObject) return { node: g, @@ -141,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) @@ -274,9 +289,10 @@ function createNoteNode() { box-shadow: 0 2px 5px rgb(0 0 0 / 10%); display: none; background-color: #fff; - z-index: ${ this.mindMap.opt.nodeNoteTooltipZIndex } + z-index: ${this.mindMap.opt.nodeNoteTooltipZIndex} ` - const targetNode = this.mindMap.opt.customInnerElsAppendTo || document.body + const targetNode = + this.mindMap.opt.customInnerElsAppendTo || document.body targetNode.appendChild(this.noteEl) } this.noteEl.innerText = this.nodeData.data.note @@ -310,7 +326,7 @@ function createNoteNode() { } // 测量自定义节点内容元素的宽高 -function measureCustomNodeContentSize (content) { +function measureCustomNodeContentSize(content) { if (!commonCaches.measureCustomNodeContentSizeEl) { commonCaches.measureCustomNodeContentSizeEl = document.createElement('div') commonCaches.measureCustomNodeContentSizeEl.style.cssText = ` @@ -330,19 +346,19 @@ function measureCustomNodeContentSize (content) { } // 是否使用的是自定义节点内容 -function isUseCustomNodeContent() { +function isUseCustomNodeContent() { return !!this._customNodeContent } export default { - createImgNode, - getImgShowSize, - createIconNode, - createRichTextNode, - createTextNode, - createHyperlinkNode, - createTagNode, - createNoteNode, - measureCustomNodeContentSize, - isUseCustomNodeContent -} \ No newline at end of file + createImgNode, + getImgShowSize, + createIconNode, + createRichTextNode, + createTextNode, + createHyperlinkNode, + createTagNode, + createNoteNode, + measureCustomNodeContentSize, + isUseCustomNodeContent +} diff --git a/simple-mind-map/src/core/render/node/nodeExpandBtn.js b/simple-mind-map/src/core/render/node/nodeExpandBtn.js index 5b2675cd..61936759 100644 --- a/simple-mind-map/src/core/render/node/nodeExpandBtn.js +++ b/simple-mind-map/src/core/render/node/nodeExpandBtn.js @@ -6,13 +6,27 @@ function createExpandNodeContent() { if (this._openExpandNode) { return } - let { open, close } = this.mindMap.opt.expandBtnIcon || {} - // 展开的节点 - this._openExpandNode = SVG(open || btnsSvg.open).size( - this.expandBtnSize, - this.expandBtnSize - ) - this._openExpandNode.x(0).y(-this.expandBtnSize / 2) + let { close, open } = this.mindMap.opt.expandBtnIcon || {} + // 根据配置判断是否显示数量按钮 + if (this.mindMap.opt.isShowExpandNum) { + // 展开的节点 + this._openExpandNode = SVG() + .text() + .size(this.expandBtnSize, this.expandBtnSize) + // 文本垂直居中 + this._openExpandNode.attr({ + 'text-anchor': 'middle', + 'dominant-baseline': 'middle', + x: this.expandBtnSize / 2, + y: 2 + }) + } else { + this._openExpandNode = SVG(open || btnsSvg.open).size( + this.expandBtnSize, + this.expandBtnSize + ) + this._openExpandNode.x(0).y(-this.expandBtnSize / 2) + } // 收起的节点 this._closeExpandNode = SVG(close || btnsSvg.close).size( this.expandBtnSize, @@ -22,6 +36,7 @@ function createExpandNodeContent() { // 填充节点 this._fillExpandNode = new Circle().size(this.expandBtnSize) this._fillExpandNode.x(0).y(-this.expandBtnSize / 2) + // 设置样式 this.style.iconBtn( this._openExpandNode, @@ -29,7 +44,12 @@ function createExpandNodeContent() { this._fillExpandNode ) } - +function sumNode(data = []) { + return data.reduce( + (total, cur) => total + this.sumNode(cur.children || []), + data.length + ) +} // 创建或更新展开收缩按钮内容 function updateExpandBtnNode() { let { expand } = this.nodeData.data @@ -47,7 +67,26 @@ function updateExpandBtnNode() { node = this._closeExpandNode this._lastExpandBtnType = true } - if (this._expandBtn) this._expandBtn.add(this._fillExpandNode).add(node) + + if (this._expandBtn) { + // 如果是收起按钮加上边框 + let { isShowExpandNum, expandBtnStyle, expandBtnNumHandler } = this.mindMap.opt + if (isShowExpandNum) { + if (!expand) { + // 数字按钮添加边框 + this._fillExpandNode.stroke({ + color: expandBtnStyle.strokeColor + }) + // 计算子节点数量 + let count = this.sumNode(this.nodeData.children) + count = expandBtnNumHandler(count) + node.text(count) + } else { + this._fillExpandNode.stroke('none') + } + } + this._expandBtn.add(this._fillExpandNode).add(node) + } } // 更新展开收缩按钮位置 @@ -138,5 +177,6 @@ export default { renderExpandBtn, removeExpandBtn, showExpandBtn, - hideExpandBtn + hideExpandBtn, + sumNode } diff --git a/simple-mind-map/src/core/render/node/nodeExpandBtnPlaceholderRect.js b/simple-mind-map/src/core/render/node/nodeExpandBtnPlaceholderRect.js new file mode 100644 index 00000000..23d51ff4 --- /dev/null +++ b/simple-mind-map/src/core/render/node/nodeExpandBtnPlaceholderRect.js @@ -0,0 +1,66 @@ +import { Rect } from '@svgdotjs/svg.js' + +// 渲染展开收起按钮的隐藏占位元素 +function renderExpandBtnPlaceholderRect() { + // 根节点或没有子节点不需要渲染 + if ( + !this.nodeData.children || + this.nodeData.children.length <= 0 || + this.isRoot + ) { + return + } + // 默认显示展开按钮的情况下也不需要渲染 + if (!this.mindMap.opt.alwaysShowExpandBtn) { + let { width, height } = this + if (!this._unVisibleRectRegionNode) { + this._unVisibleRectRegionNode = new Rect() + this._unVisibleRectRegionNode.fill({ + color: 'transparent' + }) + } + this.group.add(this._unVisibleRectRegionNode) + this.renderer.layout.renderExpandBtnRect( + this._unVisibleRectRegionNode, + this.expandBtnSize, + width, + height, + this + ) + } +} + +// 删除展开收起按钮的隐藏占位元素 +function clearExpandBtnPlaceholderRect() { + if (!this._unVisibleRectRegionNode) { + return + } + this._unVisibleRectRegionNode.remove() + this._unVisibleRectRegionNode = null +} + +// 更新展开收起按钮的隐藏占位元素 +function updateExpandBtnPlaceholderRect() { + // 布局改变需要重新渲染 + if (this.needRerenderExpandBtnPlaceholderRect) { + this.needRerenderExpandBtnPlaceholderRect = false + this.renderExpandBtnPlaceholderRect() + } + // 没有子节点到有子节点需要渲染 + if (this.nodeData.children && this.nodeData.children.length > 0) { + if (!this._unVisibleRectRegionNode) { + this.renderExpandBtnPlaceholderRect() + } + } else { + // 有子节点到没子节点，需要删除 + if (this._unVisibleRectRegionNode) { + this.clearExpandBtnPlaceholderRect() + } + } +} + +export default { + renderExpandBtnPlaceholderRect, + clearExpandBtnPlaceholderRect, + updateExpandBtnPlaceholderRect +} diff --git a/simple-mind-map/src/core/view/View.js b/simple-mind-map/src/core/view/View.js index 0f16e52c..78e8a549 100644 --- a/simple-mind-map/src/core/view/View.js +++ b/simple-mind-map/src/core/view/View.js @@ -32,6 +32,7 @@ class View { this.fit() }) this.mindMap.svg.on('dblclick', () => { + if (!this.mindMap.opt.enableDblclickReset) return this.reset() }) // 拖动视图 @@ -65,7 +66,8 @@ class View { mousewheelAction, mouseScaleCenterUseMousePosition, mousewheelMoveStep, - mousewheelZoomActionReverse + mousewheelZoomActionReverse, + disableMouseWheelZoom } = this.mindMap.opt // 是否自定义鼠标滚轮事件 if ( @@ -76,8 +78,10 @@ class View { } // 鼠标滚轮事件控制缩放 if (mousewheelAction === CONSTANTS.MOUSE_WHEEL_ACTION.ZOOM) { - let cx = mouseScaleCenterUseMousePosition ? e.clientX : undefined - let cy = mouseScaleCenterUseMousePosition ? e.clientY : undefined + if (disableMouseWheelZoom) return + const { x: clientX, y: clientY } = this.mindMap.toPos(e.clientX, e.clientY) + let cx = mouseScaleCenterUseMousePosition ? clientX : undefined + let cy = mouseScaleCenterUseMousePosition ? clientY : undefined switch (dir) { // 鼠标滚轮，向上和向左，都是缩小 case CONSTANTS.DIR.UP: diff --git a/simple-mind-map/src/layouts/Base.js b/simple-mind-map/src/layouts/Base.js index f3876262..92c4e0e4 100644 --- a/simple-mind-map/src/layouts/Base.js +++ b/simple-mind-map/src/layouts/Base.js @@ -46,7 +46,10 @@ class Base { // 检查当前来源是否需要重新计算节点大小 checkIsNeedResizeSources() { - return [CONSTANTS.CHANGE_THEME, CONSTANTS.TRANSFORM_TO_NORMAL_NODE].includes(this.renderer.renderSource) + return [ + CONSTANTS.CHANGE_THEME, + CONSTANTS.TRANSFORM_TO_NORMAL_NODE + ].includes(this.renderer.renderSource) } // 层级类型改变 @@ -70,7 +73,10 @@ class Base { // 数据上保存了节点引用，那么直接复用节点 if (data && data._node && !this.renderer.reRender) { newNode = data._node - let isLayerTypeChange = this.checkIsLayerTypeChange(newNode.layerIndex, layerIndex) + let isLayerTypeChange = this.checkIsLayerTypeChange( + newNode.layerIndex, + layerIndex + ) newNode.reset() newNode.layerIndex = layerIndex this.cacheNode(data._node.uid, newNode) @@ -85,7 +91,10 @@ class Base { newNode = this.lru.get(data.data.uid) // 保存该节点上一次的数据 let lastData = JSON.stringify(newNode.nodeData.data) - let isLayerTypeChange = this.checkIsLayerTypeChange(newNode.layerIndex, layerIndex) + let isLayerTypeChange = this.checkIsLayerTypeChange( + newNode.layerIndex, + layerIndex + ) newNode.reset() newNode.nodeData = newNode.handleData(data || {}) newNode.layerIndex = layerIndex @@ -139,7 +148,7 @@ class Base { } else if (initRootNodePositionMap[value] !== undefined) { return size * initRootNodePositionMap[value] } else if (/^\d\d*%$/.test(value)) { - return Number.parseFloat(value) / 100 * size + return (Number.parseFloat(value) / 100) * size } else { return (size - nodeSize) / 2 } @@ -148,12 +157,24 @@ class Base { // 定位节点到画布中间 setNodeCenter(node) { let { initRootNodePosition } = this.mindMap.opt - let { CENTER }= CONSTANTS.INIT_ROOT_NODE_POSITION - if (!initRootNodePosition || !Array.isArray(initRootNodePosition) || initRootNodePosition.length < 2) { + let { CENTER } = CONSTANTS.INIT_ROOT_NODE_POSITION + if ( + !initRootNodePosition || + !Array.isArray(initRootNodePosition) || + initRootNodePosition.length < 2 + ) { initRootNodePosition = [CENTER, CENTER] } - node.left = this.formatPosition(initRootNodePosition[0], this.mindMap.width, node.width) - node.top = this.formatPosition(initRootNodePosition[1], this.mindMap.height, node.height) + node.left = this.formatPosition( + initRootNodePosition[0], + this.mindMap.width, + node.width + ) + node.top = this.formatPosition( + initRootNodePosition[1], + this.mindMap.height, + node.height + ) } // 更新子节点属性 @@ -170,7 +191,7 @@ class Base { // 更新子节点多个属性 updateChildrenPro(children, props) { children.forEach(item => { - Object.keys(props).forEach((prop) => { + Object.keys(props).forEach(prop => { item[prop] += props[prop] }) if (item.children && item.children.length && !item.hasCustomPosition()) { @@ -216,16 +237,22 @@ class Base { // 获取节点的marginX getMarginX(layerIndex) { + const { themeConfig, opt } = this.mindMap + const { second, node } = themeConfig + const hoverRectPadding = opt.hoverRectPadding * 2 return layerIndex === 1 - ? this.mindMap.themeConfig.second.marginX - : this.mindMap.themeConfig.node.marginX + ? second.marginX + hoverRectPadding + : node.marginX + hoverRectPadding } // 获取节点的marginY getMarginY(layerIndex) { + const { themeConfig, opt } = this.mindMap + const { second, node } = themeConfig + const hoverRectPadding = opt.hoverRectPadding * 2 return layerIndex === 1 - ? this.mindMap.themeConfig.second.marginY - : this.mindMap.themeConfig.node.marginY + ? second.marginY + hoverRectPadding + : node.marginY + hoverRectPadding } // 获取节点包括概要在内的宽度 diff --git a/simple-mind-map/src/layouts/Fishbone.js b/simple-mind-map/src/layouts/Fishbone.js index b11c2634..0706caba 100644 --- a/simple-mind-map/src/layouts/Fishbone.js +++ b/simple-mind-map/src/layouts/Fishbone.js @@ -56,10 +56,11 @@ class Fishbone extends Base { } // 计算二级节点的top值 if (parent._node.isRoot) { + let marginY = this.getMarginY(layerIndex) if (this.checkIsTop(newNode)) { - newNode.top = parent._node.top - newNode.height + newNode.top = parent._node.top - newNode.height - marginY } else { - newNode.top = parent._node.top + parent._node.height + newNode.top = parent._node.top + parent._node.height + marginY } } } @@ -80,15 +81,16 @@ class Fishbone extends Base { null, (node, parent, isRoot, layerIndex) => { if (node.isRoot) { - let topTotalLeft = node.left + node.width + node.height - let bottomTotalLeft = node.left + node.width + node.height + let marginX = this.getMarginX(layerIndex + 1) + let topTotalLeft = node.left + node.width + node.height + marginX + let bottomTotalLeft = node.left + node.width + node.height + marginX node.children.forEach(item => { if (this.checkIsTop(item)) { item.left = topTotalLeft - topTotalLeft += item.width + topTotalLeft += item.width + marginX } else { item.left = bottomTotalLeft + 20 - bottomTotalLeft += item.width + bottomTotalLeft += item.width + marginX } }) } @@ -154,9 +156,10 @@ class Fishbone extends Base { getNodeAreaHeight(node) { let totalHeight = 0 let loop = node => { + let marginY = this.getMarginY(node.layerIndex) totalHeight += node.height + - (this.getNodeActChildrenLength(node) > 0 ? node.expandBtnSize : 0) + (this.getNodeActChildrenLength(node) > 0 ? node.expandBtnSize : 0) + marginY if (node.children.length) { node.children.forEach(item => { loop(item) @@ -244,8 +247,9 @@ class Fishbone extends Base { maxx = item.left } // 水平线段到二级节点的连线 + let marginY = this.getMarginY(item.layerIndex) let nodeLineX = item.left - let offset = node.height / 2 + let offset = node.height / 2 + marginY let offsetX = offset / Math.tan(degToRad(this.mindMap.opt.fishboneDeg)) let line = this.draw.path() if (this.checkIsTop(item)) { @@ -267,7 +271,7 @@ class Fishbone extends Base { }) // 从根节点出发的水平线 let nodeHalfTop = node.top + node.height / 2 - let offset = node.height / 2 + let offset = node.height / 2 + this.getMarginY(node.layerIndex + 1) let line = this.draw.path() line.plot( `M ${node.left + node.width},${nodeHalfTop} L ${ diff --git a/simple-mind-map/src/layouts/fishboneUtils.js b/simple-mind-map/src/layouts/fishboneUtils.js index ec47f1e5..e95e2ec2 100644 --- a/simple-mind-map/src/layouts/fishboneUtils.js +++ b/simple-mind-map/src/layouts/fishboneUtils.js @@ -47,30 +47,32 @@ export default { computedLeftTopValue({ layerIndex, node, ctx }) { if (layerIndex >= 1 && node.children) { // 遍历三级及以下节点的子节点 + let marginY = ctx.getMarginY(layerIndex + 1) let startLeft = node.left + node.width * ctx.childIndent let totalTop = node.top + node.height + - (ctx.getNodeActChildrenLength(node) > 0 ? node.expandBtnSize : 0) + (ctx.getNodeActChildrenLength(node) > 0 ? node.expandBtnSize : 0) + marginY node.children.forEach(item => { item.left = startLeft item.top += totalTop totalTop += item.height + - (ctx.getNodeActChildrenLength(item) > 0 ? item.expandBtnSize : 0) + (ctx.getNodeActChildrenLength(item) > 0 ? item.expandBtnSize : 0) + marginY }) } }, - adjustLeftTopValueBefore({ node, parent, ctx }) { + adjustLeftTopValueBefore({ node, parent, ctx, layerIndex }) { // 调整top let len = node.children.length + let marginY = ctx.getMarginY(layerIndex + 1) // 调整三级及以下节点的top if (parent && !parent.isRoot && len > 0) { let totalHeight = node.children.reduce((h, item) => { return ( h + item.height + - (ctx.getNodeActChildrenLength(item) > 0 ? item.expandBtnSize : 0) + (ctx.getNodeActChildrenLength(item) > 0 ? item.expandBtnSize : 0) + marginY ) }, 0) ctx.updateBrothersTop(node, totalHeight) @@ -80,7 +82,8 @@ export default { // 将二级节点的子节点移到上方 if (parent && parent.isRoot) { // 遍历二级节点的子节点 - let totalHeight = node.expandBtnSize + let marginY = ctx.getMarginY(node.layerIndex + 1) + let totalHeight = node.expandBtnSize + marginY node.children.forEach(item => { // 调整top let nodeTotalHeight = ctx.getNodeAreaHeight(item) @@ -134,13 +137,14 @@ export default { } }, computedLeftTopValue({ layerIndex, node, ctx }) { + let marginY = ctx.getMarginY(layerIndex + 1) if (layerIndex === 1 && node.children) { // 遍历二级节点的子节点 let startLeft = node.left + node.width * ctx.childIndent let totalTop = node.top + node.height + - (ctx.getNodeActChildrenLength(node) > 0 ? node.expandBtnSize : 0) + (ctx.getNodeActChildrenLength(node) > 0 ? node.expandBtnSize : 0) + marginY node.children.forEach(item => { item.left = startLeft @@ -149,7 +153,7 @@ export default { (ctx.getNodeActChildrenLength(item) > 0 ? item.expandBtnSize : 0) totalTop += item.height + - (ctx.getNodeActChildrenLength(item) > 0 ? item.expandBtnSize : 0) + (ctx.getNodeActChildrenLength(item) > 0 ? item.expandBtnSize : 0) + marginY }) } if (layerIndex > 1 && node.children) { @@ -157,25 +161,26 @@ export default { let startLeft = node.left + node.width * ctx.childIndent let totalTop = node.top - - (ctx.getNodeActChildrenLength(node) > 0 ? node.expandBtnSize : 0) + (ctx.getNodeActChildrenLength(node) > 0 ? node.expandBtnSize : 0) - marginY node.children.forEach(item => { item.left = startLeft item.top = totalTop - item.height totalTop -= item.height + - (ctx.getNodeActChildrenLength(item) > 0 ? item.expandBtnSize : 0) + (ctx.getNodeActChildrenLength(item) > 0 ? item.expandBtnSize : 0) + marginY }) } }, adjustLeftTopValueBefore({ node, ctx, layerIndex }) { // 调整top + let marginY = ctx.getMarginY(layerIndex + 1) let len = node.children.length if (layerIndex > 2 && len > 0) { let totalHeight = node.children.reduce((h, item) => { return ( h + item.height + - (ctx.getNodeActChildrenLength(item) > 0 ? item.expandBtnSize : 0) + (ctx.getNodeActChildrenLength(item) > 0 ? item.expandBtnSize : 0) + marginY ) }, 0) ctx.updateBrothersTop(node, -totalHeight) @@ -185,6 +190,7 @@ export default { // 将二级节点的子节点移到上方 if (parent && parent.isRoot) { // 遍历二级节点的子节点 + let marginY = ctx.getMarginY(node.layerIndex + 1) let totalHeight = 0 let totalHeight2 = node.expandBtnSize node.children.forEach(item => { @@ -192,11 +198,12 @@ export default { let hasChildren = ctx.getNodeActChildrenLength(item) > 0 let nodeTotalHeight = ctx.getNodeAreaHeight(item) let offset = - hasChildren > 0 + hasChildren ? nodeTotalHeight - item.height - (hasChildren ? item.expandBtnSize : 0) : 0 + offset -= (hasChildren ? marginY : 0) let _top = totalHeight + offset let _left = item.left item.top += _top diff --git a/simple-mind-map/src/parse/markdownTo.js b/simple-mind-map/src/parse/markdownTo.js index 38ab7f0f..e399bf22 100644 --- a/simple-mind-map/src/parse/markdownTo.js +++ b/simple-mind-map/src/parse/markdownTo.js @@ -28,7 +28,7 @@ const handleList = node => { } // 将markdown转换成节点树 -export const transformMarkdownTo = async md => { +export const transformMarkdownTo = md => { const tree = fromMarkdown(md) let root = { children: [] diff --git a/simple-mind-map/src/parse/xmind.js b/simple-mind-map/src/parse/xmind.js index b852067d..cb8b72df 100644 --- a/simple-mind-map/src/parse/xmind.js +++ b/simple-mind-map/src/parse/xmind.js @@ -14,11 +14,13 @@ const parseXmindFile = file => { async zip => { try { let content = '' - if (zip.files['content.json']) { - let json = await zip.files['content.json'].async('string') + let jsonFile = zip.files['content.json'] + let xmlFile = zip.files['content.xml'] || zip.files['/content.xml'] + if (jsonFile) { + let json = await jsonFile.async('string') content = await transformXmind(json, zip.files) - } else if (zip.files['content.xml']) { - let xml = await zip.files['content.xml'].async('string') + } else if (xmlFile) { + let xml = await xmlFile.async('string') let json = xmlConvert.xml2json(xml) content = transformOldXmind(json) } @@ -187,7 +189,7 @@ const transformOldXmind = content => { if (_children && _children.elements && _children.elements.length > 0) { _children.elements.forEach(item => { if (item.name === 'topics') { - item.elements.forEach(item2 => { + (item.elements || []).forEach(item2 => { let newChild = {} newNode.children.push(newChild) walk(item2, newChild) diff --git a/simple-mind-map/src/plugins/AssociativeLine.js b/simple-mind-map/src/plugins/AssociativeLine.js index 2a7ebba1..dbca5808 100644 --- a/simple-mind-map/src/plugins/AssociativeLine.js +++ b/simple-mind-map/src/plugins/AssociativeLine.js @@ -99,12 +99,33 @@ class AssociativeLine { // 创建箭头 createMarker() { return this.draw.marker(20, 20, add => { - add.ref(2, 5) + add.ref(12, 5) add.size(10, 10) add.attr('orient', 'auto-start-reverse') this.markerPath = add.path('M0,0 L2,5 L0,10 L10,5 Z') }) } + + // 判断关联线坐标是否变更，有变更则使用变化后的坐标，无则默认坐标 + updateAllLinesPos(node, toNode, associativeLinePoint) { + associativeLinePoint = associativeLinePoint || {} + let [startPoint, endPoint] = computeNodePoints(node, toNode) + let nodeRange = 0 + let nodeDir = '' + let toNodeRange = 0 + let toNodeDir = '' + if (associativeLinePoint.startPoint) { + nodeRange = associativeLinePoint.startPoint.range || 0 + nodeDir = associativeLinePoint.startPoint.dir || 'right' + startPoint = getNodePoint(node, nodeDir, nodeRange) + } + if (associativeLinePoint.endPoint) { + toNodeRange = associativeLinePoint.endPoint.range || 0 + toNodeDir = associativeLinePoint.endPoint.dir || 'right' + endPoint = getNodePoint(toNode, toNodeDir, toNodeRange) + } + return [startPoint, endPoint] + } // 渲染所有连线 renderAllLines() { @@ -137,10 +158,17 @@ class AssociativeLine { 0 ) nodeToIds.forEach((ids, node) => { - ids.forEach(id => { + ids.forEach((id, index) => { let toNode = idToNode.get(id) if (!node || !toNode) return - let [startPoint, endPoint] = computeNodePoints(node, toNode) + const associativeLinePoint = (node.nodeData.data.associativeLinePoint || + [])[index] + // 切换结构和布局，都会更新坐标 + const [startPoint, endPoint] = this.updateAllLinesPos( + node, + toNode, + associativeLinePoint + ) this.drawLine(startPoint, endPoint, node, toNode) }) }) @@ -183,11 +211,28 @@ class AssociativeLine { .fill({ color: 'none' }) clickPath.plot(pathStr) // 文字 - let text = this.createText({ path, clickPath, node, toNode, startPoint, endPoint, controlPoints }) + let text = this.createText({ + path, + clickPath, + node, + toNode, + startPoint, + endPoint, + controlPoints + }) // 点击事件 clickPath.click(e => { e.stopPropagation() - this.setActiveLine({ path, clickPath, text, node, toNode, startPoint, endPoint, controlPoints }) + this.setActiveLine({ + path, + clickPath, + text, + node, + toNode, + startPoint, + endPoint, + controlPoints + }) }) // 渲染关联线文字 this.renderText(this.getText(node, toNode), path, text) @@ -195,10 +240,17 @@ class AssociativeLine { } // 激活某根关联线 - setActiveLine({ path, clickPath, text, node, toNode, startPoint, endPoint, controlPoints }) { - let { - associativeLineActiveColor - } = this.mindMap.themeConfig + setActiveLine({ + path, + clickPath, + text, + node, + toNode, + startPoint, + endPoint, + controlPoints + }) { + let { associativeLineActiveColor } = this.mindMap.themeConfig // 如果当前存在激活节点，那么取消激活节点 if (this.mindMap.renderer.activeNodeList.length > 0) { this.clearActiveNodes() @@ -287,6 +339,22 @@ class AssociativeLine { } } + // 计算节点偏移位置 + getNodePos(node) { + const { scaleX, scaleY, translateX, translateY } = + this.mindMap.draw.transform() + const { left, top, width, height } = node + let translateLeft = left * scaleX + translateX + let translateTop = top * scaleY + translateY + return { + left, + top, + translateLeft, + translateTop, + width, + height + } + } // 检测当前移动到的目标节点 checkOverlapNode(x, y) { this.overlapNode = null @@ -336,6 +404,11 @@ class AssociativeLine { } // 将目标节点id保存起来 let list = fromNode.nodeData.data.associativeLineTargets || [] + // 连线节点是否存在相同的id,存在则阻止添加关联线 + const sameLine = list.some(item => item === id) + if (sameLine) { + return + } list.push(id) // 保存控制点 let [startPoint, endPoint] = computeNodePoints(fromNode, toNode) @@ -358,9 +431,13 @@ class AssociativeLine { y: controlPoints[1].y - endPoint.y } ] + let associativeLinePoint = fromNode.nodeData.data.associativeLinePoint || [] + // 记录关联的起始|结束坐标 + associativeLinePoint[list.length - 1] = [{ startPoint, endPoint }] this.mindMap.execCommand('SET_NODE_DATA', fromNode, { associativeLineTargets: list, - associativeLineTargetControlOffsets: offsetList + associativeLineTargetControlOffsets: offsetList, + associativeLinePoint }) } @@ -369,13 +446,18 @@ class AssociativeLine { if (!this.activeLine) return let [, , , node, toNode] = this.activeLine this.removeControls() - let { associativeLineTargets, associativeLineTargetControlOffsets, associativeLineText } = - node.nodeData.data + let { + associativeLineTargets, + associativeLinePoint, + associativeLineTargetControlOffsets, + associativeLineText + } = node.nodeData.data + associativeLinePoint = associativeLinePoint || [] let targetIndex = getAssociativeLineTargetIndex(node, toNode) // 更新关联线文本数据 let newAssociativeLineText = {} if (associativeLineText) { - Object.keys(associativeLineText).forEach((item) => { + Object.keys(associativeLineText).forEach(item => { if (item !== toNode.nodeData.data.id) { newAssociativeLineText[item] = associativeLineText[item] } @@ -386,6 +468,10 @@ class AssociativeLine { associativeLineTargets: associativeLineTargets.filter((_, index) => { return index !== targetIndex }), + // 连接线坐标 + associativeLinePoint: associativeLinePoint.filter((_, index) => { + return index !== targetIndex + }), // 偏移量 associativeLineTargetControlOffsets: associativeLineTargetControlOffsets ? associativeLineTargetControlOffsets.filter((_, index) => { diff --git a/simple-mind-map/src/plugins/Export.js b/simple-mind-map/src/plugins/Export.js index a5747595..aa447540 100644 --- a/simple-mind-map/src/plugins/Export.js +++ b/simple-mind-map/src/plugins/Export.js @@ -1,14 +1,19 @@ -import { imgToDataUrl, downloadFile, readBlob, removeHTMLEntities } from '../utils' +import { + imgToDataUrl, + downloadFile, + readBlob, + removeHTMLEntities +} from '../utils' import { SVG } from '@svgdotjs/svg.js' import drawBackgroundImageToCanvas from '../utils/simulateCSSBackgroundInCanvas' import { transformToMarkdown } from '../parse/toMarkdown' +import { a4Size } from '../constants/constant' // 导出插件 class Export { // 构造函数 constructor(opt) { this.mindMap = opt.mindMap - this.exportPadding = this.mindMap.opt.exportPadding } // 导出 @@ -35,6 +40,10 @@ class Export { let imageList = svg.find('image') let task = imageList.map(async item => { let imgUlr = item.attr('href') || item.attr('xlink:href') + // 已经是data:URL形式不用转换 + if (/^data:/.test(imgUlr)) { + return + } let imgData = await imgToDataUrl(imgUlr) item.attr('href', imgData) }) @@ -49,33 +58,42 @@ class Export { } // svg转png - svgToPng(svgSrc, transparent) { + svgToPng(svgSrc, transparent, checkRotate = () => { return false }) { return new Promise((resolve, reject) => { const img = new Image() // 跨域图片需要添加这个属性，否则画布被污染了无法导出图片 img.setAttribute('crossOrigin', 'anonymous') img.onload = async () => { try { - let canvas = document.createElement('canvas') - canvas.width = img.width + this.exportPadding * 2 - canvas.height = img.height + this.exportPadding * 2 - let ctx = canvas.getContext('2d') + const canvas = document.createElement('canvas') + const dpr = Math.max(window.devicePixelRatio, this.mindMap.opt.minExportImgCanvasScale) + const imgWidth = img.width + const imgHeight = img.height + // 如果宽比高长，那么旋转90度 + const needRotate = checkRotate(imgWidth, imgHeight) + if (needRotate) { + canvas.width = imgHeight * dpr + canvas.height = imgWidth * dpr + canvas.style.width = imgHeight + 'px' + canvas.style.height = imgWidth + 'px' + } else { + canvas.width = imgWidth * dpr + canvas.height = imgHeight * dpr + canvas.style.width = imgWidth + 'px' + canvas.style.height = imgHeight + 'px' + } + const ctx = canvas.getContext('2d') + ctx.scale(dpr, dpr) + if (needRotate) { + ctx.rotate(0.5 * Math.PI) + ctx.translate(0, -imgHeight) + } // 绘制背景 if (!transparent) { - await this.drawBackgroundToCanvas(ctx, canvas.width, canvas.height) + await this.drawBackgroundToCanvas(ctx, imgWidth, imgHeight) } // 图片绘制到canvas里 - ctx.drawImage( - img, - 0, - 0, - img.width, - img.height, - this.exportPadding, - this.exportPadding, - img.width, - img.height - ) + ctx.drawImage(img, 0, 0, imgWidth, imgHeight) resolve(canvas.toDataURL()) } catch (error) { reject(error) @@ -96,7 +114,7 @@ class Export { backgroundImage, backgroundRepeat = 'no-repeat', backgroundPosition = 'center center', - backgroundSize = 'cover', + backgroundSize = 'cover' } = this.mindMap.themeConfig // 背景颜色 ctx.save() @@ -107,18 +125,25 @@ class Export { // 背景图片 if (backgroundImage && backgroundImage !== 'none') { ctx.save() - drawBackgroundImageToCanvas(ctx, width, height, backgroundImage, { - backgroundRepeat, - backgroundPosition, - backgroundSize - }, (err) => { - if (err) { - reject(err) - } else { - resolve() + drawBackgroundImageToCanvas( + ctx, + width, + height, + backgroundImage, + { + backgroundRepeat, + backgroundPosition, + backgroundSize + }, + err => { + if (err) { + reject(err) + } else { + resolve() + } + ctx.restore() } - ctx.restore() - }) + ) } else { resolve() } @@ -152,14 +177,25 @@ class Export { * 方法1.把svg的图片都转化成data:url格式，再转换 * 方法2.把svg的图片提取出来再挨个绘制到canvas里，最后一起转换 */ - async png(name, transparent = false) { + async png(name, transparent = false, checkRotate) { let { node, str } = await this.getSvgData() str = removeHTMLEntities(str) // 如果开启了富文本，则使用htmltocanvas转换为图片 if (this.mindMap.richText) { - let res = await this.mindMap.richText.handleExportPng(node.node) - let imgDataUrl = await this.svgToPng(res, transparent) - return imgDataUrl + // 覆盖html默认的样式 + let foreignObjectList = node.find('foreignObject') + if (foreignObjectList.length > 0) { + foreignObjectList[0].add(SVG(``)) + } + str = node.svg() + // 使用其他库（html2canvas、dom-to-image-more等）来完成导出 + // let res = await this.mindMap.richText.handleExportPng(node.node) + // let imgDataUrl = await this.svgToPng( + // res, + // transparent, + // checkRotate + // ) + // return imgDataUrl } // 转换成blob数据 let blob = new Blob([str], { @@ -168,17 +204,24 @@ class Export { // 转换成data:url数据 let svgUrl = await readBlob(blob) // 绘制到canvas上 - let res = await this.svgToPng(svgUrl, transparent) + let res = await this.svgToPng( + svgUrl, + transparent, + checkRotate + ) return res } // 导出为pdf - async pdf(name) { + async pdf(name, useMultiPageExport) { if (!this.mindMap.doExportPDF) { throw new Error('请注册ExportPDF插件') } - let img = await this.png() - this.mindMap.doExportPDF.pdf(name, img) + let img = await this.png('', false, (width, height) => { + if (width <= a4Size.width && height && a4Size.height) return false + return (width / height) > 1 + }) + this.mindMap.doExportPDF.pdf(name, img, useMultiPageExport) } // 导出为xmind @@ -194,15 +237,13 @@ class Export { // 导出为svg // plusCssText：附加的css样式，如果svg中存在dom节点，想要设置一些针对节点的样式可以通过这个参数传入 - async svg(name, plusCssText) { + async svg(name) { let { node } = await this.getSvgData() // 开启了节点富文本编辑 if (this.mindMap.richText) { - if (plusCssText) { - let foreignObjectList = node.find('foreignObject') - if (foreignObjectList.length > 0) { - foreignObjectList[0].add(SVG(``)) - } + let foreignObjectList = node.find('foreignObject') + if (foreignObjectList.length > 0) { + foreignObjectList[0].add(SVG(``)) } } node.first().before(SVG(`${name}`)) diff --git a/simple-mind-map/src/plugins/ExportPDF.js b/simple-mind-map/src/plugins/ExportPDF.js index e46b3a3c..83f7ee88 100644 --- a/simple-mind-map/src/plugins/ExportPDF.js +++ b/simple-mind-map/src/plugins/ExportPDF.js @@ -1,4 +1,5 @@ import JsPDF from 'jspdf' +import { a4Size } from '../constants/constant' // 导出PDF插件，需要通过Export插件使用 class ExportPDF { @@ -8,31 +9,82 @@ class ExportPDF { } // 导出为pdf - pdf(name, img) { + pdf(name, img, useMultiPageExport = false) { + if (useMultiPageExport) { + this.multiPageExport(name, img) + } else { + this.onePageExport(name, img) + } + } + + // 单页导出 + onePageExport(name, img) { let pdf = new JsPDF('', 'pt', 'a4') - let a4Width = 595 - let a4Height = 841 - let a4Ratio = a4Width / a4Height + let a4Ratio = a4Size.width / a4Size.height let image = new Image() image.onload = () => { let imageWidth = image.width let imageHeight = image.height let imageRatio = imageWidth / imageHeight let w, h - if (imageWidth <= a4Width && imageHeight <= a4Height) { + if (imageWidth <= a4Size.width && imageHeight <= a4Size.height) { // 使用图片原始宽高 w = imageWidth h = imageHeight } else if (a4Ratio > imageRatio) { // 以a4Height为高度，缩放图片宽度 - w = imageRatio * a4Height - h = a4Height + w = imageRatio * a4Size.height + h = a4Size.height } else { // 以a4Width为宽度，缩放图片高度 - w = a4Width - h = a4Width / imageRatio + w = a4Size.width + h = a4Size.width / imageRatio + } + pdf.addImage(img, 'PNG', (a4Size.width - w) / 2, (a4Size.height - h) / 2, w, h) + pdf.save(name) + } + image.src = img + } + + // 多页导出 + multiPageExport(name, img) { + let image = new Image() + image.onload = () => { + let imageWidth = image.width + let imageHeight = image.height + // 一页pdf显示高度 + let pageHeight = (imageWidth / a4Size.width) * a4Size.height + // 未生成pdf的高度 + let leftHeight = imageHeight + // 偏移 + let position = 0 + // a4纸的尺寸[595.28,841.89]，图片在pdf中图片的宽高 + let imgWidth = a4Size.width + let imgHeight = (a4Size.width / imageWidth) * imageHeight + let pdf = new JsPDF('', 'pt', 'a4') + // 有两个高度需要区分，一个是图片的实际高度，和生成pdf的页面高度(841.89) + // 当内容未超过pdf一页显示的范围，无需分页 + if (leftHeight < pageHeight) { + pdf.addImage( + img, + 'PNG', + (a4Size.width - imgWidth) / 2, + (a4Size.height - imgHeight) / 2, + imgWidth, + imgHeight + ) + } else { + // 分页 + while (leftHeight > 0) { + pdf.addImage(img, 'PNG', 0, position, imgWidth, imgHeight) + leftHeight -= pageHeight + position -= a4Size.height + // 避免添加空白页 + if (leftHeight > 0) { + pdf.addPage() + } + } } - pdf.addImage(img, 'PNG', (a4Width - w) / 2, (a4Height - h) / 2, w, h) pdf.save(name) } image.src = img diff --git a/simple-mind-map/src/plugins/NodeImgAdjust.js b/simple-mind-map/src/plugins/NodeImgAdjust.js index 4999f4bc..cdde7045 100644 --- a/simple-mind-map/src/plugins/NodeImgAdjust.js +++ b/simple-mind-map/src/plugins/NodeImgAdjust.js @@ -263,6 +263,11 @@ class NodeImgAdjust { beforePluginRemove() { this.unBindEvent() } + + // 插件被卸载前做的事情 + beforePluginDestroy() { + this.unBindEvent() + } } NodeImgAdjust.instanceName = 'nodeImgAdjust' diff --git a/simple-mind-map/src/plugins/Painter.js b/simple-mind-map/src/plugins/Painter.js index 50ee08e5..b9ef5cd3 100644 --- a/simple-mind-map/src/plugins/Painter.js +++ b/simple-mind-map/src/plugins/Painter.js @@ -69,6 +69,11 @@ class Painter { beforePluginRemove() { this.unBindEvent() } + + // 插件被卸载前做的事情 + beforePluginDestroy() { + this.unBindEvent() + } } Painter.instanceName = 'painter' diff --git a/simple-mind-map/src/plugins/RichText.js b/simple-mind-map/src/plugins/RichText.js index c5830b44..8c158fba 100644 --- a/simple-mind-map/src/plugins/RichText.js +++ b/simple-mind-map/src/plugins/RichText.js @@ -1,6 +1,6 @@ import Quill from 'quill' +import Delta from 'quill-delta' import 'quill/dist/quill.snow.css' -import domtoimage from 'dom-to-image-more' import { walk, getTextFromHtml, @@ -43,6 +43,7 @@ class RichText { this.quill = null this.range = null this.lastRange = null + this.pasteUseRange = null this.node = null this.isInserting = false this.styleEl = null @@ -151,7 +152,7 @@ class RichText { } // 显示文本编辑控件 - showEditText(node, rect, isInserting) { + showEditText(node, rect, isInserting, isFromKeyDown) { if (this.showTextEdit) { return } @@ -159,7 +160,8 @@ class RichText { richTextEditFakeInPlace, customInnerElsAppendTo, nodeTextEditZIndex, - textAutoWrapWidth + textAutoWrapWidth, + selectTextOnEnterEditText } = this.mindMap.opt this.node = node this.isInserting = isInserting @@ -245,8 +247,9 @@ class RichText { this.initQuillEditor() document.querySelector('.ql-editor').style.minHeight = originHeight + 'px' this.showTextEdit = true - // 如果是刚创建的节点，那么默认全选，否则普通激活不全选 - this.focus(isInserting ? 0 : null) + // 如果是刚创建的节点，那么默认全选，否则普通激活不全选，除非selectTextOnEnterEditText配置为true + // 在selectTextOnEnterEditText时，如果是在keydown事件进入的节点编辑，也不需要全选 + this.focus(isInserting || (selectTextOnEnterEditText && !isFromKeyDown) ? 0 : null) if (!node.nodeData.data.richText) { // 如果是非富文本的情况，需要手动应用文本样式 this.setTextStyleIfNotRichText(node) @@ -329,6 +332,7 @@ class RichText { this.lastRange = this.range this.range = null if (range) { + this.pasteUseRange = range let bounds = this.quill.getBounds(range.index, range.length) let rect = this.textEditNode.getBoundingClientRect() let rectInfo = { @@ -368,6 +372,38 @@ class RichText { this.lostStyle = false } }) + // 拦截粘贴，只允许粘贴纯文本 + this.quill.clipboard.addMatcher(Node.TEXT_NODE, (node) => { + let style = this.getPasteTextStyle() + return new Delta().insert(node.data, style) + }) + this.quill.clipboard.addMatcher(Node.ELEMENT_NODE, (node, delta) => { + let ops = [] + let style = this.getPasteTextStyle() + delta.ops.forEach(op => { + // 过滤出文本内容，过滤掉换行 + if (op.insert && typeof op.insert === 'string' && op.insert !== '\n') { + ops.push({ + attributes: { ...style }, + insert: op.insert + }) + } + }) + delta.ops = ops + return delta + }) + } + + // 获取粘贴的文本的样式 + getPasteTextStyle() { + // 粘贴的数据使用当前光标位置处的文本样式 + if (this.pasteUseRange) { + return this.quill.getFormat( + this.pasteUseRange.index, + this.pasteUseRange.length + ) + } + return {} } // 正则输入中文 @@ -597,6 +633,11 @@ class RichText { this.transformAllNodesToNormalNode() document.head.removeChild(this.styleEl) } + + // 插件被卸载前做的事情 + beforePluginDestroy() { + document.head.removeChild(this.styleEl) + } } RichText.instanceName = 'richText' diff --git a/simple-mind-map/src/plugins/Scrollbar.js b/simple-mind-map/src/plugins/Scrollbar.js new file mode 100644 index 00000000..c34b9b7a --- /dev/null +++ b/simple-mind-map/src/plugins/Scrollbar.js @@ -0,0 +1,180 @@ +import { throttle } from '../utils/index' + +// 滚动条插件 +class Scrollbar { + // 构造函数 + constructor(opt) { + this.mindMap = opt.mindMap + this.scrollbarWrapSize = { + width: 0, // 水平滚动条的容器宽度 + height: 0 // 垂直滚动条的容器高度 + } + this.reset() + this.bindEvent() + } + + // 绑定事件 + bindEvent() { + this.onMousemove = this.onMousemove.bind(this) + this.onMouseup = this.onMouseup.bind(this) + this.onNodeTreeRenderEnd = this.onNodeTreeRenderEnd.bind(this) + this.onViewDataChange = throttle(this.onViewDataChange, 16, this) // 加个节流 + this.mindMap.on('mousemove', this.onMousemove) + this.mindMap.on('mouseup', this.onMouseup) + this.mindMap.on('node_tree_render_end', this.onNodeTreeRenderEnd) + this.mindMap.on('view_data_change', this.onViewDataChange) + } + + // 解绑事件 + unBindEvent() { + this.mindMap.off('mousemove', this.onMousemove) + this.mindMap.off('mouseup', this.onMouseup) + this.mindMap.off('node_tree_render_end', this.onNodeTreeRenderEnd) + this.mindMap.off('view_data_change', this.onViewDataChange) + } + + // 每次渲染后需要更新滚动条 + onNodeTreeRenderEnd() { + this.emitEvent() + } + + // 思维导图视图数据改变需要更新滚动条 + onViewDataChange() { + this.emitEvent() + } + + // 发送滚动条改变事件 + emitEvent() { + this.mindMap.emit('scrollbar_change') + } + + // 复位数据 + reset() { + // 当前拖拽的滚动条类型 + this.currentScrollType = '' + this.isMousedown = false + this.mousedownPos = { + x: 0, + y: 0 + } + this.startViewPos = { + x: 0, + y: 0 + } + // 思维导图实际高度 + this.chartHeight = 0 + this.chartWidth = 0 + } + + // 设置滚动条容器的大小，指滚动条容器的大小，对于水平滚动条，即宽度，对于垂直滚动条，即高度 + setScrollBarWrapSize(width, height) { + this.scrollbarWrapSize.width = width + this.scrollbarWrapSize.height = height + } + + // 计算滚动条大小和位置 + calculationScrollbar() { + const rect = this.mindMap.draw.rbox() + // 减去画布距离浏览器窗口左上角的距离 + const elRect = this.mindMap.elRect + rect.x -= elRect.left + rect.x2 -= elRect.left + rect.y -= elRect.top + rect.y2 -= elRect.top + + // 垂直滚动条 + const canvasHeight = this.mindMap.height // 画布高度 + const paddingY = canvasHeight / 2 // 首尾允许超出的距离，默认为高度的一半 + const chartHeight = rect.height + paddingY * 2 // 思维导图高度 + this.chartHeight = chartHeight + const chartTop = rect.y - paddingY // 思维导图顶部距画布顶部的距离 + const height = Math.min((canvasHeight / chartHeight) * 100, 100) // 滚动条高度 = 画布高度 / 思维导图高度 + let top = (-chartTop / chartHeight) * 100 // 滚动条距离 = 思维导图顶部距画布顶部的距离 / 思维导图高度 + // 判断是否到达边界 + if (top < 0) { + top = 0 + } + if (top > 100 - height) { + top = 100 - height + } + + // 水平滚动条 + const canvasWidth = this.mindMap.width + const paddingX = canvasWidth / 2 + const chartWidth = rect.width + paddingX * 2 + this.chartWidth = chartWidth + const chartLeft = rect.x - paddingX + const width = Math.min((canvasWidth / chartWidth) * 100, 100) + let left = (-chartLeft / chartWidth) * 100 + if (left < 0) { + left = 0 + } + if (left > 100 - width) { + left = 100 - width + } + + const res = { + // 垂直滚动条 + vertical: { + top, + height + }, + // 水平滚动条 + horizontal: { + left, + width + } + } + + return res + } + + onMousedown(e, type) { + e.preventDefault() + this.currentScrollType = type + this.isMousedown = true + this.mousedownPos = { + x: e.clientX, + y: e.clientY + } + // 保存视图当前的偏移量 + let transformData = this.mindMap.view.getTransformData() + this.startViewPos = { + x: transformData.state.x, + y: transformData.state.y + } + } + + onMousemove(e) { + if (!this.isMousedown) { + return + } + if (this.currentScrollType === 'vertical') { + const oy = e.clientY - this.mousedownPos.y + const oyPercentage = -oy / this.scrollbarWrapSize.height + const oyPx = oyPercentage * this.chartHeight + // 在视图最初偏移量上累加更新量 + this.mindMap.view.translateYTo(oyPx + this.startViewPos.y) + } else { + const ox = e.clientX - this.mousedownPos.x + const oxPercentage = -ox / this.scrollbarWrapSize.width + const oxPx = oxPercentage * this.chartWidth + // 在视图最初偏移量上累加更新量 + this.mindMap.view.translateXTo(oxPx + this.startViewPos.x) + } + } + + onMouseup() { + this.isMousedown = false + this.reset() + } + + // 插件被卸载前做的事情 + beforePluginDestroy() { + this.unBindEvent() + } +} + +Scrollbar.instanceName = 'scrollbar' + +export default Scrollbar diff --git a/simple-mind-map/src/plugins/Select.js b/simple-mind-map/src/plugins/Select.js index bba83b0c..fe6d801d 100644 --- a/simple-mind-map/src/plugins/Select.js +++ b/simple-mind-map/src/plugins/Select.js @@ -11,6 +11,8 @@ class Select { this.mouseDownY = 0 this.mouseMoveX = 0 this.mouseMoveY = 0 + this.isSelecting = false + this.cacheActiveList = [] this.bindEvent() } @@ -30,6 +32,7 @@ class Select { } e.preventDefault() this.isMousedown = true + this.cacheActiveList = [...this.mindMap.renderer.activeNodeList] let { x, y } = this.mindMap.toPos(e.clientX, e.clientY) this.mouseDownX = x this.mouseDownY = y @@ -61,20 +64,45 @@ class Select { if (!this.isMousedown) { return } + this.checkTriggerNodeActiveEvent() + clearTimeout(this.autoMoveTimer) + this.isMousedown = false + this.cacheActiveList = [] + if (this.rect) this.rect.remove() + this.rect = null + setTimeout(() => { + this.isSelecting = false + }, 0) + }) + } + + // 如果激活节点改变了，那么触发事件 + checkTriggerNodeActiveEvent() { + let isNumChange = this.cacheActiveList.length !== this.mindMap.renderer.activeNodeList.length + let isNodeChange = false + if (!isNumChange) { + for(let i = 0; i < this.cacheActiveList.length; i++) { + let cur = this.cacheActiveList[i] + if (!this.mindMap.renderer.activeNodeList.find((item) => { + return item.nodeData.data.uid === cur.nodeData.data.uid + })){ + isNodeChange = true + break + } + } + } + if (isNumChange || isNodeChange) { this.mindMap.emit( 'node_active', null, - this.mindMap.renderer.activeNodeList + [...this.mindMap.renderer.activeNodeList] ) - clearTimeout(this.autoMoveTimer) - this.isMousedown = false - if (this.rect) this.rect.remove() - this.rect = null - }) + } } // 鼠标移动事件 onMove(x, y) { + this.isSelecting = true // 绘制矩形 this.rect.plot([ [this.mouseDownX, this.mouseDownY], @@ -172,6 +200,11 @@ class Select { } }) } + + // 是否存在选区 + hasSelectRange() { + return this.isSelecting + } } Select.instanceName = 'select' diff --git a/simple-mind-map/src/plugins/TouchEvent.js b/simple-mind-map/src/plugins/TouchEvent.js index 1c91f100..7bad4fc3 100644 --- a/simple-mind-map/src/plugins/TouchEvent.js +++ b/simple-mind-map/src/plugins/TouchEvent.js @@ -78,7 +78,7 @@ class TouchEvent { return } const viewBefore = this.touchStartScaleView - const scale = viewBefore.scale * (distance / viewBefore.distance) + let scale = viewBefore.scale * (distance / viewBefore.distance) if (Math.abs(distance - viewBefore.distance) <= 10) { scale = viewBefore.scale } @@ -148,6 +148,11 @@ class TouchEvent { beforePluginRemove() { this.unBindEvent() } + + // 插件被卸载前做的事情 + beforePluginDestroy() { + this.unBindEvent() + } } TouchEvent.instanceName = 'touchEvent' diff --git a/simple-mind-map/src/plugins/associativeLine/associativeLineControls.js b/simple-mind-map/src/plugins/associativeLine/associativeLineControls.js index 105a69ef..a35b4d7c 100644 --- a/simple-mind-map/src/plugins/associativeLine/associativeLineControls.js +++ b/simple-mind-map/src/plugins/associativeLine/associativeLineControls.js @@ -1,7 +1,7 @@ import { getAssociativeLineTargetIndex, joinCubicBezierPath, - computeNodePoints, + getNodePoint, getDefaultControlPointOffsets } from './associativeLineUtils' @@ -61,15 +61,22 @@ function onControlPointMousemove(e) { } // 更新当前拖拽的控制点的位置 this[this.mousedownControlPointKey].x(x - radius).y(y - radius) - let [path, clickPath, text, node, toNode] = this.activeLine - let [startPoint, endPoint] = computeNodePoints(node, toNode) + let [, , , node, toNode] = this.activeLine + let targetIndex = getAssociativeLineTargetIndex(node, toNode) + let { associativeLinePoint, associativeLineTargetControlOffsets } = + node.nodeData.data + associativeLinePoint = associativeLinePoint || [] + const nodePos = this.getNodePos(node) + const toNodePos = this.getNodePos(toNode) + let [startPoint, endPoint] = this.updateAllLinesPos( + node, + toNode, + associativeLinePoint[targetIndex] + ) this.controlPointMousemoveState.startPoint = startPoint this.controlPointMousemoveState.endPoint = endPoint - let targetIndex = getAssociativeLineTargetIndex(node, toNode) this.controlPointMousemoveState.targetIndex = targetIndex let offsets = [] - let associativeLineTargetControlOffsets = - node.nodeData.data.associativeLineTargetControlOffsets if (!associativeLineTargetControlOffsets) { // 兼容0.4.5版本，没有associativeLineTargetControlOffsets的情况 offsets = getDefaultControlPointOffsets(startPoint, endPoint) @@ -78,8 +85,14 @@ function onControlPointMousemove(e) { } let point1 = null let point2 = null + const { x: clientX, y: clientY } = this.mindMap.toPos(e.clientX, e.clientY) + const _e = { + clientX, + clientY + } // 拖拽的是控制点1 if (this.mousedownControlPointKey === 'controlPoint1') { + startPoint = getNodePoint(nodePos, '', 0, _e) point1 = { x, y @@ -88,10 +101,15 @@ function onControlPointMousemove(e) { x: endPoint.x + offsets[1].x, y: endPoint.y + offsets[1].y } - // 更新控制点1的连线 - this.controlLine1.plot(startPoint.x, startPoint.y, point1.x, point1.y) + if (startPoint) { + // 保存更新后的坐标 + this.controlPointMousemoveState.startPoint = startPoint + // 更新控制点1的连线 + this.controlLine1.plot(startPoint.x, startPoint.y, point1.x, point1.y) + } } else { // 拖拽的是控制点2 + endPoint = getNodePoint(toNodePos, '', 0, _e) point1 = { x: startPoint.x + offsets[0].x, y: startPoint.y + offsets[0].y @@ -100,18 +118,39 @@ function onControlPointMousemove(e) { x, y } - // 更新控制点2的连线 - this.controlLine2.plot(endPoint.x, endPoint.y, point2.x, point2.y) + if (endPoint) { + // 保存更新后结束节点的坐标 + this.controlPointMousemoveState.endPoint = endPoint + // 更新控制点2的连线 + this.controlLine2.plot(endPoint.x, endPoint.y, point2.x, point2.y) + } } + this.updataAassociativeLine( + startPoint, + endPoint, + point1, + point2, + this.activeLine + ) +} + +function updataAassociativeLine( + startPoint, + endPoint, + point1, + point2, + activeLine +) { + const [path, clickPath, text] = activeLine // 更新关联线 - let pathStr = joinCubicBezierPath(startPoint, endPoint, point1, point2) + const pathStr = joinCubicBezierPath(startPoint, endPoint, point1, point2) path.plot(pathStr) clickPath.plot(pathStr) this.updateTextPos(path, text) this.updateTextEditBoxPos(text) } -// 控制点的鼠标移动事件 +// 控制点的鼠标松开事件 function onControlPointMouseup(e) { if (!this.isControlPointMousedown) return e.stopPropagation() @@ -120,8 +159,15 @@ function onControlPointMouseup(e) { this.controlPointMousemoveState let [, , , node] = this.activeLine let offsetList = [] - let associativeLineTargetControlOffsets = - node.nodeData.data.associativeLineTargetControlOffsets + let { associativeLinePoint, associativeLineTargetControlOffsets } = + node.nodeData.data + if (!associativeLinePoint) { + associativeLinePoint = [] + } + associativeLinePoint[targetIndex] = associativeLinePoint[targetIndex] || { + startPoint, + endPoint + } if (!associativeLineTargetControlOffsets) { // 兼容0.4.5版本，没有associativeLineTargetControlOffsets的情况 offsetList[targetIndex] = getDefaultControlPointOffsets( @@ -140,6 +186,7 @@ function onControlPointMouseup(e) { y: pos.y - startPoint.y } offset2 = offsetList[targetIndex][1] + associativeLinePoint[targetIndex].startPoint = startPoint } else { // 更新控制点2数据 offset1 = offsetList[targetIndex][0] @@ -147,10 +194,12 @@ function onControlPointMouseup(e) { x: pos.x - endPoint.x, y: pos.y - endPoint.y } + associativeLinePoint[targetIndex].endPoint = endPoint } offsetList[targetIndex] = [offset1, offset2] this.mindMap.execCommand('SET_NODE_DATA', node, { - associativeLineTargetControlOffsets: offsetList + associativeLineTargetControlOffsets: offsetList, + associativeLinePoint }) // 这里要加个setTimeout0是因为draw_click事件比mouseup事件触发的晚，所以重置isControlPointMousedown需要等draw_click事件触发完以后 setTimeout(() => { @@ -237,5 +286,6 @@ export default { renderControls, removeControls, hideControls, - showControls + showControls, + updataAassociativeLine } diff --git a/simple-mind-map/src/plugins/associativeLine/associativeLineText.js b/simple-mind-map/src/plugins/associativeLine/associativeLineText.js index 26c31fdb..deb812d9 100644 --- a/simple-mind-map/src/plugins/associativeLine/associativeLineText.js +++ b/simple-mind-map/src/plugins/associativeLine/associativeLineText.js @@ -36,7 +36,7 @@ function showEditTextBox(g) { this.mindMap.keyCommand.addShortcut('Enter', () => { this.hideEditTextBox() }) - + if (!this.textEditNode) { this.textEditNode = document.createElement('div') this.textEditNode.style.cssText = `position:fixed;box-sizing: border-box;background-color:#fff;box-shadow: 0 0 20px rgba(0,0,0,.5);padding: 3px 5px;margin-left: -5px;margin-top: -3px;outline: none; word-break: break-all;` @@ -62,7 +62,8 @@ function showEditTextBox(g) { ).split(/\n/gim) this.textEditNode.style.fontFamily = associativeLineTextFontFamily this.textEditNode.style.fontSize = associativeLineTextFontSize * scale + 'px' - this.textEditNode.style.lineHeight = textLines.length > 1 ? associativeLineTextLineHeight : 'normal' + this.textEditNode.style.lineHeight = + textLines.length > 1 ? associativeLineTextLineHeight : 'normal' this.textEditNode.style.zIndex = this.mindMap.opt.nodeTextEditZIndex this.textEditNode.innerHTML = textLines.join('
') this.textEditNode.style.display = 'block' @@ -78,10 +79,12 @@ function onScale() { // 更新文本编辑框位置 function updateTextEditBoxPos(g) { let rect = g.node.getBoundingClientRect() - this.textEditNode.style.minWidth = rect.width + 10 + 'px' - this.textEditNode.style.minHeight = rect.height + 6 + 'px' - this.textEditNode.style.left = rect.left + 'px' - this.textEditNode.style.top = rect.top + 'px' + if (this.textEditNode) { + this.textEditNode.style.minWidth = `${rect.width + 10}px` + this.textEditNode.style.minHeight = `${rect.height + 6}px` + this.textEditNode.style.left = `${rect.left}px` + this.textEditNode.style.top = `${rect.top}px` + } } // 隐藏文本编辑框 @@ -116,8 +119,10 @@ function getText(node, toNode) { // 渲染关联线文字 function renderText(str, path, text) { if (!str) return - let { associativeLineTextFontSize, associativeLineTextLineHeight } = - this.mindMap.themeConfig + let { + associativeLineTextFontSize, + associativeLineTextLineHeight + } = this.mindMap.themeConfig text.clear() let textArr = str.split(/\n/gim) textArr.forEach((item, index) => { diff --git a/simple-mind-map/src/plugins/associativeLine/associativeLineUtils.js b/simple-mind-map/src/plugins/associativeLine/associativeLineUtils.js index 018c33b9..b68216e5 100644 --- a/simple-mind-map/src/plugins/associativeLine/associativeLineUtils.js +++ b/simple-mind-map/src/plugins/associativeLine/associativeLineUtils.js @@ -54,28 +54,136 @@ export const cubicBezierPath = (x1, y1, x2, y2) => { ) } +export const calcPoint = (node, e) => { + const { left, top, translateLeft, translateTop, width, height } = node + const clientX = e.clientX + const clientY = e.clientY + // 中心点的坐标 + const centerX = translateLeft + width / 2 + const centerY = translateTop + height / 2 + const translateCenterX = left + width / 2 + const translateCenterY = top + height / 2 + const theta = Math.atan(height / width) + // 矩形左上角坐标 + const deltaX = clientX - centerX + const deltaY = centerY - clientY + // 方向值 + const direction = Math.atan2(deltaY, deltaX) + // 默认坐标 + let x = left + width + let y = top + height + if (direction < theta && direction >= -theta) { + // 右边 + // 正切值 = 对边/邻边，对边 = 正切值*邻边 + const range = direction * (width / 2) + if (direction < theta && direction >= 0) { + // 中心点上边 + y = translateCenterY - range + } else if (direction >= -theta && direction < 0) { + // 中心点下方 + y = translateCenterY - range + } + return { + x, + y, + dir: 'right', + range + } + } else if (direction >= theta && direction < Math.PI - theta) { + // 上边 + y = top + let range = 0 + if (direction < Math.PI / 2 - theta && direction >= theta) { + // 正切值 = 对边/邻边，邻边 = 对边/正切值 + const side = height / 2 / direction + range = -side + // 中心点右侧 + x = translateCenterX + side + } else if ( + direction >= Math.PI / 2 - theta && + direction < Math.PI - theta + ) { + // 中心点左侧 + const tanValue = (centerX - clientX) / (centerY - clientY) + const side = (height / 2) * tanValue + range = side + x = translateCenterX - side + } + return { + x, + y, + dir: 'top', + range + } + } else if (direction < -theta && direction >= theta - Math.PI) { + // 下边 + let range = 0 + if (direction >= theta - Math.PI / 2 && direction < -theta) { + // 中心点右侧 + // 正切值 = 对边/邻边，邻边 = 对边/正切值 + const side = height / 2 / direction + range = side + x = translateCenterX - side + } else if ( + direction < theta - Math.PI / 2 && + direction >= theta - Math.PI + ) { + // 中心点左侧 + const tanValue = (centerX - clientX) / (centerY - clientY) + const side = (height / 2) * tanValue + range = -side + x = translateCenterX + side + } + return { + x, + y, + dir: 'bottom', + range + } + } + // 左边 + x = left + const tanValue = (centerY - clientY) / (centerX - clientX) + const range = tanValue * (width / 2) + if (direction >= -Math.PI && direction < theta - Math.PI) { + // 中心点右侧 + y = translateCenterY - range + } else if (direction < Math.PI && direction >= Math.PI - theta) { + // 中心点左侧 + y = translateCenterY - range + } + return { + x, + y, + dir: 'left', + range + } +} // 获取节点的连接点 -export const getNodePoint = (node, dir = 'right') => { +export const getNodePoint = (node, dir = 'right', range = 0, e = null) => { let { left, top, width, height } = node + if (e) { + return calcPoint(node, e) + } switch (dir) { case 'left': return { x: left, - y: top + height / 2 + y: top + height / 2 - range } case 'right': return { x: left + width, - y: top + height / 2 + y: top + height / 2 - range } case 'top': return { - x: left + width / 2, + x: left + width / 2 - range, y: top } case 'bottom': return { - x: left + width / 2, + x: left + width / 2 - range, y: top + height } default: @@ -111,8 +219,8 @@ export const computeNodePoints = (fromNode, toNode) => { toDir = 'bottom' } else if (offsetY > 0 && -offsetY < offsetX && offsetY > offsetX) { // down - fromDir = 'bottom' - toDir = 'top' + fromDir = 'right' + toDir = 'right' } return [getNodePoint(fromNode, fromDir), getNodePoint(toNode, toDir)] } @@ -179,4 +287,4 @@ export const getDefaultControlPointOffsets = (startPoint, endPoint) => { y: controlPoints[1].y - endPoint.y } ] -} \ No newline at end of file +} diff --git a/simple-mind-map/src/themes/autumn.js b/simple-mind-map/src/themes/autumn.js index 66c301bb..b7d295b1 100644 --- a/simple-mind-map/src/themes/autumn.js +++ b/simple-mind-map/src/themes/autumn.js @@ -18,11 +18,7 @@ export default merge(defaultTheme, { color: '#fff', borderColor: '#e68112', borderWidth: 0, - fontSize: 24, - active: { - borderColor: '#b0bc47', - borderWidth: 3 - } + fontSize: 24 }, // 二级节点样式 second: { @@ -30,18 +26,12 @@ export default merge(defaultTheme, { color: '#8c5416', borderColor: '#b0bc47', borderWidth: 2, - fontSize: 18, - active: { - borderColor: '#e68112' - } + fontSize: 18 }, // 三级及以下节点样式 node: { fontSize: 14, - color: '#8c5416', - active: { - borderColor: '#b0bc47' - } + color: '#8c5416' }, // 概要节点样式 generalization: { @@ -49,9 +39,6 @@ export default merge(defaultTheme, { fillColor: '#ffd683', borderColor: '#b0bc47', borderWidth: 2, - color: '#8c5416', - active: { - borderColor: '#e68112' - } + color: '#8c5416' } }) diff --git a/simple-mind-map/src/themes/avocado.js b/simple-mind-map/src/themes/avocado.js index d0d4f2bf..d425388b 100644 --- a/simple-mind-map/src/themes/avocado.js +++ b/simple-mind-map/src/themes/avocado.js @@ -18,11 +18,7 @@ export default merge(defaultTheme, { color: '#fff', borderColor: '#94c143', borderWidth: 0, - fontSize: 24, - active: { - borderColor: '#749336', - borderWidth: 3 - } + fontSize: 24 }, // 二级节点样式 second: { @@ -30,18 +26,12 @@ export default merge(defaultTheme, { color: '#749336', borderColor: '#aec668', borderWidth: 2, - fontSize: 18, - active: { - borderColor: '#749336' - } + fontSize: 18 }, // 三级及以下节点样式 node: { fontSize: 14, - color: '#749336', - active: { - borderColor: '#749336' - } + color: '#749336' }, // 概要节点样式 generalization: { @@ -49,9 +39,6 @@ export default merge(defaultTheme, { fillColor: '#cee498', borderColor: '#aec668', borderWidth: 2, - color: '#749336', - active: { - borderColor: '#749336' - } + color: '#749336' } }) diff --git a/simple-mind-map/src/themes/blackGold.js b/simple-mind-map/src/themes/blackGold.js index d694fe15..c11cd4ee 100644 --- a/simple-mind-map/src/themes/blackGold.js +++ b/simple-mind-map/src/themes/blackGold.js @@ -18,11 +18,7 @@ export default merge(defaultTheme, { color: 'rgb(111, 61, 6)', borderColor: '', borderWidth: 0, - fontSize: 24, - active: { - borderColor: '#fff', - borderWidth: 3 - } + fontSize: 24 }, // 二级节点样式 second: { @@ -30,18 +26,12 @@ export default merge(defaultTheme, { color: 'rgb(225, 201, 158)', borderColor: 'rgb(245, 224, 191)', borderWidth: 2, - fontSize: 18, - active: { - borderColor: 'rgb(255, 208, 124)' - } + fontSize: 18 }, // 三级及以下节点样式 node: { fontSize: 14, - color: 'rgb(231, 203, 155)', - active: { - borderColor: 'rgb(255, 208, 124)' - } + color: 'rgb(231, 203, 155)' }, // 概要节点样式 generalization: { @@ -49,9 +39,6 @@ export default merge(defaultTheme, { fillColor: 'rgb(56, 45, 34)', borderColor: 'rgb(104, 84, 61)', borderWidth: 2, - color: 'rgb(242, 216, 176)', - active: { - borderColor: 'rgb(255, 208, 124)' - } + color: 'rgb(242, 216, 176)' } }) diff --git a/simple-mind-map/src/themes/blackHumour.js b/simple-mind-map/src/themes/blackHumour.js index e219ff98..62de9777 100644 --- a/simple-mind-map/src/themes/blackHumour.js +++ b/simple-mind-map/src/themes/blackHumour.js @@ -18,11 +18,7 @@ export default merge(defaultTheme, { color: '#fff', borderColor: '', borderWidth: 0, - fontSize: 24, - active: { - borderColor: 'rgb(254, 199, 13)', - borderWidth: 3 - } + fontSize: 24 }, // 二级节点样式 second: { @@ -30,19 +26,12 @@ export default merge(defaultTheme, { color: 'rgb(0, 0, 0)', borderColor: '', borderWidth: 0, - fontSize: 18, - active: { - borderColor: 'rgb(36, 179, 96)', - borderWidth: 3 - } + fontSize: 18 }, // 三级及以下节点样式 node: { fontSize: 14, - color: 'rgb(204, 204, 204)', - active: { - borderColor: 'rgb(254, 199, 13)' - } + color: 'rgb(204, 204, 204)' }, // 概要节点样式 generalization: { @@ -50,9 +39,6 @@ export default merge(defaultTheme, { fillColor: 'rgb(27, 31, 34)', borderColor: 'rgb(255, 119, 34)', borderWidth: 2, - color: 'rgb(204, 204, 204)', - active: { - borderColor: 'rgb(36, 179, 96)' - } + color: 'rgb(204, 204, 204)' } }) diff --git a/simple-mind-map/src/themes/blueSky.js b/simple-mind-map/src/themes/blueSky.js index 1f464a72..f5343553 100644 --- a/simple-mind-map/src/themes/blueSky.js +++ b/simple-mind-map/src/themes/blueSky.js @@ -13,10 +13,7 @@ export default merge(defaultTheme, { generalizationLineColor: '#333', // 根节点样式 root: { - fillColor: 'rgb(115, 161, 191)', - active: { - borderColor: 'rgb(57, 80, 96)' - } + fillColor: 'rgb(115, 161, 191)' }, // 二级节点样式 second: { @@ -24,26 +21,17 @@ export default merge(defaultTheme, { color: '#333', borderColor: 'rgb(115, 161, 191)', borderWidth: 1, - fontSize: 14, - active: { - borderColor: 'rgb(57, 80, 96)' - } + fontSize: 14 }, // 三级及以下节点样式 node: { fontSize: 12, - color: '#333', - active: { - borderColor: 'rgb(57, 80, 96)' - } + color: '#333' }, // 概要节点样式 generalization: { fillColor: '#fff', borderColor: '#333', - color: '#333', - active: { - borderColor: 'rgb(57, 80, 96)' - } + color: '#333' } }) diff --git a/simple-mind-map/src/themes/brainImpairedPink.js b/simple-mind-map/src/themes/brainImpairedPink.js index e301bdfc..01fd3283 100644 --- a/simple-mind-map/src/themes/brainImpairedPink.js +++ b/simple-mind-map/src/themes/brainImpairedPink.js @@ -13,10 +13,7 @@ export default merge(defaultTheme, { generalizationLineColor: '#333', // 根节点样式 root: { - fillColor: 'rgb(191, 115, 148)', - active: { - borderColor: 'rgb(96, 57, 74)' - } + fillColor: 'rgb(191, 115, 148)' }, // 二级节点样式 second: { @@ -24,26 +21,17 @@ export default merge(defaultTheme, { color: '#333', borderColor: 'rgb(191, 115, 148)', borderWidth: 1, - fontSize: 14, - active: { - borderColor: 'rgb(96, 57, 74)' - } + fontSize: 14 }, // 三级及以下节点样式 node: { fontSize: 12, - color: '#333', - active: { - borderColor: 'rgb(96, 57, 74)' - } + color: '#333' }, // 概要节点样式 generalization: { fillColor: '#fff', borderColor: '#333', - color: '#333', - active: { - borderColor: 'rgb(96, 57, 74)' - } + color: '#333' } }) diff --git a/simple-mind-map/src/themes/classic.js b/simple-mind-map/src/themes/classic.js index eeeff67e..792026cf 100644 --- a/simple-mind-map/src/themes/classic.js +++ b/simple-mind-map/src/themes/classic.js @@ -18,16 +18,13 @@ export default merge(defaultTheme, { 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAIAAAACDbGyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDowQzg5QTQ0NDhENzgxMUUzOENGREE4QTg0RDgzRTZDNyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDowQzg5QTQ0NThENzgxMUUzOENGREE4QTg0RDgzRTZDNyI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkMwOEQ1NDRGOEQ3NzExRTM4Q0ZEQThBODREODNFNkM3IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkMwOEQ1NDUwOEQ3NzExRTM4Q0ZEQThBODREODNFNkM3Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+e9P33AAAACVJREFUeNpisXJ0YUACTAyoAMr/+eM7EGGRZ4FQ7BycEAZAgAEAHbEGtkoQm/wAAAAASUVORK5CYII=', // 背景重复 backgroundRepeat: 'repeat', + backgroundSize: 'auto', // 根节点样式 root: { fillColor: 'rgb(233, 223, 152)', color: '#333', fontSize: 24, - borderRadius: 21, - active: { - fillColor: 'rgb(254, 219, 0)', - borderColor: 'transparent' - } + borderRadius: 21 }, // 二级节点样式 second: { @@ -35,30 +32,18 @@ export default merge(defaultTheme, { borderColor: 'transparent', color: '#333', fontSize: 16, - borderRadius: 10, - active: { - fillColor: 'rgb(254, 219, 0)', - borderColor: 'transparent' - } + borderRadius: 10 }, // 三级及以下节点样式 node: { fontSize: 12, color: '#fff', - fontWeight: 'bold', - active: { - fillColor: 'rgb(254, 219, 0)', - borderColor: 'transparent' - } + fontWeight: 'bold' }, // 概要节点样式 generalization: { fillColor: '#fff', borderColor: 'transparent', - color: '#333', - active: { - fillColor: 'rgb(254, 219, 0)', - borderColor: 'transparent' - } + color: '#333' } }) diff --git a/simple-mind-map/src/themes/classic2.js b/simple-mind-map/src/themes/classic2.js index 2c40fc70..1fef1fe2 100644 --- a/simple-mind-map/src/themes/classic2.js +++ b/simple-mind-map/src/themes/classic2.js @@ -18,10 +18,7 @@ export default merge(defaultTheme, { fillColor: 'rgb(18, 187, 55)', color: '#fff', fontSize: 24, - borderRadius: 10, - active: { - borderColor: 'rgb(51, 51, 51)' - } + borderRadius: 10 }, // 二级节点样式 second: { @@ -29,27 +26,18 @@ export default merge(defaultTheme, { borderColor: 'transparent', color: '#1a1a1a', fontSize: 18, - borderRadius: 10, - active: { - borderColor: 'rgb(51, 51, 51)' - } + borderRadius: 10 }, // 三级及以下节点样式 node: { fontSize: 14, - color: '#1a1a1a', - active: { - borderColor: 'rgb(51, 51, 51)' - } + color: '#1a1a1a' }, // 概要节点样式 generalization: { fillColor: '#fff', borderColor: 'rgb(51, 51, 51)', borderWidth: 2, - color: '#1a1a1a', - active: { - borderColor: 'rgb(18, 187, 55)' - } + color: '#1a1a1a' } }) diff --git a/simple-mind-map/src/themes/classic3.js b/simple-mind-map/src/themes/classic3.js index 27ce5c6b..21523e2c 100644 --- a/simple-mind-map/src/themes/classic3.js +++ b/simple-mind-map/src/themes/classic3.js @@ -20,10 +20,7 @@ export default merge(defaultTheme, { fontSize: 24, borderRadius: 10, borderColor: 'rgb(249, 199, 84)', - borderWidth: 1, - active: { - borderColor: 'rgb(94, 202, 110)' - } + borderWidth: 1 }, // 二级节点样式 second: { @@ -32,27 +29,18 @@ export default merge(defaultTheme, { borderWidth: 1, color: '#1a1a1a', fontSize: 18, - borderRadius: 10, - active: { - borderColor: 'rgb(94, 202, 110)' - } + borderRadius: 10 }, // 三级及以下节点样式 node: { fontSize: 14, - color: '#1a1a1a', - active: { - borderColor: 'rgb(94, 202, 110)' - } + color: '#1a1a1a' }, // 概要节点样式 generalization: { fillColor: '#fff', borderColor: '#1a1a1a', color: '#1a1a1a', - borderWidth: 2, - active: { - borderColor: 'rgb(94, 202, 110)' - } + borderWidth: 2 } }) diff --git a/simple-mind-map/src/themes/classic4.js b/simple-mind-map/src/themes/classic4.js index a4046e9e..70886afb 100644 --- a/simple-mind-map/src/themes/classic4.js +++ b/simple-mind-map/src/themes/classic4.js @@ -20,10 +20,7 @@ export default merge(defaultTheme, { fontSize: 24, borderRadius: 10, borderColor: 'rgb(189, 197, 201)', - borderWidth: 2, - active: { - borderColor: 'rgb(169, 218, 218)' - } + borderWidth: 2 }, // 二级节点样式 second: { @@ -32,10 +29,7 @@ export default merge(defaultTheme, { borderWidth: 2, color: '#fff', fontSize: 18, - borderRadius: 10, - active: { - borderColor: 'rgb(56, 123, 233)' - } + borderRadius: 10 }, // 三级及以下节点样式 node: { @@ -43,19 +37,13 @@ export default merge(defaultTheme, { color: 'rgb(30, 53, 86)', borderColor: 'rgb(30, 53, 86)', borderWidth: 1, - marginY: 20, - active: { - borderColor: 'rgb(169, 218, 218)' - } + marginY: 20 }, // 概要节点样式 generalization: { fillColor: 'rgb(56, 123, 233)', borderColor: 'rgb(56, 123, 233)', color: '#fff', - borderWidth: 0, - active: { - borderColor: 'rgb(169, 218, 218)' - } + borderWidth: 0 } }) diff --git a/simple-mind-map/src/themes/classicBlue.js b/simple-mind-map/src/themes/classicBlue.js index 59539342..8b7a60b3 100644 --- a/simple-mind-map/src/themes/classicBlue.js +++ b/simple-mind-map/src/themes/classicBlue.js @@ -16,10 +16,7 @@ export default merge(defaultTheme, { // 根节点样式 root: { fillColor: 'rgb(255, 255, 255)', - color: '#222', - active: { - borderColor: 'rgb(94, 199, 248)' - } + color: '#222' }, // 二级节点样式 second: { @@ -27,26 +24,17 @@ export default merge(defaultTheme, { color: '#222', borderColor: 'rgb(255, 255, 255)', borderWidth: 1, - fontSize: 14, - active: { - borderColor: 'rgb(94, 199, 248)' - } + fontSize: 14 }, // 三级及以下节点样式 node: { fontSize: 12, - color: '#333', - active: { - borderColor: 'rgb(94, 199, 248)' - } + color: '#333' }, // 概要节点样式 generalization: { fillColor: '#fff', borderColor: 'rgb(51, 51, 51)', - color: '#333', - active: { - borderColor: 'rgb(94, 199, 248)' - } + color: '#333' } }) diff --git a/simple-mind-map/src/themes/classicGreen.js b/simple-mind-map/src/themes/classicGreen.js index 87725dbf..65b6e81b 100644 --- a/simple-mind-map/src/themes/classicGreen.js +++ b/simple-mind-map/src/themes/classicGreen.js @@ -14,10 +14,7 @@ export default merge(defaultTheme, { // 根节点样式 root: { fillColor: 'rgb(253, 244, 217)', - color: '#222', - active: { - borderColor: 'rgb(94, 199, 248)' - } + color: '#222' }, // 二级节点样式 second: { @@ -25,27 +22,18 @@ export default merge(defaultTheme, { color: '#222', borderColor: 'rgb(242, 200, 104)', borderWidth: 1, - fontSize: 14, - active: { - borderColor: 'rgb(94, 199, 248)' - } + fontSize: 14 }, // 三级及以下节点样式 node: { fontSize: 12, - color: '#333', - active: { - borderColor: 'rgb(94, 199, 248)' - } + color: '#333' }, // 概要节点样式 generalization: { fillColor: 'rgb(123, 199, 120)', borderColor: 'transparent', borderWidth: 2, - color: '#fff', - active: { - borderColor: 'rgb(94, 199, 248)' - } + color: '#fff' } }) diff --git a/simple-mind-map/src/themes/coffee.js b/simple-mind-map/src/themes/coffee.js index 792a3389..b3f73d3c 100644 --- a/simple-mind-map/src/themes/coffee.js +++ b/simple-mind-map/src/themes/coffee.js @@ -16,11 +16,7 @@ export default merge(defaultTheme, { color: '#fff', borderColor: '', borderWidth: 0, - fontSize: 24, - active: { - borderColor: 'rgb(173, 123, 91)', - borderWidth: 3 - } + fontSize: 24 }, // 二级节点样式 second: { @@ -28,18 +24,12 @@ export default merge(defaultTheme, { color: 'rgb(125, 86, 42)', borderColor: '', borderWidth: 0, - fontSize: 18, - active: { - borderColor: 'rgb(173, 123, 91)' - } + fontSize: 18 }, // 三级及以下节点样式 node: { fontSize: 14, - color: 'rgb(96, 71, 47)', - active: { - borderColor: 'rgb(173, 123, 91)' - } + color: 'rgb(96, 71, 47)' }, // 概要节点样式 generalization: { @@ -47,9 +37,6 @@ export default merge(defaultTheme, { fillColor: 'rgb(255, 249, 239)', borderColor: 'rgb(173, 123, 91)', borderWidth: 2, - color: 'rgb(122, 83, 44)', - active: { - borderColor: 'rgb(202, 117, 79)' - } + color: 'rgb(122, 83, 44)' } }) diff --git a/simple-mind-map/src/themes/courseGreen.js b/simple-mind-map/src/themes/courseGreen.js index 78e50978..2d19cd1a 100644 --- a/simple-mind-map/src/themes/courseGreen.js +++ b/simple-mind-map/src/themes/courseGreen.js @@ -16,11 +16,7 @@ export default merge(defaultTheme, { color: '#fff', borderColor: '', borderWidth: 0, - fontSize: 24, - active: { - borderColor: 'rgb(173, 91, 12)', - borderWidth: 3 - } + fontSize: 24 }, // 二级节点样式 second: { @@ -28,18 +24,12 @@ export default merge(defaultTheme, { color: 'rgb(50, 113, 96)', borderColor: 'rgb(113, 195, 169)', borderWidth: 2, - fontSize: 18, - active: { - borderColor: 'rgb(173, 91, 12)' - } + fontSize: 18 }, // 三级及以下节点样式 node: { fontSize: 14, - color: 'rgb(10, 59, 43)', - active: { - borderColor: 'rgb(173, 91, 12)' - } + color: 'rgb(10, 59, 43)' }, // 概要节点样式 generalization: { @@ -47,9 +37,6 @@ export default merge(defaultTheme, { fillColor: 'rgb(246, 238, 211)', borderColor: '', borderWidth: 0, - color: 'rgb(173, 91, 12)', - active: { - borderColor: 'rgb(113, 195, 169)' - } + color: 'rgb(173, 91, 12)' } }) diff --git a/simple-mind-map/src/themes/dark.js b/simple-mind-map/src/themes/dark.js index 08350045..833f93c2 100644 --- a/simple-mind-map/src/themes/dark.js +++ b/simple-mind-map/src/themes/dark.js @@ -18,10 +18,7 @@ export default merge(defaultTheme, { fillColor: 'rgb(28, 178, 43)', color: '#fff', fontSize: 24, - borderRadius: 10, - active: { - borderColor: 'rgb(17, 68, 23)' - } + borderRadius: 10 }, // 二级节点样式 second: { @@ -29,26 +26,17 @@ export default merge(defaultTheme, { color: 'rgb(147,148,149)', fontSize: 18, borderRadius: 10, - borderWidth: 0, - active: { - borderColor: 'rgb(17, 68, 23)' - } + borderWidth: 0 }, // 三级及以下节点样式 node: { fontSize: 14, - color: 'rgb(147, 148, 149)', - active: { - borderColor: 'rgb(17, 68, 23)' - } + color: 'rgb(147, 148, 149)' }, // 概要节点样式 generalization: { fillColor: '#fff', borderColor: 'transparent', - color: '#333', - active: { - borderColor: 'rgb(17, 68, 23)' - } + color: '#333' } }) diff --git a/simple-mind-map/src/themes/dark2.js b/simple-mind-map/src/themes/dark2.js index a81de694..4a4e1c31 100644 --- a/simple-mind-map/src/themes/dark2.js +++ b/simple-mind-map/src/themes/dark2.js @@ -17,11 +17,7 @@ export default merge(defaultTheme, { fillColor: 'rgb(36, 179, 96)', color: '#fff', borderColor: '', - borderWidth: 0, - active: { - borderColor: 'rgb(254, 199, 13)', - borderWidth: 3 - } + borderWidth: 0 }, // 二级节点样式 second: { @@ -29,28 +25,18 @@ export default merge(defaultTheme, { color: 'rgb(0, 0, 0)', borderColor: '', borderWidth: 0, - fontSize: 14, - active: { - borderColor: 'rgb(36, 179, 96)', - borderWidth: 2 - } + fontSize: 14 }, // 三级及以下节点样式 node: { fontSize: 12, - color: 'rgb(204, 204, 204)', - active: { - borderColor: 'rgb(254, 199, 13)' - } + color: 'rgb(204, 204, 204)' }, // 概要节点样式 generalization: { fillColor: 'transparent', borderColor: 'rgb(255, 119, 34)', borderWidth: 2, - color: 'rgb(204, 204, 204)', - active: { - borderColor: 'rgb(254, 199, 13)' - } + color: 'rgb(204, 204, 204)' } }) diff --git a/simple-mind-map/src/themes/default.js b/simple-mind-map/src/themes/default.js index 6b94a3c8..34bd20b6 100644 --- a/simple-mind-map/src/themes/default.js +++ b/simple-mind-map/src/themes/default.js @@ -70,12 +70,7 @@ export default { borderWidth: 0, borderDasharray: 'none', borderRadius: 5, - textDecoration: 'none', - active: { - borderColor: 'rgb(57, 80, 96)', - borderWidth: 3, - borderDasharray: 'none' - } + textDecoration: 'none' }, // 二级节点样式 second: { @@ -93,12 +88,7 @@ export default { borderWidth: 1, borderDasharray: 'none', borderRadius: 5, - textDecoration: 'none', - active: { - borderColor: 'rgb(57, 80, 96)', - borderWidth: 3, - borderDasharray: 'none' - } + textDecoration: 'none' }, // 三级及以下节点样式 node: { @@ -116,12 +106,7 @@ export default { borderWidth: 0, borderRadius: 5, borderDasharray: 'none', - textDecoration: 'none', - active: { - borderColor: 'rgb(57, 80, 96)', - borderWidth: 3, - borderDasharray: 'none' - } + textDecoration: 'none' }, // 概要节点样式 generalization: { @@ -139,12 +124,7 @@ export default { borderWidth: 1, borderDasharray: 'none', borderRadius: 5, - textDecoration: 'none', - active: { - borderColor: 'rgb(57, 80, 96)', - borderWidth: 3, - borderDasharray: 'none' - } + textDecoration: 'none' } } @@ -178,7 +158,8 @@ const nodeSizeIndependenceList = [ 'backgroundImage', 'backgroundRepeat', 'backgroundPosition', - 'backgroundSize' + 'backgroundSize', + 'rootLineKeepSameInCurve' ] export const checkIsNodeSizeIndependenceConfig = (config) => { let keys = Object.keys(config) diff --git a/simple-mind-map/src/themes/earthYellow.js b/simple-mind-map/src/themes/earthYellow.js index 9d375b4a..0196cf8b 100644 --- a/simple-mind-map/src/themes/earthYellow.js +++ b/simple-mind-map/src/themes/earthYellow.js @@ -13,10 +13,7 @@ export default merge(defaultTheme, { generalizationLineColor: '#333', // 根节点样式 root: { - fillColor: 'rgb(191, 147, 115)', - active: { - borderColor: 'rgb(96, 73, 57)' - } + fillColor: 'rgb(191, 147, 115)' }, // 二级节点样式 second: { @@ -24,26 +21,17 @@ export default merge(defaultTheme, { color: '#333', borderColor: 'rgb(191, 147, 115)', borderWidth: 1, - fontSize: 14, - active: { - borderColor: 'rgb(96, 73, 57)' - } + fontSize: 14 }, // 三级及以下节点样式 node: { fontSize: 12, - color: '#333', - active: { - borderColor: 'rgb(96, 73, 57)' - } + color: '#333' }, // 概要节点样式 generalization: { fillColor: '#fff', borderColor: '#333', - color: '#333', - active: { - borderColor: 'rgb(96, 73, 57)' - } + color: '#333' } }) diff --git a/simple-mind-map/src/themes/freshGreen.js b/simple-mind-map/src/themes/freshGreen.js index ab11006e..7c939639 100644 --- a/simple-mind-map/src/themes/freshGreen.js +++ b/simple-mind-map/src/themes/freshGreen.js @@ -26,11 +26,6 @@ export default merge(defaultTheme, { generalization: { fillColor: '#fff', borderColor: '#333', - color: '#333', - active: { - borderColor: 'rgb(57, 80, 96)', - borderWidth: 3, - borderDasharray: 'none' - } + color: '#333' } }) diff --git a/simple-mind-map/src/themes/freshRed.js b/simple-mind-map/src/themes/freshRed.js index 3032f4d0..583b7933 100644 --- a/simple-mind-map/src/themes/freshRed.js +++ b/simple-mind-map/src/themes/freshRed.js @@ -13,10 +13,7 @@ export default merge(defaultTheme, { generalizationLineColor: '#333', // 根节点样式 root: { - fillColor: 'rgb(191, 115, 115)', - active: { - borderColor: 'rgb(96, 57, 57)' - } + fillColor: 'rgb(191, 115, 115)' }, // 二级节点样式 second: { @@ -24,26 +21,17 @@ export default merge(defaultTheme, { color: '#333', borderColor: 'rgb(191, 115, 115)', borderWidth: 1, - fontSize: 14, - active: { - borderColor: 'rgb(96, 57, 57)' - } + fontSize: 14 }, // 三级及以下节点样式 node: { fontSize: 12, - color: '#333', - active: { - borderColor: 'rgb(96, 57, 57)' - } + color: '#333' }, // 概要节点样式 generalization: { fillColor: '#fff', borderColor: '#333', - color: '#333', - active: { - borderColor: 'rgb(96, 57, 57)' - } + color: '#333' } }) diff --git a/simple-mind-map/src/themes/gold.js b/simple-mind-map/src/themes/gold.js index 538c3c67..a524a691 100644 --- a/simple-mind-map/src/themes/gold.js +++ b/simple-mind-map/src/themes/gold.js @@ -17,11 +17,7 @@ export default merge(defaultTheme, { fillColor: 'rgb(51, 56, 62)', color: 'rgb(247, 208, 160)', borderColor: '', - borderWidth: 0, - active: { - borderColor: 'rgb(247, 208, 160)', - borderWidth: 3 - } + borderWidth: 0 }, // 二级节点样式 second: { @@ -29,27 +25,17 @@ export default merge(defaultTheme, { color: 'rgb(81, 58, 42)', borderColor: '', borderWidth: 0, - fontSize: 14, - active: { - borderColor: 'rgb(51, 56, 62)', - borderWidth: 2 - } + fontSize: 14 }, // 三级及以下节点样式 node: { fontSize: 12, - color: '#222', - active: { - borderColor: 'rgb(0, 192, 184)' - } + color: '#222' }, // 概要节点样式 generalization: { fillColor: 'rgb(127, 93, 64)', borderColor: 'transparent', - color: 'rgb(255, 214, 175)', - active: { - borderColor: 'rgb(51, 56, 62)' - } + color: 'rgb(255, 214, 175)' } }) diff --git a/simple-mind-map/src/themes/greenLeaf.js b/simple-mind-map/src/themes/greenLeaf.js index d0c4f642..9fd18a39 100644 --- a/simple-mind-map/src/themes/greenLeaf.js +++ b/simple-mind-map/src/themes/greenLeaf.js @@ -17,11 +17,7 @@ export default merge(defaultTheme, { fillColor: 'rgb(25, 193, 73)', color: '#fff', borderColor: '', - borderWidth: 0, - active: { - borderColor: '#222', - borderWidth: 3 - } + borderWidth: 0 }, // 二级节点样式 second: { @@ -29,28 +25,18 @@ export default merge(defaultTheme, { color: 'rgb(69, 149, 96)', borderColor: '', borderWidth: 0, - fontSize: 14, - active: { - borderColor: 'rgb(25, 193, 73)', - borderWidth: 2 - } + fontSize: 14 }, // 三级及以下节点样式 node: { fontSize: 12, - color: '#222', - active: { - borderColor: 'rgb(25, 193, 73)' - } + color: '#222' }, // 概要节点样式 generalization: { fillColor: '#fff', borderColor: 'rgb(251, 158, 0)', borderWidth: 2, - color: 'rgb(51, 51, 51)', - active: { - borderColor: 'rgb(25, 193, 73)' - } + color: 'rgb(51, 51, 51)' } }) diff --git a/simple-mind-map/src/themes/lateNightOffice.js b/simple-mind-map/src/themes/lateNightOffice.js index 34cec1a3..a80f4b69 100644 --- a/simple-mind-map/src/themes/lateNightOffice.js +++ b/simple-mind-map/src/themes/lateNightOffice.js @@ -18,11 +18,7 @@ export default merge(defaultTheme, { color: 'rgb(255, 255, 255)', borderColor: '', borderWidth: 0, - fontSize: 24, - active: { - borderColor: 'rgb(255, 119, 34)', - borderWidth: 3 - } + fontSize: 24 }, // 二级节点样式 second: { @@ -30,19 +26,12 @@ export default merge(defaultTheme, { color: 'rgb(209, 210, 210)', borderColor: '', borderWidth: 0, - fontSize: 18, - active: { - borderColor: 'rgb(255, 119, 34)', - borderWidth: 3 - } + fontSize: 18 }, // 三级及以下节点样式 node: { fontSize: 14, - color: 'rgb(204, 204, 204)', - active: { - borderColor: 'rgb(255, 119, 34)' - } + color: 'rgb(204, 204, 204)' }, // 概要节点样式 generalization: { @@ -50,9 +39,6 @@ export default merge(defaultTheme, { fillColor: 'rgb(255, 119, 34)', borderColor: '', borderWidth: 2, - color: '#fff', - active: { - borderColor: 'rgb(23, 153, 243)' - } + color: '#fff' } }) diff --git a/simple-mind-map/src/themes/minions.js b/simple-mind-map/src/themes/minions.js index 09ba44fd..b7f0d2f3 100644 --- a/simple-mind-map/src/themes/minions.js +++ b/simple-mind-map/src/themes/minions.js @@ -16,10 +16,7 @@ export default merge(defaultTheme, { root: { fillColor: 'rgb(55, 165, 255)', borderColor: 'rgb(51, 51, 51)', - borderWidth: 3, - active: { - borderColor: 'rgb(255, 160, 36)' - } + borderWidth: 3 }, // 二级节点样式 second: { @@ -27,26 +24,17 @@ export default merge(defaultTheme, { color: '#222', borderColor: 'rgb(51, 51, 51)', borderWidth: 3, - fontSize: 14, - active: { - borderColor: 'rgb(55, 165, 255)' - } + fontSize: 14 }, // 三级及以下节点样式 node: { fontSize: 12, - color: '#222', - active: { - borderColor: 'rgb(55, 165, 255)' - } + color: '#222' }, // 概要节点样式 generalization: { borderColor: '#222', borderWidth: 3, - color: '#222', - active: { - borderColor: 'rgb(55, 165, 255)' - } + color: '#222' } }) diff --git a/simple-mind-map/src/themes/mint.js b/simple-mind-map/src/themes/mint.js index 19e22104..336a67c0 100644 --- a/simple-mind-map/src/themes/mint.js +++ b/simple-mind-map/src/themes/mint.js @@ -16,11 +16,7 @@ export default merge(defaultTheme, { root: { fillColor: 'rgb(0, 192, 184)', borderColor: '', - borderWidth: 0, - active: { - borderColor: 'rgb(255, 160, 36)', - borderWidth: 3 - } + borderWidth: 0 }, // 二级节点样式 second: { @@ -28,26 +24,17 @@ export default merge(defaultTheme, { color: '#222', borderColor: 'rgb(184, 235, 233)', borderWidth: 2, - fontSize: 14, - active: { - borderColor: 'rgb(0, 192, 184)' - } + fontSize: 14 }, // 三级及以下节点样式 node: { fontSize: 12, - color: '#222', - active: { - borderColor: 'rgb(0, 192, 184)' - } + color: '#222' }, // 概要节点样式 generalization: { fillColor: 'rgb(90, 206, 241)', borderColor: 'transparent', - color: '#fff', - active: { - borderColor: 'rgb(0, 192, 184)' - } + color: '#fff' } }) diff --git a/simple-mind-map/src/themes/orangeJuice.js b/simple-mind-map/src/themes/orangeJuice.js index 419684e3..0e2c47f6 100644 --- a/simple-mind-map/src/themes/orangeJuice.js +++ b/simple-mind-map/src/themes/orangeJuice.js @@ -18,11 +18,7 @@ export default merge(defaultTheme, { color: '#110501', borderColor: '#ff6811', borderWidth: 0, - fontSize: 24, - active: { - borderColor: '#a9a4a9', - borderWidth: 3 - } + fontSize: 24 }, // 二级节点样式 second: { @@ -30,18 +26,12 @@ export default merge(defaultTheme, { color: '#a9a4a9', borderColor: '#ff6811', borderWidth: 2, - fontSize: 18, - active: { - borderColor: '#110501' - } + fontSize: 18 }, // 三级及以下节点样式 node: { fontSize: 14, - color: '#a9a4a9', - active: { - borderColor: '#ff6811' - } + color: '#a9a4a9' }, // 概要节点样式 generalization: { @@ -49,9 +39,6 @@ export default merge(defaultTheme, { fillColor: '', borderColor: '#ff6811', borderWidth: 2, - color: '#a9a4a9', - active: { - borderColor: '#110501' - } + color: '#a9a4a9' } }) diff --git a/simple-mind-map/src/themes/pinkGrape.js b/simple-mind-map/src/themes/pinkGrape.js index ca9b1c11..c867c740 100644 --- a/simple-mind-map/src/themes/pinkGrape.js +++ b/simple-mind-map/src/themes/pinkGrape.js @@ -16,11 +16,7 @@ export default merge(defaultTheme, { root: { fillColor: 'rgb(139, 109, 225)', borderColor: '', - borderWidth: 0, - active: { - borderColor: 'rgb(243, 104, 138)', - borderWidth: 2 - } + borderWidth: 0 }, // 二级节点样式 second: { @@ -28,28 +24,17 @@ export default merge(defaultTheme, { color: '#fff', borderColor: '', borderWidth: 0, - fontSize: 14, - active: { - borderColor: 'rgb(139, 109, 225)', - borderWidth: 2 - } + fontSize: 14 }, // 三级及以下节点样式 node: { fontSize: 12, - color: '#222', - active: { - borderColor: 'rgb(139, 109, 225)' - } + color: '#222' }, // 概要节点样式 generalization: { fillColor: '#fff', borderColor: 'transparent', - color: '#222', - active: { - borderColor: 'rgb(139, 109, 225)', - borderWidth: 2 - } + color: '#222' } }) diff --git a/simple-mind-map/src/themes/redSpirit.js b/simple-mind-map/src/themes/redSpirit.js index 0ee103c3..89dbca7c 100644 --- a/simple-mind-map/src/themes/redSpirit.js +++ b/simple-mind-map/src/themes/redSpirit.js @@ -18,11 +18,7 @@ export default merge(defaultTheme, { color: 'rgb(255, 233, 157)', borderColor: '', borderWidth: 0, - fontSize: 24, - active: { - borderColor: 'rgb(255, 233, 157)', - borderWidth: 3 - } + fontSize: 24 }, // 二级节点样式 second: { @@ -30,18 +26,12 @@ export default merge(defaultTheme, { color: 'rgb(211, 58, 21)', borderColor: 'rgb(222, 101, 85)', borderWidth: 2, - fontSize: 18, - active: { - borderColor: 'rgb(255, 233, 157)' - } + fontSize: 18 }, // 三级及以下节点样式 node: { fontSize: 14, - color: 'rgb(144, 71, 43)', - active: { - borderColor: 'rgb(255, 233, 157)' - } + color: 'rgb(144, 71, 43)' }, // 概要节点样式 generalization: { @@ -49,9 +39,6 @@ export default merge(defaultTheme, { fillColor: 'rgb(255, 247, 211)', borderColor: 'rgb(255, 202, 162)', borderWidth: 2, - color: 'rgb(187, 101, 69)', - active: { - borderColor: 'rgb(222, 101, 85)' - } + color: 'rgb(187, 101, 69)' } }) diff --git a/simple-mind-map/src/themes/romanticPurple.js b/simple-mind-map/src/themes/romanticPurple.js index fc27a18e..77fac345 100644 --- a/simple-mind-map/src/themes/romanticPurple.js +++ b/simple-mind-map/src/themes/romanticPurple.js @@ -13,10 +13,7 @@ export default merge(defaultTheme, { generalizationLineColor: '#333', // 根节点样式 root: { - fillColor: 'rgb(123, 115, 191)', - active: { - borderColor: 'rgb(61, 57, 96)' - } + fillColor: 'rgb(123, 115, 191)' }, // 二级节点样式 second: { @@ -24,26 +21,17 @@ export default merge(defaultTheme, { color: '#333', borderColor: 'rgb(123, 115, 191)', borderWidth: 1, - fontSize: 14, - active: { - borderColor: 'rgb(61, 57, 96)' - } + fontSize: 14 }, // 三级及以下节点样式 node: { fontSize: 12, - color: '#333', - active: { - borderColor: 'rgb(61, 57, 96)' - } + color: '#333' }, // 概要节点样式 generalization: { fillColor: '#fff', borderColor: '#333', - color: '#333', - active: { - borderColor: 'rgb(61, 57, 96)' - } + color: '#333' } }) diff --git a/simple-mind-map/src/themes/simpleBlack.js b/simple-mind-map/src/themes/simpleBlack.js index 6a04c827..31360896 100644 --- a/simple-mind-map/src/themes/simpleBlack.js +++ b/simple-mind-map/src/themes/simpleBlack.js @@ -16,10 +16,7 @@ export default merge(defaultTheme, { color: 'rgb(34, 34, 34)', borderColor: 'rgb(34, 34, 34)', borderWidth: 3, - fontSize: 24, - active: { - borderColor: '#a13600' - } + fontSize: 24 }, // 二级节点样式 second: { @@ -27,18 +24,12 @@ export default merge(defaultTheme, { color: 'rgb(34, 34, 34)', borderColor: 'rgb(34, 34, 34)', borderWidth: 3, - fontSize: 18, - active: { - borderColor: '#a13600' - } + fontSize: 18 }, // 三级及以下节点样式 node: { fontSize: 14, - color: 'rgb(34, 34, 34)', - active: { - borderColor: '#a13600' - } + color: 'rgb(34, 34, 34)' }, // 概要节点样式 generalization: { @@ -46,9 +37,6 @@ export default merge(defaultTheme, { fillColor: 'transparent', borderColor: 'rgb(34, 34, 34)', borderWidth: 2, - color: 'rgb(34, 34, 34)', - active: { - borderColor: '#a13600' - } + color: 'rgb(34, 34, 34)' } }) diff --git a/simple-mind-map/src/themes/skyGreen.js b/simple-mind-map/src/themes/skyGreen.js index d0a92f29..1193c397 100644 --- a/simple-mind-map/src/themes/skyGreen.js +++ b/simple-mind-map/src/themes/skyGreen.js @@ -17,11 +17,7 @@ export default merge(defaultTheme, { fillColor: '#fff', borderColor: '', borderWidth: 0, - color: 'rgb(65, 89, 158)', - active: { - borderColor: 'rgb(251, 227, 188)', - borderWidth: 3 - } + color: 'rgb(65, 89, 158)' }, // 二级节点样式 second: { @@ -29,27 +25,17 @@ export default merge(defaultTheme, { color: 'rgb(65, 89, 158)', borderColor: '', borderWidth: 0, - fontSize: 14, - active: { - borderColor: '#fff', - borderWidth: 2 - } + fontSize: 14 }, // 三级及以下节点样式 node: { fontSize: 12, - color: 'rgb(65, 89, 158)', - active: { - borderColor: 'rgb(251, 227, 188)' - } + color: 'rgb(65, 89, 158)' }, // 概要节点样式 generalization: { fillColor: '#fff', borderColor: 'transparent', - color: 'rgb(65, 89, 158)', - active: { - borderColor: 'rgb(251, 227, 188)' - } + color: 'rgb(65, 89, 158)' } }) diff --git a/simple-mind-map/src/themes/vitalityOrange.js b/simple-mind-map/src/themes/vitalityOrange.js index f3f95c0c..a35a32fe 100644 --- a/simple-mind-map/src/themes/vitalityOrange.js +++ b/simple-mind-map/src/themes/vitalityOrange.js @@ -17,11 +17,7 @@ export default merge(defaultTheme, { fillColor: 'rgb(255, 112, 52)', color: '#fff', borderColor: '', - borderWidth: 0, - active: { - borderColor: 'rgb(51, 51, 51)', - borderWidth: 3 - } + borderWidth: 0 }, // 二级节点样式 second: { @@ -29,27 +25,17 @@ export default merge(defaultTheme, { color: 'rgb(51, 51, 51)', borderColor: '', borderWidth: 0, - fontSize: 14, - active: { - borderColor: 'rgb(255, 112, 52)', - borderWidth: 2 - } + fontSize: 14 }, // 三级及以下节点样式 node: { fontSize: 12, - color: '#222', - active: { - borderColor: 'rgb(255, 112, 52)' - } + color: '#222' }, // 概要节点样式 generalization: { fillColor: 'rgb(255, 222, 69)', borderColor: 'transparent', - color: 'rgb(51, 51, 51)', - active: { - borderColor: 'rgb(255, 112, 52)' - } + color: 'rgb(51, 51, 51)' } }) diff --git a/simple-mind-map/src/utils/index.js b/simple-mind-map/src/utils/index.js index c934eca6..405e2c56 100644 --- a/simple-mind-map/src/utils/index.js +++ b/simple-mind-map/src/utils/index.js @@ -632,3 +632,28 @@ export const isMobile = () => { navigator.userAgent ) } + +// 获取对象改变了的的属性 +export const getObjectChangedProps = (oldObject, newObject) => { + const res = {} + Object.keys(newObject).forEach((prop) => { + const oldVal = oldObject[prop] + const newVal = newObject[prop] + if (getType(oldVal) !== getType(newVal)) { + res[prop] = newVal + return + } + if (getType(oldVal) === 'Object') { + if (JSON.stringify(oldVal) !== JSON.stringify(newVal)) { + res[prop] = newVal + return + } + } else { + if (oldVal !== newVal) { + res[prop] = newVal + return + } + } + }) + return res +} \ No newline at end of file diff --git a/web/src/assets/avatar/南风.jpg b/web/src/assets/avatar/南风.jpg new file mode 100644 index 00000000..562987e9 Binary files /dev/null and b/web/src/assets/avatar/南风.jpg differ diff --git a/web/src/assets/avatar/小米.jpg b/web/src/assets/avatar/小米.jpg new file mode 100644 index 00000000..eb4ec403 Binary files /dev/null and b/web/src/assets/avatar/小米.jpg differ diff --git a/web/src/assets/avatar/布林.jpg b/web/src/assets/avatar/布林.jpg new file mode 100644 index 00000000..742bbc20 Binary files /dev/null and b/web/src/assets/avatar/布林.jpg differ diff --git a/web/src/assets/avatar/棐.jpg b/web/src/assets/avatar/棐.jpg new file mode 100644 index 00000000..7df066c3 Binary files /dev/null and b/web/src/assets/avatar/棐.jpg differ diff --git a/web/src/config/index.js b/web/src/config/index.js index 385fc236..9b8e115d 100644 --- a/web/src/config/index.js +++ b/web/src/config/index.js @@ -17,7 +17,9 @@ import { shapeList as shapeListZh, sidebarTriggerList as sidebarTriggerListZh, backgroundSizeList as backgroundSizeListZh, - downTypeList as downTypeListZh + downTypeList as downTypeListZh, + shapeListMap as shapeListMapZh, + lineStyleMap as lineStyleMapZh } from './zh' import { fontFamilyList as fontFamilyListEn, @@ -48,6 +50,11 @@ const lineStyleList = { en: lineStyleListEn } +const lineStyleMap = { + zh: lineStyleMapZh, + en: lineStyleMapZh +} + const rootLineKeepSameInCurveList = { zh: rootLineKeepSameInCurveListZh, en: rootLineKeepSameInCurveListEn @@ -78,6 +85,11 @@ const shapeList = { en: shapeListEn } +const shapeListMap = { + zh: shapeListMapZh, + en: shapeListMapZh +} + const sidebarTriggerList = { zh: sidebarTriggerListZh, en: sidebarTriggerListEn @@ -100,12 +112,14 @@ export { fontFamilyList, borderDasharrayList, lineStyleList, + lineStyleMap, rootLineKeepSameInCurveList, backgroundRepeatList, backgroundPositionList, backgroundSizeList, shortcutKeyList, shapeList, + shapeListMap, sidebarTriggerList, downTypeList } diff --git a/web/src/config/zh.js b/web/src/config/zh.js index c33c1cdf..08798137 100644 --- a/web/src/config/zh.js +++ b/web/src/config/zh.js @@ -142,6 +142,12 @@ export const borderRadiusList = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10] // 线宽 export const lineWidthList = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10] +export const lineStyleMap = { + straight: ``, + curve: ``, + direct: `` +} + // 连线风格 export const lineStyleList = [ { @@ -379,6 +385,22 @@ export const shortcutKeyList = [ } ] +export const shapeListMap = { + rectangle: 'M 4 12 L 4 3 L 56 3 L 56 21 L 4 21 L 4 12 Z', + diamond: 'M 4 12 L 30 3 L 56 12 L 30 21 L 4 12 Z', + parallelogram: 'M 10 3 L 56 3 L 50 21 L 4 21 L 10 3 Z', + roundedRectangle: + 'M 13 3 L 47 3 A 9 9 0, 0 1 47 21 L 13 21 A 9 9 0, 0 1 13 3 Z', + octagonalRectangle: + 'M 4 12 L 4 9 L 10 3 L 50 3 L 56 9 L 56 15 L 50 21 L 10 21 L 4 15 L 4 12 Z', + outerTriangularRectangle: + 'M 4 12 L 10 3 L 50 3 L 56 12 L 50 21 L 10 21 L 4 12 Z', + innerTriangularRectangle: + 'M 10 12 L 4 3 L 56 3 L 50 12 L 56 21 L 4 21 L 10 12 Z', + ellipse: 'M 4 12 A 26 9 0, 1, 0 30 3 A 26 9 0, 0, 0 4 12 Z', + circle: 'M 21 12 A 9 9 0, 1, 0 30 3 A 9 9 0, 0, 0 21 12 Z' +} + // 形状列表 export const shapeList = [ { @@ -509,4 +531,4 @@ export const downTypeList = [ icon: 'iconxmind', desc: 'XMind格式' } -] \ No newline at end of file +] diff --git a/web/src/customThemes/darkNightLceBlade.js b/web/src/customThemes/darkNightLceBlade.js index 5345d914..12c2d2d5 100644 --- a/web/src/customThemes/darkNightLceBlade.js +++ b/web/src/customThemes/darkNightLceBlade.js @@ -19,10 +19,7 @@ export default { borderColor: '#fff', borderWidth: 3, fontSize: 24, - shape: 'parallelogram', - active: { - borderColor: 'rgba(2, 167, 240, 0.5)', - } + shape: 'parallelogram' }, // 二级节点样式 second: { @@ -31,18 +28,12 @@ export default { borderColor: '#fff', borderWidth: 3, fontSize: 18, - shape: 'diamond', - active: { - borderColor: 'rgba(2, 167, 240, 0.5)', - } + shape: 'diamond' }, // 三级及以下节点样式 node: { fontSize: 14, - color: '#fff', - active: { - borderColor: 'rgba(2, 167, 240, 0.5)' - } + color: '#fff' }, // 概要节点样式 generalization: { @@ -50,10 +41,7 @@ export default { fillColor: '#fff', borderColor: 'rgb(0, 117, 255)', borderWidth: 2, - color: 'rgb(0, 21, 21)', - active: { - borderColor: 'rgb(0, 243, 255)' - } + color: 'rgb(0, 21, 21)' } } \ No newline at end of file diff --git a/web/src/customThemes/lemonBubbles.js b/web/src/customThemes/lemonBubbles.js index 15470539..4cfe0604 100644 --- a/web/src/customThemes/lemonBubbles.js +++ b/web/src/customThemes/lemonBubbles.js @@ -15,10 +15,7 @@ export default { borderColor: 'rgb(26, 26, 26)', borderWidth: 3, fontSize: 24, - shape: 'roundedRectangle', - active: { - borderColor: 'rgb(235, 255, 187)', - } + shape: 'roundedRectangle' }, // 二级节点样式 second: { @@ -27,18 +24,12 @@ export default { borderColor: 'rgb(51, 51, 51)', borderWidth: 3, fontSize: 18, - shape: 'roundedRectangle', - active: { - borderColor: 'rgb(39, 222, 232)', - } + shape: 'roundedRectangle' }, // 三级及以下节点样式 node: { fontSize: 14, - color: 'rgb(0, 0, 0)', - active: { - borderColor: 'rgb(39, 222, 232)' - } + color: 'rgb(0, 0, 0)' }, // 概要节点样式 generalization: { @@ -46,10 +37,7 @@ export default { fillColor: '#fff', borderColor: 'rgb(26, 26, 26)', borderWidth: 2, - color: 'rgb(26, 26, 26)', - active: { - borderColor: 'rgb(39, 222, 232)' - } + color: 'rgb(26, 26, 26)' } } \ No newline at end of file diff --git a/web/src/customThemes/morandi.js b/web/src/customThemes/morandi.js index dc106f68..d00fb172 100644 --- a/web/src/customThemes/morandi.js +++ b/web/src/customThemes/morandi.js @@ -19,10 +19,7 @@ export default { borderColor: 'rgb(207, 121, 105)', borderWidth: 3, fontSize: 24, - shape: 'roundedRectangle', - active: { - borderColor: 'rgb(172, 202, 199)', - } + shape: 'roundedRectangle' }, // 二级节点样式 second: { @@ -31,18 +28,12 @@ export default { borderColor: 'rgb(222, 186, 183)', borderWidth: 3, fontSize: 18, - shape: 'roundedRectangle', - active: { - borderColor: 'rgb(172, 202, 199)', - } + shape: 'roundedRectangle' }, // 三级及以下节点样式 node: { fontSize: 14, - color: 'rgb(131, 90, 64)', - active: { - borderColor: 'rgb(172, 202, 199)' - } + color: 'rgb(131, 90, 64)' }, // 概要节点样式 generalization: { @@ -50,10 +41,7 @@ export default { fillColor: 'rgb(172, 202, 199)', borderColor: 'rgb(172, 202, 199)', borderWidth: 2, - color: 'rgb(91, 102, 97)', - active: { - borderColor: 'rgb(207, 121, 105)' - } + color: 'rgb(91, 102, 97)' } } \ No newline at end of file diff --git a/web/src/customThemes/neonLamp.js b/web/src/customThemes/neonLamp.js index 104e04f0..6fe9e346 100644 --- a/web/src/customThemes/neonLamp.js +++ b/web/src/customThemes/neonLamp.js @@ -19,10 +19,7 @@ export default { borderColor: 'rgb(255, 0, 214)', borderWidth: 3, fontSize: 24, - shape: 'roundedRectangle', - active: { - borderColor: 'rgb(255, 181, 0)', - } + shape: 'roundedRectangle' }, // 二级节点样式 second: { @@ -30,18 +27,12 @@ export default { color: 'rgb(248, 177, 237)', borderColor: '', borderWidth: 3, - fontSize: 18, - active: { - borderColor: 'rgb(255, 181, 0)', - } + fontSize: 18 }, // 三级及以下节点样式 node: { fontSize: 14, - color: '#fff', - active: { - borderColor: 'rgb(255, 181, 0)' - } + color: '#fff' }, // 概要节点样式 generalization: { @@ -49,10 +40,7 @@ export default { fillColor: '#fff', borderColor: 'rgb(255, 181, 0)', borderWidth: 2, - color: 'rgb(17, 17, 84)', - active: { - borderColor: 'rgb(255, 0, 214)' - } + color: 'rgb(17, 17, 84)' } } \ No newline at end of file diff --git a/web/src/customThemes/oreo.js b/web/src/customThemes/oreo.js index dfa58cff..f0ee01b4 100644 --- a/web/src/customThemes/oreo.js +++ b/web/src/customThemes/oreo.js @@ -13,10 +13,7 @@ export default { color: '#fff', borderColor: 'rgb(22, 22, 22)', borderWidth: 3, - fontSize: 24, - active: { - borderColor: '#a13600', - } + fontSize: 24 }, // 二级节点样式 second: { @@ -25,18 +22,12 @@ export default { borderColor: '', borderWidth: 3, fontSize: 18, - shape: 'roundedRectangle', - active: { - borderColor: 'rgb(22, 22, 22)', - } + shape: 'roundedRectangle' }, // 三级及以下节点样式 node: { fontSize: 14, - color: 'rgb(0, 0, 0)', - active: { - borderColor: 'rgb(22, 22, 22)' - } + color: 'rgb(0, 0, 0)' }, // 概要节点样式 generalization: { @@ -44,9 +35,6 @@ export default { fillColor: 'transparent', borderColor: 'rgb(34, 34, 34)', borderWidth: 2, - color: 'rgb(34, 34, 34)', - active: { - borderColor: '#a13600' - } + color: 'rgb(34, 34, 34)' } } diff --git a/web/src/customThemes/rose.js b/web/src/customThemes/rose.js index c81368b8..ea499054 100644 --- a/web/src/customThemes/rose.js +++ b/web/src/customThemes/rose.js @@ -15,10 +15,7 @@ export default { borderColor: 'rgb(18, 187, 55)', borderWidth: 3, fontSize: 24, - shape: 'roundedRectangle', - active: { - borderColor: 'rgb(136, 100, 0)', - } + shape: 'roundedRectangle' }, // 二级节点样式 second: { @@ -27,18 +24,12 @@ export default { borderColor: '', borderWidth: 3, fontSize: 18, - shape: 'roundedRectangle', - active: { - borderColor: 'rgb(254, 92, 92)', - } + shape: 'roundedRectangle' }, // 三级及以下节点样式 node: { fontSize: 14, - color: 'rgb(26, 26, 26)', - active: { - borderColor: 'rgb(209, 237, 176)' - } + color: 'rgb(26, 26, 26)' }, // 概要节点样式 generalization: { @@ -46,10 +37,7 @@ export default { fillColor: '#fff', borderColor: 'rgb(136, 100, 0)', borderWidth: 2, - color: 'rgb(136, 100, 0)', - active: { - borderColor: 'rgb(254, 92, 92)' - } + color: 'rgb(136, 100, 0)' } } \ No newline at end of file diff --git a/web/src/customThemes/seaBlueLine.js b/web/src/customThemes/seaBlueLine.js index ffaba245..e54ac1ee 100644 --- a/web/src/customThemes/seaBlueLine.js +++ b/web/src/customThemes/seaBlueLine.js @@ -15,10 +15,7 @@ export default { borderColor: '#fff', borderWidth: 3, fontSize: 24, - shape: 'roundedRectangle', - active: { - borderColor: 'rgb(0, 155, 255)', - } + shape: 'roundedRectangle' }, // 二级节点样式 second: { @@ -27,18 +24,12 @@ export default { borderColor: '', borderWidth: 3, fontSize: 18, - shape: 'roundedRectangle', - active: { - borderColor: 'rgb(96, 189, 255)', - } + shape: 'roundedRectangle' }, // 三级及以下节点样式 node: { fontSize: 14, - color: 'rgb(0, 66, 157)', - active: { - borderColor: 'rgb(96, 189, 255)' - } + color: 'rgb(0, 66, 157)' }, // 概要节点样式 generalization: { @@ -46,10 +37,7 @@ export default { fillColor: '#fff', borderColor: 'rgb(0, 155, 255)', borderWidth: 2, - color: 'rgb(0, 155, 255)', - active: { - borderColor: 'rgba(2, 167, 240, 0.5)' - } + color: 'rgb(0, 155, 255)' } } \ No newline at end of file diff --git a/web/src/customThemes/shallowSea.js b/web/src/customThemes/shallowSea.js index 92f6d160..0374bb3b 100644 --- a/web/src/customThemes/shallowSea.js +++ b/web/src/customThemes/shallowSea.js @@ -15,10 +15,7 @@ export default { borderColor: 'rgb(51, 149, 255)', borderWidth: 3, fontSize: 24, - shape: 'roundedRectangle', - active: { - borderColor: 'rgb(255, 168, 101)', - } + shape: 'roundedRectangle' }, // 二级节点样式 second: { @@ -26,18 +23,12 @@ export default { color: '#fff', borderColor: '', borderWidth: 3, - fontSize: 18, - active: { - borderColor: 'rgb(255, 168, 101)', - } + fontSize: 18 }, // 三级及以下节点样式 node: { fontSize: 14, - color: 'rgb(0, 0, 0)', - active: { - borderColor: 'rgb(255, 168, 101)' - } + color: 'rgb(0, 0, 0)' }, // 概要节点样式 generalization: { @@ -45,10 +36,7 @@ export default { fillColor: '#fff', borderColor: 'rgb(255, 168, 101)', borderWidth: 2, - color: '#000', - active: { - borderColor: 'rgb(51, 149, 255)' - } + color: '#000' } } \ No newline at end of file diff --git a/web/src/lang/en_us.js b/web/src/lang/en_us.js index e02a193d..c527b365 100644 --- a/web/src/lang/en_us.js +++ b/web/src/lang/en_us.js @@ -50,7 +50,8 @@ export default { rootStyle: 'Root Node', associativeLineText: 'Associative line text', fontFamily: 'Font family', - fontSize: 'Font size' + fontSize: 'Font size', + isShowScrollbar: 'Is show scrollbar' }, color: { moreColor: 'More color' @@ -109,7 +110,8 @@ export default { notifyTitle: 'Info', notifyMessage: 'If the download is not triggered, check whether it is blocked by the browser', paddingX: 'Padding x', - paddingY: 'Padding y' + paddingY: 'Padding y', + useMultiPageExport: 'Export multi page' }, fullscreen: { fullscreenShow: 'Full screen show', @@ -146,7 +148,8 @@ export default { addTip: 'Press Enter to add' }, outline: { - title: 'Outline' + title: 'Outline', + nodeDefaultText: 'Branch node' }, scale: { zoomIn: 'Zoom in', diff --git a/web/src/lang/zh_cn.js b/web/src/lang/zh_cn.js index b53d9ea4..3383a87e 100644 --- a/web/src/lang/zh_cn.js +++ b/web/src/lang/zh_cn.js @@ -50,7 +50,8 @@ export default { rootStyle: '根节点', associativeLineText: '关联线文字', fontFamily: '字体', - fontSize: '字号' + fontSize: '字号', + isShowScrollbar: '是否显示滚动条' }, color: { moreColor: '更多颜色' @@ -109,7 +110,8 @@ export default { notifyTitle: '消息', notifyMessage: '如果没有触发下载，请检查是否被浏览器拦截了', paddingX: '水平内边距', - paddingY: '垂直内边距' + paddingY: '垂直内边距', + useMultiPageExport: '是否多页导出' }, fullscreen: { fullscreenShow: '全屏查看', @@ -146,7 +148,8 @@ export default { addTip: '请按回车键添加' }, outline: { - title: '大纲' + title: '大纲', + nodeDefaultText: '分支节点' }, scale: { zoomIn: '放大', diff --git a/web/src/pages/Doc/catalogList.js b/web/src/pages/Doc/catalogList.js index b14774f4..f98610d9 100644 --- a/web/src/pages/Doc/catalogList.js +++ b/web/src/pages/Doc/catalogList.js @@ -11,7 +11,7 @@ let langList = [ } ] let StartList = ['introduction', 'start', 'deploy', 'client', 'translate', 'changelog'] -let CourseList = new Array(22).fill(0).map((_, index) => { +let CourseList = new Array(24).fill(0).map((_, index) => { return 'course' + (index + 1) }) let APIList = [ @@ -34,6 +34,7 @@ let APIList = [ 'nodeImgAdjust', 'search', 'painter', + 'scrollbar', 'xmind', 'markdown', 'utils' diff --git a/web/src/pages/Doc/en/changelog/index.md b/web/src/pages/Doc/en/changelog/index.md index 1a61428a..19a4a42d 100644 --- a/web/src/pages/Doc/en/changelog/index.md +++ b/web/src/pages/Doc/en/changelog/index.md @@ -1,5 +1,129 @@ # Changelog +## 0.7.0 + +Breaking change: Removed the section of node activation style in the theme file, Setting the activation style of nodes is no longer supported, and the activation effect has been changed to a unified node outer border style, while also supporting the mouse hover effect. + +Fix: + +> 1.Fix rendering anomalies when the node border size is relatively large. +> +> 2.Fixed an issue where the node style of the associated line will not be updated when switching themes. +> +> 3.Fix that selecting all did not trigger node_ The issue with active events. + +新增： + +> 1.When folding nodes, displays the number of collapsed nodes. +> +> 2.Support the position of the endpoint of the associated line to follow mouse drag changes. +> +> 3.Add a scrollbar plugin. +> +> 4.Support opening specified online files through fileURL query parameters in URLs. +> +> 5.The fishbone diagram supports setting node margins. +> +> 6.By default, double-click to reset the canvas. +> +> 7.Modify the parameters of the export image method, and when exporting PDF, if the size of the mind map is smaller than A4 paper, do not rotate the direction. +> +> 8.Improve the clarity of exported images and PDFs on high-definition screens. +> +> 9.Add a pre destruction lifecycle function to the plugin to address the issue of some side effects that were not cleared during the destruction of the mind map. +> +> 10.Optimize the settings of the basic style and do not trigger full rendering when modifying theme attributes that do not affect size. +> +> 11.Prohibit triggering node right-click menu events when multiple node selections are completed, to avoid triggering the right-click menu display. +> +> 12.Optimize the Select plugin so that if multiple selected nodes do not change, the activation event is not triggered. +> +> 13.The activation node list thrown by event node_active no longer directly references the internal activation list. +> +> 14.Optimize the logic of mouse button down node events, and support dragging the canvas by holding down the root node with the right mouse button in the right-click drag and drop canvas mode. + +Demo： + +> 1.Do not directly reference the internal activation node list to optimize performance. +> +> 2.Support configuring whether to display scrollbars. +> +> 3.Delete the active node configuration in the sidebar node style configuration section. + +## 0.6.17 + +Fix: + +> 1.Fix the issue of error reporting in the xmind file exported from Baidu Brain Map. +> +> 2.Fix the mindMap. export method code error. + +New: + +> 1.Create index.d.ts file。 +> +> 2.Support configuration to enable double click reset mind map. +> +> 3.Intercept paste operations during rich text editing, remove formatting, and only allow pasting pure text. + +## 0.6.16 + +Fix: + +> 1.Optimize the logic of rich text measurement elements, remove duplicate settings for styles, and add duplicate nodes +> +> 2.Optimize the export image logic, and when traversing the node to convert the URL of the image, if it is already in the form of data: URL, do not handle it repeatedly. + +New: + +> 1.Remove the second parameter of the exported SVG method and configure it through instantiation instead. +> +> 2.Export images without using external libraries. + +Demo: + +> 1.Fixed a bug where siblings can be added to the root node when editing the outline separately. + +## 0.6.15-fix.2 + +Fix: Fixed an issue where rich text nodes cannot be displayed in Firefox browser. + +## 0.6.15-fix.1 + +New: + +> 1.Export PDF supports pagination export based on image size. +> +> 2.Exporting PDF supports automatic direction adjustment based on aspect ratio. +> +> 3.Optimize the placeholder elements of the expand and collapse buttons: 1. Nodes without child nodes do not render this element; 2. Dynamically update the element based on the existence of child nodes. +> +> 4.Add a configuration that prohibits mouse wheel scaling. +> +> 5.Supports passing error handling functions. + +Fix: + +> 1.Fix the issue of displaying exceptions when node text is empty. +> +> 2.Change the paddingX and paddingY of exported SVG graphics to single sided padding. +> +> 3.Fixed an issue where the mouse is not centered when zooming when the canvas is not 0 from the top left corner of the browser window. +> +> 4.Fix the issue of overlapping node borders. + +Demo： + +> 1.The bottom right corner supports jumping to related links. +> +> 2.Adjust the position of the mini map to solve the problem of being blocked by side buttons. +> +> 3.Fix the issue where the prompt in the upper right corner of the open local file cannot be closed. +> +> 4.Editing the outline separately is no longer linked to the canvas, optimizing the editing experience under large data volume. +> +> 5.The sidebar involves graphical options to increase visualization effects. + ## 0.6.14 New: diff --git a/web/src/pages/Doc/en/changelog/index.vue b/web/src/pages/Doc/en/changelog/index.vue index 460ae8d8..cdcf02fe 100644 --- a/web/src/pages/Doc/en/changelog/index.vue +++ b/web/src/pages/Doc/en/changelog/index.vue @@ -1,6 +1,90 @@ diff --git a/web/src/pages/Doc/en/node/index.md b/web/src/pages/Doc/en/node/index.md index 74d54d3a..60bd459e 100644 --- a/web/src/pages/Doc/en/node/index.md +++ b/web/src/pages/Doc/en/node/index.md @@ -110,17 +110,21 @@ Get the final style value applied to this node `root`: whether it is the root node, default `false` -`isActive`: whether the value being fetched is the active state style value, +`isActive`: v0.7.0+has been abandoned, whether the value being fetched is the active state style value, default `false` ### setStyle(prop, value, isActive) +- `isActive`: v0.7.0+has been abandoned + Modify a style of the node, a shortcut method for the `SET_NODE_STYLE` command ### setStyles(style, isActive) > v0.6.12+ +- `isActive`: v0.7.0+has been abandoned + Modify multiple styles of nodes, a shortcut method for the `SET_NODE_STYLES` command ### getData(key) diff --git a/web/src/pages/Doc/en/node/index.vue b/web/src/pages/Doc/en/node/index.vue index eb479570..fc5f1ed9 100644 --- a/web/src/pages/Doc/en/node/index.vue +++ b/web/src/pages/Doc/en/node/index.vue @@ -64,14 +64,20 @@

Get the final style value applied to this node

prop: the style property to get

root: whether it is the root node, default false

-

isActive: whether the value being fetched is the active state style value, +

isActive: v0.7.0+has been abandoned, whether the value being fetched is the active state style value, default false

setStyle(prop, value, isActive)

+

Modify a style of the node, a shortcut method for the SET_NODE_STYLE command

setStyles(style, isActive)

v0.6.12+

+

Modify multiple styles of nodes, a shortcut method for the SET_NODE_STYLES command

getData(key)

Get the specified value in the data object of the node's real data nodeData, diff --git a/web/src/pages/Doc/en/richText/index.md b/web/src/pages/Doc/en/richText/index.md index b0579ff4..2b164f09 100644 --- a/web/src/pages/Doc/en/richText/index.md +++ b/web/src/pages/Doc/en/richText/index.md @@ -18,6 +18,8 @@ The principle of this plugin is to use [Quill](https://github.com/quilljs/quill) `V0.6.13+` version uses [dom-to-image-more](https://github.com/1904labs/dom-to-image-more) Replaced 'html2canvas' to address the issue of ineffective color export for nodes. +> The compatibility of dom to image more is relatively poor, and exported images are empty on many browsers, so you can replace them with html2canvas according to your own needs. + ## Register ```js diff --git a/web/src/pages/Doc/en/richText/index.vue b/web/src/pages/Doc/en/richText/index.vue index 9b39eb20..9ad311e4 100644 --- a/web/src/pages/Doc/en/richText/index.vue +++ b/web/src/pages/Doc/en/richText/index.vue @@ -18,6 +18,9 @@

The version of v0.5.7+ directly uses html2canvas to convert the entire svg, which is no longer an issue with speed. However, there is currently a bug where the color of the node does not take effect after export.

V0.6.13+ version uses dom-to-image-more Replaced 'html2canvas' to address the issue of ineffective color export for nodes.

+
+

The compatibility of dom to image more is relatively poor, and exported images are empty on many browsers, so you can replace them with html2canvas according to your own needs.

+

Register

import MindMap from 'simple-mind-map'
 import RichText from 'simple-mind-map/src/plugins/RichText.js'
diff --git a/web/src/pages/Doc/en/scrollbar/index.md b/web/src/pages/Doc/en/scrollbar/index.md
new file mode 100644
index 00000000..10974f51
--- /dev/null
+++ b/web/src/pages/Doc/en/scrollbar/index.md
@@ -0,0 +1,64 @@
+# Scrollbar plugin
+
+> v0.7.0+
+
+This plugin is used to help develop the functionality of horizontal and vertical scrollbar.
+
+## Register
+
+```js
+import MindMap from 'simple-mind-map'
+import Scrollbar from 'simple-mind-map/src/plugins/Scrollbar.js'
+MindMap.usePlugin(Scrollbar)
+```
+
+After registration and instantiation of `MindMap`, the instance can be obtained through `mindMap.scrollbar`.
+
+## Event
+
+#### scrollbar_change
+
+Triggered when the scrollbar data changes, you can listen to this event to update the position and size of the scrollbar.
+
+## Method
+
+### setScrollBarWrapSize(width, height)
+
+- `width`: Number, The width of your scrollbar container element.
+
+- `height`: Number, The height of your scrollbar container element.
+
+Set the size of the scroll bar container, which is the width of the container for horizontal scrollbars and the height of the container for vertical scrollbars. When your scrollbar container size changes, you need to call this method again.
+
+### calculationScrollbar()
+
+> You need to first call the setScrollBarWrapSize method to set the width and height of the scroll bar container element.
+>
+> Generally, it is necessary to monitor scrollbar_change event, and then call it to update the scroll bar.
+
+Return value: 
+
+```js
+{
+    // Vertical scrollbar
+    vertical: {
+        top,
+        height
+    },
+    // Horizontal scrollbar
+    horizontal: {
+        left,
+        width
+    }
+}
+```
+
+Obtain the size and position of the scroll bar, and you can set it to the scroll bar element based on the return value to achieve the effect of rendering and caring about the scroll bar.
+
+### onMousedown(e, type)
+
+- `e`: The event object for the mouse down event.
+
+- `type`: The type of scroll bar pressed, vertical(Vertical scrollbar)、horizontal(Horizontal scrollbar)。
+
+This method needs to be called when the mouse press event of the scrollbar element occurs.
\ No newline at end of file
diff --git a/web/src/pages/Doc/en/scrollbar/index.vue b/web/src/pages/Doc/en/scrollbar/index.vue
new file mode 100644
index 00000000..d5851f33
--- /dev/null
+++ b/web/src/pages/Doc/en/scrollbar/index.vue
@@ -0,0 +1,70 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/web/src/pages/Doc/en/search/index.md b/web/src/pages/Doc/en/search/index.md
index 215917f6..8ba3235b 100644
--- a/web/src/pages/Doc/en/search/index.md
+++ b/web/src/pages/Doc/en/search/index.md
@@ -12,7 +12,7 @@ import Search from 'simple-mind-map/src/plugins/Search.js'
 MindMap.usePlugin(Search)
 ```
 
-After registration and instantiation of `MindMap`, the instance can be obtained through `mindMap.Search`.
+After registration and instantiation of `MindMap`, the instance can be obtained through `mindMap.search`.
 
 ## Event
 
diff --git a/web/src/pages/Doc/en/search/index.vue b/web/src/pages/Doc/en/search/index.vue
index c47b9d40..26f7d4e9 100644
--- a/web/src/pages/Doc/en/search/index.vue
+++ b/web/src/pages/Doc/en/search/index.vue
@@ -10,7 +10,7 @@
 import Search from 'simple-mind-map/src/plugins/Search.js'
 MindMap.usePlugin(Search)
-

After registration and instantiation of MindMap, the instance can be obtained through mindMap.Search.

+

After registration and instantiation of MindMap, the instance can be obtained through mindMap.search.

Event

search_info_change

You can listen to 'search_info_change' event to get the number of current search results and the index currently located.

diff --git a/web/src/pages/Doc/routerList.js b/web/src/pages/Doc/routerList.js index 578b9aa2..88f8964b 100644 --- a/web/src/pages/Doc/routerList.js +++ b/web/src/pages/Doc/routerList.js @@ -29,6 +29,8 @@ export default [ { path: 'course20', title: '如何自定义节点内容' }, { path: 'course21', title: '如何复制、剪切、粘贴' }, { path: 'course22', title: '如何实现搜索、替换' }, + { path: 'course23', title: '如何渲染滚动条' }, + { path: 'course24', title: '如何开发一个插件' }, { path: 'doExport', title: 'Export 插件' }, { path: 'drag', title: 'Drag插件' }, { path: 'introduction', title: '简介' }, @@ -52,7 +54,8 @@ export default [ { path: 'nodeImgAdjust', title: 'NodeImgAdjust插件' }, { path: 'search', title: 'Search插件' }, { path: 'painter', title: 'Painter插件' }, - { path: 'help1', title: '概要/关联线' }, + { path: 'painter', title: 'Painter插件' }, + { path: 'scrollbar', title: 'Scrollbar插件' }, { path: 'help2', title: '客户端' } ] }, @@ -85,7 +88,8 @@ export default [ { path: 'touchEvent', title: 'TouchEvent plugin' }, { path: 'nodeImgAdjust', title: 'NodeImgAdjust plugin' }, { path: 'search', title: 'Search plugin' }, - { path: 'painter', title: 'Painter plugin' } + { path: 'painter', title: 'Painter plugin' }, + { path: 'scrollbar', title: 'Scrollbar plugin' } ] } ] diff --git a/web/src/pages/Doc/zh/changelog/index.md b/web/src/pages/Doc/zh/changelog/index.md index 4d670318..32722852 100644 --- a/web/src/pages/Doc/zh/changelog/index.md +++ b/web/src/pages/Doc/zh/changelog/index.md @@ -1,5 +1,129 @@ # Changelog +## 0.7.0 + +破坏性更新：删除了主题文件中节点激活样式的部分，不再支持设置节点的激活样式，激活效果改为统一的节点外边框样式，同时支持鼠标hover效果。 + +修复： + +> 1.修复节点边框尺寸比较大的情况下的的渲染异常问题。 +> +> 2.修复切换主题时存在关联线的节点样式不会更新的问题。 +> +> 3.修复全选没有触发node_active事件的问题。 + +新增： + +> 1.收起节点时，显示折叠的节点数量。 +> +> 2.支持关联线端点的位置跟随鼠标拖拽变化。 +> +> 3.新增滚动条插件。 +> +> 4.支持在url中通过fileURL查询参数打开指定的在线文件。 +> +> 5.鱼骨图支持设置节点margin。 +> +> 6.默认关闭双击复位画布。 +> +> 7.修改导出图片方法的参数,导出pdf时如果思维导图尺寸小于a4纸那么不旋转方向。 +> +> 8.提升导出的图片和pdf在高清屏的清晰度。 +> +> 9.插件新增销毁前生命周期函数，解决销毁思维导图时插件的一些副作用没有清除的问题。 +> +> 10.优化基础样式的设置，修改不影响大小的主题属性时不触发全量渲染。 +> +> 11.右键多选节点结束时禁止触发节点右键菜单事件，避免触发右键菜单显示。 +> +> 12.优化Select插件，如果多选节点没有变化，那么不触发激活激活事件。 +> +> 13.node_active事件抛出的激活节点列表不再直接引用内部激活列表。 +> +> 14.优化鼠标按下节点事件逻辑，在右键拖拽画布模式下支持右键按住根节点拖拽画布。 + +Demo： + +> 1.不直接引用内部激活节点列表，优化性能。 +> +> 2.支持配置是否显示滚动条。 +> +> 3.删除侧边栏节点样式配置部分的激活节点配置。 + +## 0.6.17 + +修复： + +> 1.修复导入百度脑图导出的xmind文件报错的问题。 +> +> 2.修复mindMap.export方法代码错误。 + +新增： + +> 1.新增index.d.ts。 +> +> 2.支持配置是否开启双击复位思维导图。 +> +> 3.拦截富文本编辑时的粘贴操作，去掉格式，只允许粘贴纯文本。 + +## 0.6.16 + +修复： + +> 1.优化富文本测量元素的逻辑，删除样式的重复设置和节点的重复添加。 +> +> 2.优化导出图片逻辑，遍历节点转换图片的url时，如果已经是data:URL形式不重复处理。 + +新增： + +> 1.去除导出svg方法的第二个参数，改为通过实例化配置。 +> +> 2.导出图片不再使用外部库。 + +Demo： + +> 1.修复单独编辑大纲时能给根节点添加兄弟节点的bug。 + +## 0.6.15-fix.2 + +修复：修复在Firefox浏览器中富文本节点无法显示的问题。 + +## 0.6.15-fix.1 + +新增： + +> 1.导出pdf支持根据图片大小分页导出。 +> +> 2.导出pdf支持根据长宽比自动调整方向。 +> +> 3.优化展开收起按钮的占位元素：1.没有子节点的节点不渲染该元素；2.根据是否存在子节点动态更新该元素。 +> +> 4.新增禁止鼠标滚轮缩放的配置。 +> +> 5.支持传递错误处理函数。 + +修复： + +> 1.修复节点文本为空时显示异常问题。 +> +> 2.导出svg的图形的paddingX和paddingY改为单侧padding。 +> +> 3.修复画布距浏览器窗口左上角不为0时鼠标缩放时不以鼠标为中心的问题。 +> +> 4.修复节点边框会重合的问题。 + +Demo： + +> 1.右下角支持跳转相关链接。 +> +> 2.调整小地图位置，解决被侧边按钮遮挡的问题。 +> +> 3.修复打开本地文件右上角的提示无法关闭的问题。 +> +> 4.单独编辑大纲不再和画布联动，优化大数据量下的编辑体验。 +> +> 5.侧边栏涉及图形的选项增加可视化效果。 + ## 0.6.14 新增： diff --git a/web/src/pages/Doc/zh/changelog/index.vue b/web/src/pages/Doc/zh/changelog/index.vue index a510b215..73cfeb0f 100644 --- a/web/src/pages/Doc/zh/changelog/index.vue +++ b/web/src/pages/Doc/zh/changelog/index.vue @@ -1,6 +1,90 @@ diff --git a/web/src/pages/Doc/zh/node/index.md b/web/src/pages/Doc/zh/node/index.md index dd7ea6a9..67706eb7 100644 --- a/web/src/pages/Doc/zh/node/index.md +++ b/web/src/pages/Doc/zh/node/index.md @@ -110,16 +110,20 @@ `root`：是否是根节点，默认`false` -`isActive`：获取的是否是激活状态的样式值，默认`false` +`isActive`：v0.7.0+已废弃，获取的是否是激活状态的样式值，默认`false` ### setStyle(prop, value, isActive) +`isActive`：v0.7.0+已废弃 + 修改节点的某个样式，`SET_NODE_STYLE`命令的快捷方法 ### setStyles(style, isActive) > v0.6.12+ +`isActive`：v0.7.0+已废弃 + 修改节点多个样式，`SET_NODE_STYLES`命令的快捷方法 ### getData(key) diff --git a/web/src/pages/Doc/zh/node/index.vue b/web/src/pages/Doc/zh/node/index.vue index ffc2a5cc..8642a410 100644 --- a/web/src/pages/Doc/zh/node/index.vue +++ b/web/src/pages/Doc/zh/node/index.vue @@ -64,13 +64,15 @@

获取某个最终应用到该节点的样式值

prop：要获取的样式属性

root：是否是根节点，默认false

-

isActive：获取的是否是激活状态的样式值，默认false

+

isActive：v0.7.0+已废弃，获取的是否是激活状态的样式值，默认false

setStyle(prop, value, isActive)

+

isActive：v0.7.0+已废弃

修改节点的某个样式，SET_NODE_STYLE命令的快捷方法

setStyles(style, isActive)

v0.6.12+

+

isActive：v0.7.0+已废弃

修改节点多个样式，SET_NODE_STYLES命令的快捷方法

getData(key)

获取该节点真实数据nodeData的data对象里的指定值，key不传返回这个data对象

diff --git a/web/src/pages/Doc/zh/richText/index.md b/web/src/pages/Doc/zh/richText/index.md index 1d5e27ee..21918196 100644 --- a/web/src/pages/Doc/zh/richText/index.md +++ b/web/src/pages/Doc/zh/richText/index.md @@ -18,6 +18,8 @@ `v0.6.13+`版本使用[dom-to-image-more](https://github.com/1904labs/dom-to-image-more)替换了`html2canvas`，解决了节点的颜色导出后不生效的问题。 +> dom-to-image-more兼容性比较差，在很多浏览器上导出图片都是空的，所以可以根据你自己的需求替换成html2canvas。 + ## 注册 ```js diff --git a/web/src/pages/Doc/zh/richText/index.vue b/web/src/pages/Doc/zh/richText/index.vue index 443ed88b..e4ca2b7f 100644 --- a/web/src/pages/Doc/zh/richText/index.vue +++ b/web/src/pages/Doc/zh/richText/index.vue @@ -18,6 +18,9 @@

v0.5.7+的版本直接使用html2canvas转换整个svg，速度不再是问题，但是目前存在一个bug，就是节点的颜色导出后不生效。

v0.6.13+版本使用dom-to-image-more替换了html2canvas，解决了节点的颜色导出后不生效的问题。

+
+

dom-to-image-more兼容性比较差，在很多浏览器上导出图片都是空的，所以可以根据你自己的需求替换成html2canvas。

+

注册

import MindMap from 'simple-mind-map'
 import RichText from 'simple-mind-map/src/plugins/RichText.js'
diff --git a/web/src/pages/Doc/zh/scrollbar/index.md b/web/src/pages/Doc/zh/scrollbar/index.md
new file mode 100644
index 00000000..49a20d1e
--- /dev/null
+++ b/web/src/pages/Doc/zh/scrollbar/index.md
@@ -0,0 +1,64 @@
+# Scrollbar 插件
+
+> v0.7.0+
+
+该插件用于帮助开发水平和垂直滚动条的功能。
+
+## 注册
+
+```js
+import MindMap from 'simple-mind-map'
+import Scrollbar from 'simple-mind-map/src/plugins/Scrollbar.js'
+MindMap.usePlugin(Scrollbar)
+```
+
+注册完且实例化`MindMap`后可通过`mindMap.scrollbar`获取到该实例。
+
+## 事件
+
+#### scrollbar_change
+
+当滚动条数据发生改变时触发，你可以监听该事件来更新滚动条位置和大小。
+
+## 方法
+
+### setScrollBarWrapSize(width, height)
+
+- `width`：Number，你的滚动条容器元素的宽度。
+
+- `height`： Number，你的滚动条容器元素的高度。
+
+设置滚动条容器的大小，对于水平滚动条，即容器的宽度，对于垂直滚动条，即容器的高度。当你的滚动条容器尺寸改变时需要再次调用该方法。
+
+### calculationScrollbar()
+
+> 需要先调用setScrollBarWrapSize方法设置滚动条容器元素的宽高。
+>
+> 一般需要监听scrollbar_change事件，然后调用该方法更新滚动条。
+
+返回值：
+
+```js
+{
+    // 垂直滚动条
+    vertical: {
+        top,
+        height
+    },
+    // 水平滚动条
+    horizontal: {
+        left,
+        width
+    }
+}
+```
+
+获取滚动条大小和位置，你可以根据返回值来设置到滚动条元素上，达到渲染和关心滚动条的效果。
+
+### onMousedown(e, type)
+
+- `e`：鼠标按下事件的事件对象。
+
+- `type`：按下的滚动条类型，vertical（垂直滚动条）、horizontal（水平滚动条）。
+
+滚动条元素的鼠标按下事件时需要调用该方法。
\ No newline at end of file
diff --git a/web/src/pages/Doc/zh/scrollbar/index.vue b/web/src/pages/Doc/zh/scrollbar/index.vue
new file mode 100644
index 00000000..fc06ba0f
--- /dev/null
+++ b/web/src/pages/Doc/zh/scrollbar/index.vue
@@ -0,0 +1,70 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/web/src/pages/Edit/components/BaseStyle.vue b/web/src/pages/Edit/components/BaseStyle.vue
index 8edc0778..f4cf10c9 100644
--- a/web/src/pages/Edit/components/BaseStyle.vue
+++ b/web/src/pages/Edit/components/BaseStyle.vue
@@ -137,6 +137,12 @@
               :label="item"
               :value="item"
             >
+              
             
           
         
@@ -160,6 +166,12 @@
               :key="item.value"
               :label="item.name"
               :value="item.value"
+              class="lineStyleOption"
+              :class="{
+                isDark: isDark,
+                isSelected: style.lineStyle === item.value
+              }"
+              v-html="lineStyleMap[item.value]"
             >
             
           
@@ -227,6 +239,12 @@
               :label="item"
               :value="item"
             >
+              
             
           
         
@@ -271,6 +289,12 @@
               :label="item"
               :value="item"
             >
+              
             
           
         
@@ -317,6 +341,12 @@
               :label="item"
               :value="item"
             >
+              
             
           
         
@@ -723,6 +753,16 @@
           
         
       
+      
+      

+        

+          {{ $t('baseStyle.isShowScrollbar') }}
+        

+      

     
   
 
@@ -738,7 +778,8 @@ import {
   backgroundSizeList,
   fontFamilyList,
   fontSizeList,
-  rootLineKeepSameInCurveList
+  rootLineKeepSameInCurveList,
+  lineStyleMap
 } from '@/config'
 import ImgUpload from '@/components/ImgUpload'
 import { storeConfig } from '@/api'
@@ -817,7 +858,10 @@ export default {
         }
       },
       updateWatermarkTimer: null,
-      enableNodeRichText: true
+      enableNodeRichText: true,
+      localConfigs: {
+        isShowScrollbar: false
+      }
     }
   },
   computed: {
@@ -845,6 +889,9 @@ export default {
     },
     fontFamilyList() {
       return fontFamilyList[this.$i18n.locale] || fontFamilyList.zh
+    },
+    lineStyleMap() {
+      return lineStyleMap[this.$i18n.locale] || lineStyleMap.zh
     }
   },
   watch: {
@@ -860,9 +907,7 @@ export default {
     }
   },
   created() {
-    this.enableNodeRichText = this.localConfig.openNodeRichText
-    this.mousewheelAction = this.localConfig.mousewheelAction
-    this.mousewheelZoomActionReverse = this.localConfig.mousewheelZoomActionReverse
+    this.initLoacalConfig()
     this.$bus.$on('setData', this.onSetData)
   },
   beforeDestroy() {
@@ -929,6 +974,18 @@ export default {
       })
     },
 
+    // 初始化本地配置
+    initLoacalConfig() {
+      this.enableNodeRichText = this.localConfig.openNodeRichText
+      this.mousewheelAction = this.localConfig.mousewheelAction
+      this.mousewheelZoomActionReverse = this.localConfig.mousewheelZoomActionReverse
+      ;[
+        'isShowScrollbar'
+      ].forEach(key => {
+        this.localConfigs[key] = this.localConfig[key]
+      })
+    },
+
     // 初始化水印配置
     initWatermark() {
       let config = this.mindMap.getConfig('watermarkConfig')
@@ -1004,11 +1061,7 @@ export default {
       }, 300)
     },
 
-    /**
-     * @Author: 王林
-     * @Date: 2021-07-03 22:08:12
-     * @Desc: 设置margin
-     */
+    // 设置margin
     updateMargin(type, value) {
       this.style[type] = value
       if (!this.data.theme.config[this.marginActiveTab]) {
@@ -1044,12 +1097,11 @@ export default {
       })
     },
 
-    // 切换鼠标滚轮的行为
-    mousewheelActionChange(e) {
+    // 本地配置
+    updateLocalConfig(key, value) {
       this.setLocalConfig({
-        mousewheelAction: e
+        [key]: value
       })
-      this.mindMap.updateConfig
     }
   }
 }
@@ -1158,4 +1210,47 @@ export default {
     }
   }
 }
+
+.borderLine {
+  display: inline-block;
+  width: 100%;
+  background-color: #000;
+
+  &.isDark {
+    background-color: #fff;
+  }
+}
+
+
diff --git a/web/src/pages/Edit/components/Edit.vue b/web/src/pages/Edit/components/Edit.vue
index 2bff902d..e3f73d88 100644
--- a/web/src/pages/Edit/components/Edit.vue
+++ b/web/src/pages/Edit/components/Edit.vue
@@ -22,6 +22,7 @@
     
     
     
+    
   
 
 
@@ -42,6 +43,7 @@ import NodeImgAdjust from 'simple-mind-map/src/plugins/NodeImgAdjust.js'
 import SearchPlugin from 'simple-mind-map/src/plugins/Search.js'
 import { downloadFile, readBlob } from 'simple-mind-map/src/utils/index'
 import Painter from 'simple-mind-map/src/plugins/Painter.js'
+import ScrollbarPlugin from 'simple-mind-map/src/plugins/Scrollbar.js'
 import OutlineSidebar from './OutlineSidebar'
 import Style from './Style'
 import BaseStyle from './BaseStyle'
@@ -73,6 +75,8 @@ import { removeMindMapNodeStickerProtocol, addMindMapNodeStickerProtocol } from
 import OutlineEdit from './OutlineEdit.vue'
 import { showLoading, hideLoading } from '@/utils/loading'
 import handleClipboardText from '@/utils/handleClipboardText'
+import Scrollbar from './Scrollbar.vue'
+import exampleData from 'simple-mind-map/example/exampleData'
 
 // 注册插件
 MindMap.usePlugin(MiniMap)
@@ -88,6 +92,7 @@ MindMap.usePlugin(MiniMap)
   .usePlugin(TouchEvent)
   .usePlugin(SearchPlugin)
   .usePlugin(Painter)
+  .usePlugin(ScrollbarPlugin)
 
 // 注册自定义主题
 customThemeList.forEach(item => {
@@ -119,7 +124,8 @@ export default {
     Search,
     NodeIconSidebar,
     NodeIconToolbar,
-    OutlineEdit
+    OutlineEdit,
+    Scrollbar
   },
   data() {
     return {
@@ -139,7 +145,8 @@ export default {
       isZenMode: state => state.localConfig.isZenMode,
       openNodeRichText: state => state.localConfig.openNodeRichText,
       useLeftKeySelectionRightKeyDrag: state =>
-        state.localConfig.useLeftKeySelectionRightKeyDrag
+        state.localConfig.useLeftKeySelectionRightKeyDrag,
+      isShowScrollbar: state => state.localConfig.isShowScrollbar
     })
   },
   watch: {
@@ -267,7 +274,7 @@ export default {
           storeConfig({
             view: data
           })
-        }, 1000)
+        }, 300)
       })
     },
 
@@ -296,7 +303,20 @@ export default {
      * @Desc: 初始化
      */
     init() {
+      let hasFileURL = this.hasFileURL()
       let { root, layout, theme, view, config } = this.mindMapData
+      // 如果url中存在要打开的文件，那么思维导图数据、主题、布局都使用默认的
+      if (hasFileURL) {
+        root = {
+          "data": {
+              "text": "根节点"
+          },
+          "children": []
+        }
+        layout = exampleData.layout
+        theme = exampleData.theme
+        view = null
+      }
       this.mindMap = new MindMap({
         el: this.$refs.mindMapContainer,
         data: root,
@@ -344,7 +364,24 @@ export default {
         //   })
         //   comp.$mount(el)
         //   return comp.$el
-        // }
+        // },
+        // 示例3：普通元素
+        // customCreateNodeContent: (node) => {
+        //   let el = document.createElement('div')
+        //   el.style.cssText = `
+        //     width: 203px;
+        //     height: 78px;
+        //     opacity: 0.8;
+        //     background-image: linear-gradient(0deg, rgba(53,130,172,0.06) 0%, rgba(24,75,116,0.06) 100%);
+        //     box-shadow: inset 0 1px 15px 0 rgba(119,196,255,0.40);
+        //     border-radius: 2px;
+        //     display: flex;
+        //     justify-content: center;
+        //     align-items: center;
+        //   `
+        //   el.innerHTML = node.nodeData.data.text
+        //   return el
+        // },
       })
       if (this.openNodeRichText) this.addRichTextPlugin()
       // this.mindMap.keyCommand.addShortcut('Control+s', () => {
@@ -368,7 +405,8 @@ export default {
         'transforming-dom-to-images',
         'generalization_node_contextmenu',
         'painter_start',
-        'painter_end'
+        'painter_end',
+        'scrollbar_change'
       ].forEach(event => {
         this.mindMap.on(event, (...args) => {
           this.$bus.$emit(event, ...args)
@@ -393,6 +431,17 @@ export default {
       if (window.takeOverApp) {
         this.$bus.$emit('app_inited', this.mindMap)
       }
+      // 解析url中的文件
+      if (hasFileURL) {
+        this.$bus.$emit('handle_file_url')
+      }
+    },
+
+    // url中是否存在要打开的文件
+    hasFileURL() {
+      const fileURL = this.$route.query.fileURL
+      if (!fileURL) return false
+      return /\.(smm|json|xmind|md|xlsx)$/.test(fileURL)
     },
 
     /**
diff --git a/web/src/pages/Edit/components/Export.vue b/web/src/pages/Edit/components/Export.vue
index 1ec7e012..7fa922bc 100644
--- a/web/src/pages/Edit/components/Export.vue
+++ b/web/src/pages/Edit/components/Export.vue
@@ -53,6 +53,12 @@
           style="margin-left: 12px"
           >{{ $t('export.isTransparent') }}
+        {{ $t('export.useMultiPageExport') }}
       
       

         

     

     

-      
+      
+        

+        
+          Github
+          使用文档
+          开发文档
+          官方网站
+          意见反馈
+        
+      
     

   
 
@@ -114,7 +123,7 @@ export default {
   computed: {
     ...mapState(['isDark'])
   },
-  created () {
+  created() {
     this.lang = getLang()
   },
   methods: {
@@ -145,6 +154,33 @@ export default {
 
     toggleDark() {
       this.setIsDark(!this.isDark)
+    },
+
+    handleCommand(command) {
+      let url = ''
+      switch (command) {
+        case 'github':
+          url = 'https://github.com/wanglin2/mind-map'
+          break
+        case 'helpDoc':
+          url = 'https://wanglin2.github.io/mind-map/#/help/zh/'
+          break
+        case 'devDoc':
+          url = 'https://wanglin2.github.io/mind-map/#/doc/zh/introduction/'
+          break
+        case 'site':
+          url = 'https://wanglin2.github.io/mind-map/#/index'
+          break
+        case 'issue':
+          url = 'https://github.com/wanglin2/mind-map/issues/new'
+          break
+        default:
+          break
+      }
+      const a = document.createElement('a')
+      a.href = url
+      a.target = '_blank'
+      a.click()
     }
   }
 }
diff --git a/web/src/pages/Edit/components/NodeHyperlink.vue b/web/src/pages/Edit/components/NodeHyperlink.vue
index f2002044..0ce20506 100644
--- a/web/src/pages/Edit/components/NodeHyperlink.vue
+++ b/web/src/pages/Edit/components/NodeHyperlink.vue
@@ -59,7 +59,7 @@ export default {
   },
   methods: {
     handleNodeActive(...args) {
-      this.activeNodes = args[1]
+      this.activeNodes = [...args[1]]
       if (this.activeNodes.length > 0) {
         let firstNode = this.activeNodes[0]
         this.link = firstNode.getData('hyperlink')
diff --git a/web/src/pages/Edit/components/NodeIcon.vue b/web/src/pages/Edit/components/NodeIcon.vue
index 6cc5e6db..eab91dfb 100644
--- a/web/src/pages/Edit/components/NodeIcon.vue
+++ b/web/src/pages/Edit/components/NodeIcon.vue
@@ -52,7 +52,7 @@ export default {
   },
   methods: {
     handleNodeActive(...args) {
-      this.activeNodes = args[1]
+      this.activeNodes = [...args[1]]
       if (this.activeNodes.length > 0) {
         let firstNode = this.activeNodes[0]
         this.iconList = firstNode.getData('icon') || []
diff --git a/web/src/pages/Edit/components/NodeIconSidebar.vue b/web/src/pages/Edit/components/NodeIconSidebar.vue
index 01e2fbdb..168eb970 100644
--- a/web/src/pages/Edit/components/NodeIconSidebar.vue
+++ b/web/src/pages/Edit/components/NodeIconSidebar.vue
@@ -92,7 +92,7 @@ export default {
   },
   methods: {
     handleNodeActive(...args) {
-      this.activeNodes = args[1]
+      this.activeNodes = [...args[1]]
       if (this.activeNodes.length > 0) {
         let firstNode = this.activeNodes[0]
         this.nodeImage = firstNode.getData('image')
diff --git a/web/src/pages/Edit/components/NodeImage.vue b/web/src/pages/Edit/components/NodeImage.vue
index 649e7590..9bd2b8c2 100644
--- a/web/src/pages/Edit/components/NodeImage.vue
+++ b/web/src/pages/Edit/components/NodeImage.vue
@@ -68,7 +68,7 @@ export default {
   },
   methods: {
     handleNodeActive(...args) {
-      this.activeNodes = args[1]
+      this.activeNodes = [...args[1]]
     },
 
     handleShowNodeImage() {
diff --git a/web/src/pages/Edit/components/NodeNote.vue b/web/src/pages/Edit/components/NodeNote.vue
index 6567e139..31e98af2 100644
--- a/web/src/pages/Edit/components/NodeNote.vue
+++ b/web/src/pages/Edit/components/NodeNote.vue
@@ -52,7 +52,7 @@ export default {
   },
   methods: {
     handleNodeActive(...args) {
-      this.activeNodes = args[1]
+      this.activeNodes = [...args[1]]
       if (this.activeNodes.length > 0) {
         let firstNode = this.activeNodes[0]
         this.note = firstNode.getData('note')
diff --git a/web/src/pages/Edit/components/NodeTag.vue b/web/src/pages/Edit/components/NodeTag.vue
index 7b7de7a7..ddf8e390 100644
--- a/web/src/pages/Edit/components/NodeTag.vue
+++ b/web/src/pages/Edit/components/NodeTag.vue
@@ -69,7 +69,7 @@ export default {
   },
   methods: {
     handleNodeActive(...args) {
-      this.activeNodes = args[1]
+      this.activeNodes = [...args[1]]
       if (this.activeNodes.length > 0) {
         let firstNode = this.activeNodes[0]
         this.tagArr = firstNode.getData('tag') || []
diff --git a/web/src/pages/Edit/components/Outline.vue b/web/src/pages/Edit/components/Outline.vue
index 615ae042..11b58824 100644
--- a/web/src/pages/Edit/components/Outline.vue
+++ b/web/src/pages/Edit/components/Outline.vue
@@ -69,7 +69,7 @@ export default {
     }
   },
   computed: {
-    ...mapState(['isDark', 'isOutlineEdit'])
+    ...mapState(['isDark'])
   },
   created() {
     window.addEventListener('keydown', this.onKeyDown)
diff --git a/web/src/pages/Edit/components/OutlineEdit.vue b/web/src/pages/Edit/components/OutlineEdit.vue
index eb125758..c4b76049 100644
--- a/web/src/pages/Edit/components/OutlineEdit.vue
+++ b/web/src/pages/Edit/components/OutlineEdit.vue
@@ -10,7 +10,38 @@
     
     

       

-        
+        
+          
+            
+          
+        
       

     

   
@@ -18,39 +49,193 @@
 
 
+
+
diff --git a/web/src/pages/Edit/components/Style.vue b/web/src/pages/Edit/components/Style.vue
index 3c6759dc..d70844e0 100644
--- a/web/src/pages/Edit/components/Style.vue
+++ b/web/src/pages/Edit/components/Style.vue
@@ -1,11 +1,11 @@