+ 欣
+ mindMap.export(type, isDownload, fileName, ...)
type：文件类型
isDownload：传true会触发下载，false则不会，函数会返回导出文件的数据，data:url格式，你可以自行下载，pdf不支持该参数，默认会直接下载。
isDownload：传true会触发下载，false则不会，函数会返回导出文件的数据，data:url格式，你可以自行下载，（v0.9.2之前的版本，pdf不支持该参数，默认会直接下载）。
fileName：下载的文件名称
这两种文件的导出是一样的：
diff --git a/web/src/pages/Doc/zh/doExport/index.md b/web/src/pages/Doc/zh/doExport/index.md index 5e316b16..6ed31653 100644 --- a/web/src/pages/Doc/zh/doExport/index.md +++ b/web/src/pages/Doc/zh/doExport/index.md @@ -88,7 +88,9 @@ svg( - `transparent`：v0.9.2+，Boolean，默认为false，指定导出图片的背景是否是透明的 -导出为`pdf`，和其他导出方法不一样，这个方法不会返回数据，会直接触发下载。 +导出为`pdf`， + +> v0.9.3之前的版本这个方法不会返回数据，会直接触发下载。 > v0.6.0版本以后，需要额外注册一个ExportPDF插件 diff --git a/web/src/pages/Doc/zh/doExport/index.vue b/web/src/pages/Doc/zh/doExport/index.vue index 70803d94..ba87aa09 100644 --- a/web/src/pages/Doc/zh/doExport/index.vue +++ b/web/src/pages/Doc/zh/doExport/index.vue @@ -90,7 +90,10 @@ a.click()transparent：v0.9.2+，Boolean，默认为false，指定导出图片的背景是否是透明的
导出为pdf，和其他导出方法不一样，这个方法不会返回数据，会直接触发下载。
导出为pdf，
+v0.9.3之前的版本这个方法不会返回数据，会直接触发下载。
+
From ee97731e18dacafe8a9d076094221e2a36e2a8c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A1=97=E8=A7=92=E5=B0=8F=E6=9E=97?= <1013335014@qq.com> Date: Thu, 28 Dec 2023 17:30:58 +0800 Subject: [PATCH 03/21] =?UTF-8?q?Feat=EF=BC=9A=E8=AE=BE=E7=BD=AE=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E6=96=87=E6=9C=AC=E5=91=BD=E4=BB=A4=E7=9A=84=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E4=B8=AA=E5=8F=82=E6=95=B0=E5=A6=82=E6=9E=9C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E4=BC=A0=E9=80=92=EF=BC=8C=E4=BC=9A=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=9A=84=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simple-mind-map/src/core/render/Render.js | 1 + 1 file changed, 1 insertion(+) diff --git a/simple-mind-map/src/core/render/Render.js b/simple-mind-map/src/core/render/Render.js index 76ae08cb..25c10d7a 100644 --- a/simple-mind-map/src/core/render/Render.js +++ b/simple-mind-map/src/core/render/Render.js @@ -1419,6 +1419,7 @@ class Render { // 设置节点文本 setNodeText(node, text, richText, resetRichText) { + richText = richText === undefined ? node.getData('richText') : richText this.setNodeDataRender(node, { text, richText, From f087b7102e3afc75a0bb49af2d17707706e0d998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A1=97=E8=A7=92=E5=B0=8F=E6=9E=97?= <1013335014@qq.com> Date: Thu, 28 Dec 2023 18:49:31 +0800 Subject: [PATCH 04/21] =?UTF-8?q?Fix=EF=BC=9A=E4=BC=98=E5=8C=96=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=AD=98=E5=9C=A8=E8=B6=85=E9=93=BE=E6=8E=A5=E3=80=81?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E6=97=B6=E5=9C=A8firefox=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E5=99=A8=E4=B8=AD=E5=AF=BC=E5=87=BA=E5=9B=BE=E7=89=87=E7=9A=84?= =?UTF-8?q?=E5=AE=BD=E9=AB=98=E4=B8=8D=E4=B9=8B=E5=89=8D=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simple-mind-map/src/core/render/node/nodeCreateContents.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/simple-mind-map/src/core/render/node/nodeCreateContents.js b/simple-mind-map/src/core/render/node/nodeCreateContents.js index d6528a5f..206e97fd 100644 --- a/simple-mind-map/src/core/render/node/nodeCreateContents.js +++ b/simple-mind-map/src/core/render/node/nodeCreateContents.js @@ -240,7 +240,7 @@ function createHyperlinkNode() { return } let iconSize = this.mindMap.themeConfig.iconSize - let node = new SVG() + let node = new SVG().size(iconSize, iconSize) // 超链接节点 let a = new A().to(hyperlink).target('_blank') a.node.addEventListener('click', e => { @@ -298,7 +298,7 @@ function createNoteNode() { return null } let iconSize = this.mindMap.themeConfig.iconSize - let node = new SVG().attr('cursor', 'pointer') + let node = new SVG().attr('cursor', 'pointer').size(iconSize, iconSize) // 透明的层，用来作为鼠标区域 node.add(new Rect().size(iconSize, iconSize).fill({ color: 'transparent' })) // 备注图标 From 794d3e9a53fffb32c912503d046f7cdef79adf98 Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Thu, 28 Dec 2023 21:36:45 +0800 Subject: [PATCH 05/21] =?UTF-8?q?Fix:=E4=BF=AE=E5=A4=8Dsafari=E6=B5=8F?= =?UTF-8?q?=E8=A7=88=E5=99=A8=E8=8A=82=E7=82=B9=E5=AD=98=E5=9C=A8=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E6=97=B6=E6=96=87=E5=AD=97=E4=BD=8D=E7=BD=AE=E9=94=99?= =?UTF-8?q?=E4=BD=8D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simple-mind-map/src/core/render/node/Node.js | 3 ++- simple-mind-map/src/core/render/node/nodeCreateContents.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/simple-mind-map/src/core/render/node/Node.js b/simple-mind-map/src/core/render/node/Node.js index af47745a..c382b087 100644 --- a/simple-mind-map/src/core/render/node/Node.js +++ b/simple-mind-map/src/core/render/node/Node.js @@ -360,7 +360,8 @@ class Node { // 文字 if (this._textData) { this._textData.node.attr('data-offsetx', textContentOffsetX) - this._textData.node.x(textContentOffsetX).y(0) + // 修复safari浏览器节点存在图标时文字位置不正确的问题 + ;(this._textData.nodeContent || this._textData.node).x(textContentOffsetX).y(0) textContentNested.add(this._textData.node) textContentOffsetX += this._textData.width + textContentItemMargin } diff --git a/simple-mind-map/src/core/render/node/nodeCreateContents.js b/simple-mind-map/src/core/render/node/nodeCreateContents.js index 206e97fd..86c3bc19 100644 --- a/simple-mind-map/src/core/render/node/nodeCreateContents.js +++ b/simple-mind-map/src/core/render/node/nodeCreateContents.js @@ -170,6 +170,7 @@ function createRichTextNode() { g.add(foreignObject) return { node: g, + nodeContent: foreignObject, width, height } From eb50b702145ef5b7de58a0edfe00323d01311fa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A1=97=E8=A7=92=E5=B0=8F=E6=9E=97?= <1013335014@qq.com> Date: Fri, 29 Dec 2023 16:47:30 +0800 Subject: [PATCH 06/21] =?UTF-8?q?Fix=EF=BC=9A=E4=BF=AE=E5=A4=8DChrome?= =?UTF-8?q?=E4=BD=8E=E7=89=88=E6=9C=AC=E5=85=AC=E5=BC=8F=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=B8=B2=E6=9F=93=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simple-mind-map/src/plugins/Formula.js | 24 +++++++++++++++++++----- simple-mind-map/src/utils/index.js | 9 +++++++++ 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/simple-mind-map/src/plugins/Formula.js b/simple-mind-map/src/plugins/Formula.js index 82783e51..624404d2 100644 --- a/simple-mind-map/src/plugins/Formula.js +++ b/simple-mind-map/src/plugins/Formula.js @@ -1,5 +1,7 @@ import katex from 'katex' import Quill from 'quill' +import 'katex/dist/katex.min.css' +import { getChromeVersion } from '../utils/index' // 数学公式支持插件 // 该插件在富文本模式下可用 @@ -12,19 +14,31 @@ class Formula { this.extendQuill() } + // 获取katex配置 + getKatexConfig() { + const config = { + throwOnError: false, + errorColor: '#f00', + output: 'mathml' // 默认只输出公式 + } + // Chrome内核100以下，mathml配置公式无法正确渲染 + const chromeVersion = getChromeVersion() + if (chromeVersion && chromeVersion <= 100) { + config.output = 'html' + } + return config + } + // 修改formula格式工具 extendQuill() { const QuillFormula = Quill.import('formats/formula') + const self = this class CustomFormulaBlot extends QuillFormula { static create(value) { let node = super.create(value) if (typeof value === 'string') { - katex.render(value, node, { - throwOnError: false, - errorColor: '#f00', - output: 'mathml' // 增加该配置，默认只输出公式 - }) + katex.render(value, node, self.getKatexConfig()) node.setAttribute('data-value', value) } return node diff --git a/simple-mind-map/src/utils/index.js b/simple-mind-map/src/utils/index.js index 824f4386..b0f3ebec 100644 --- a/simple-mind-map/src/utils/index.js +++ b/simple-mind-map/src/utils/index.js @@ -1018,3 +1018,12 @@ export const checkNodeListIsEqual = (list1, list2) => { } return true } + +// 获取浏览器的chrome内核版本 +export const getChromeVersion = () => { + const match = navigator.userAgent.match(/\s+Chrome\/(.*)\s+/) + if (match && match[1]) { + return Number.parseFloat(match[1]) + } + return '' +} From c0fb1e8db8734babfe969911444f9a67dc2e7469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A1=97=E8=A7=92=E5=B0=8F=E6=9E=97?= <1013335014@qq.com> Date: Fri, 29 Dec 2023 16:48:23 +0800 Subject: [PATCH 07/21] =?UTF-8?q?Demo=EF=BC=9A=E5=85=AC=E5=BC=8Fkatex?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E9=85=8D=E7=BD=AE=E4=BB=8Esimple-mind-map?= =?UTF-8?q?=E5=BA=93=E4=B8=AD=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/pages/Edit/components/FormulaSidebar.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/src/pages/Edit/components/FormulaSidebar.vue b/web/src/pages/Edit/components/FormulaSidebar.vue index 53fd655f..cc5ca88c 100644 --- a/web/src/pages/Edit/components/FormulaSidebar.vue +++ b/web/src/pages/Edit/components/FormulaSidebar.vue @@ -78,10 +78,10 @@ export default { init() { this.list = formulaList.map(item => { return { - overview: window.katex.renderToString(item, { - throwOnError: false, - output: 'mathml' - }), + overview: window.katex.renderToString( + item, + this.mindMap.formula.getKatexConfig() + ), text: item } }) From 1409b07fb3201c235e6f1bd2ddc648b9bbec84b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A1=97=E8=A7=92=E5=B0=8F=E6=9E=97?= <1013335014@qq.com> Date: Fri, 29 Dec 2023 17:46:58 +0800 Subject: [PATCH 08/21] =?UTF-8?q?Feat=EF=BC=9A=E8=8A=82=E7=82=B9=E5=AF=8C?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91=E4=B8=AD=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E7=B2=98=E8=B4=B4=E7=9A=84=E6=98=AFsmm=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E9=82=A3=E4=B9=88?= =?UTF-8?q?=E5=8F=96=E5=87=BA=E7=AC=AC=E4=B8=80=E4=B8=AA=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E7=9A=84=E7=BA=AF=E6=96=87=E6=9C=AC=E8=BF=9B=E8=A1=8C=E7=B2=98?= =?UTF-8?q?=E8=B4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simple-mind-map/src/core/render/Render.js | 33 ++++++++++------------- simple-mind-map/src/plugins/RichText.js | 18 ++++++++++--- simple-mind-map/src/utils/index.js | 31 +++++++++++++++++++++ 3 files changed, 60 insertions(+), 22 deletions(-) diff --git a/simple-mind-map/src/core/render/Render.js b/simple-mind-map/src/core/render/Render.js index 25c10d7a..01266d3f 100644 --- a/simple-mind-map/src/core/render/Render.js +++ b/simple-mind-map/src/core/render/Render.js @@ -26,7 +26,9 @@ import { getDataFromClipboard, htmlEscape, parseAddGeneralizationNodeList, - checkNodeListIsEqual + checkNodeListIsEqual, + createSmmFormatData, + checkSmmFormatData } from '../../utils' import { shapeList } from './node/Shape' import { lineStyleProps } from '../../themes/default' @@ -876,20 +878,14 @@ class Render { copy() { this.beingCopyData = this.copyNode() if (!this.beingCopyData) return - setDataToClipboard({ - simpleMindMap: true, - data: this.beingCopyData - }) + setDataToClipboard(createSmmFormatData(this.beingCopyData)) } // 剪切节点 cut() { this.mindMap.execCommand('CUT_NODE', copyData => { this.beingCopyData = copyData - setDataToClipboard({ - simpleMindMap: true, - data: copyData - }) + setDataToClipboard(createSmmFormatData(copyData)) }) } @@ -936,10 +932,11 @@ class Render { const res = await this.mindMap.opt.customHandleClipboardText(text) if (!isUndef(res)) { useDefault = false - if (typeof res === 'object' && res.simpleMindMap) { - smmData = res.data + const checkRes = checkSmmFormatData(res) + if (checkRes.isSmm) { + smmData = checkRes.data } else { - text = String(res) + text = checkRes.data } } } catch (error) { @@ -948,13 +945,11 @@ class Render { } // 默认处理 if (useDefault) { - try { - const parsedData = JSON.parse(text) - if (parsedData && parsedData.simpleMindMap) { - smmData = parsedData.data - } - } catch (error) { - errorHandler(ERROR_TYPES.PARSE_PASTE_DATA_ERROR, error) + const checkRes = checkSmmFormatData(text) + if (checkRes.isSmm) { + smmData = checkRes.data + } else { + text = checkRes.data } } if (smmData) { diff --git a/simple-mind-map/src/plugins/RichText.js b/simple-mind-map/src/plugins/RichText.js index 92dfd723..156f39c5 100644 --- a/simple-mind-map/src/plugins/RichText.js +++ b/simple-mind-map/src/plugins/RichText.js @@ -6,7 +6,8 @@ import { getTextFromHtml, isWhite, getVisibleColorFromTheme, - isUndef + isUndef, + checkSmmFormatData } from '../utils' import { CONSTANTS } from '../constants/constant' @@ -397,7 +398,7 @@ class RichText { // 拦截粘贴，只允许粘贴纯文本 this.quill.clipboard.addMatcher(Node.TEXT_NODE, node => { let style = this.getPasteTextStyle() - return new Delta().insert(node.data, style) + return new Delta().insert(this.formatPasteText(node.data), style) }) this.quill.clipboard.addMatcher(Node.ELEMENT_NODE, (node, delta) => { let ops = [] @@ -407,7 +408,7 @@ class RichText { if (op.insert && typeof op.insert === 'string' && op.insert !== '\n') { ops.push({ attributes: { ...style }, - insert: op.insert + insert: this.formatPasteText(op.insert) }) } }) @@ -428,6 +429,17 @@ class RichText { return {} } + // 处理粘贴的文本内容 + formatPasteText(text) { + const { isSmm, data } = checkSmmFormatData(text) + if (isSmm && data[0] && data[0].data) { + // 只取第一个节点的纯文本 + return getTextFromHtml(data[0].data.text) + } else { + return text + } + } + // 正则输入中文 onCompositionStart() { if (!this.showTextEdit) { diff --git a/simple-mind-map/src/utils/index.js b/simple-mind-map/src/utils/index.js index b0f3ebec..6417e79d 100644 --- a/simple-mind-map/src/utils/index.js +++ b/simple-mind-map/src/utils/index.js @@ -1027,3 +1027,34 @@ export const getChromeVersion = () => { } return '' } + +// 创建smm粘贴的粘贴数据 +export const createSmmFormatData = data => { + return { + simpleMindMap: true, + data + } +} + +// 检查是否是smm粘贴格式的数据 +export const checkSmmFormatData = data => { + let smmData = null + // 如果是字符串，则尝试解析为对象 + if (typeof data === 'string') { + try { + const parsedData = JSON.parse(data) + // 判断是否是对象，且存在属性标志 + if (typeof parsedData === 'object' && parsedData.simpleMindMap) { + smmData = parsedData.data + } + } catch (error) {} + } else if (typeof data === 'object' && data.simpleMindMap) { + // 否则如果是对象，则检查属性标志 + smmData = data.data + } + const isSmm = !!smmData + return { + isSmm, + data: isSmm ? smmData : String(data) + } +} From 0cfa21d4e6a8446213790bc6b46b3c6f3f8c8399 Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Fri, 29 Dec 2023 22:02:15 +0800 Subject: [PATCH 09/21] =?UTF-8?q?Feat:=E5=A2=9E=E5=8A=A0=E5=AF=B9=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E9=9D=9E=E5=AF=8C=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E7=B2=98=E8=B4=B4=E7=9A=84=E6=8B=A6=E6=88=AA?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simple-mind-map/src/core/render/TextEdit.js | 15 ++++++++++++++- simple-mind-map/src/utils/index.js | 16 ++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/simple-mind-map/src/core/render/TextEdit.js b/simple-mind-map/src/core/render/TextEdit.js index 620ba85a..6d96b1ea 100644 --- a/simple-mind-map/src/core/render/TextEdit.js +++ b/simple-mind-map/src/core/render/TextEdit.js @@ -3,7 +3,10 @@ import { checkNodeOuter, focusInput, selectAllInput, - htmlEscape + htmlEscape, + handleInputPasteText, + checkSmmFormatData, + getTextFromHtml } from '../../utils' import { ERROR_TYPES, CONSTANTS } from '../../constants/constant' @@ -226,6 +229,16 @@ export default class TextEdit { e.stopPropagation() } }) + this.textEditNode.addEventListener('paste', e => { + const text = e.clipboardData.getData('text') + const { isSmm, data } = checkSmmFormatData(text) + if (isSmm && data[0] && data[0].data) { + // 只取第一个节点的纯文本 + handleInputPasteText(e, getTextFromHtml(data[0].data.text)) + } else { + handleInputPasteText(e) + } + }) const targetNode = this.mindMap.opt.customInnerElsAppendTo || document.body targetNode.appendChild(this.textEditNode) diff --git a/simple-mind-map/src/utils/index.js b/simple-mind-map/src/utils/index.js index 6417e79d..6fdf0230 100644 --- a/simple-mind-map/src/utils/index.js +++ b/simple-mind-map/src/utils/index.js @@ -1058,3 +1058,19 @@ export const checkSmmFormatData = data => { data: isSmm ? smmData : String(data) } } + +// 处理输入框的粘贴事件，会去除文本的html格式、换行 +export const handleInputPasteText = (e, text) => { + e.preventDefault() + const selection = window.getSelection() + if (!selection.rangeCount) return + selection.deleteFromDocument() + text = text || e.clipboardData.getData('text') + // 去除格式 + text = getTextFromHtml(text) + // 去除换行 + text = text.replaceAll(/\n/g, '') + const node = document.createTextNode(text) + selection.getRangeAt(0).insertNode(node) + selection.collapseToEnd() +} From 1bb7e431fb7030de79b373ca54bb702c6885c4d9 Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Fri, 29 Dec 2023 22:04:56 +0800 Subject: [PATCH 10/21] =?UTF-8?q?Demo:=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/pages/Doc/zh/course12/index.md | 2 +- web/src/pages/Doc/zh/course12/index.vue | 2 +- web/src/pages/Edit/components/Outline.vue | 17 +++-------------- web/src/pages/Edit/components/OutlineEdit.vue | 17 +++-------------- 4 files changed, 8 insertions(+), 30 deletions(-) diff --git a/web/src/pages/Doc/zh/course12/index.md b/web/src/pages/Doc/zh/course12/index.md index 97a72afd..3842b7d5 100644 --- a/web/src/pages/Doc/zh/course12/index.md +++ b/web/src/pages/Doc/zh/course12/index.md @@ -287,7 +287,7 @@ onPaste(e) { if (!selection.rangeCount) return selection.deleteFromDocument()// 删除当前选区，也就是如果当前用户在输入框中选择了一些文本，会被删除 // 从剪贴板里取出文本数据 - let text = (e.clipboardData || window.clipboardData).getData('text') + let text = e.clipboardData.getData('text') // 调用库提供的getTextFromHtml方法去除格式 text = getTextFromHtml(text) // 去除换行 diff --git a/web/src/pages/Doc/zh/course12/index.vue b/web/src/pages/Doc/zh/course12/index.vue index e8b68667..8ccdbd71 100644 --- a/web/src/pages/Doc/zh/course12/index.vue +++ b/web/src/pages/Doc/zh/course12/index.vue @@ -237,7 +237,7 @@ mindMap.execCommand('INSERT_CHILD_NODE'if (!selection.rangeCount) return selection.deleteFromDocument()// 删除当前选区，也就是如果当前用户在输入框中选择了一些文本，会被删除 // 从剪贴板里取出文本数据 - let text = (e.clipboardData || window.clipboardData).getData('text') + let text = e.clipboardData.getData('text') // 调用库提供的getTextFromHtml方法去除格式 text = getTextFromHtml(text) // 去除换行 diff --git a/web/src/pages/Edit/components/Outline.vue b/web/src/pages/Edit/components/Outline.vue index c6ba3b30..0e7d663e 100644 --- a/web/src/pages/Edit/components/Outline.vue +++ b/web/src/pages/Edit/components/Outline.vue @@ -41,9 +41,9 @@ import { mapState } from 'vuex' import { nodeRichTextToTextWithWrap, textToNodeRichTextWithWrap, - getTextFromHtml, createUid, - htmlEscape + htmlEscape, + handleInputPasteText } from 'simple-mind-map/src/utils' // 大纲树 @@ -212,18 +212,7 @@ export default { // 拦截粘贴事件 onPaste(e) { - e.preventDefault() - const selection = window.getSelection() - if (!selection.rangeCount) return - selection.deleteFromDocument() - let text = (e.clipboardData || window.clipboardData).getData('text') - // 去除格式 - text = getTextFromHtml(text) - // 去除换行 - text = text.replaceAll(/\n/g, '') - const node = document.createTextNode(text) - selection.getRangeAt(0).insertNode(node) - selection.collapseToEnd() + handleInputPasteText(e) }, // 生成唯一的key diff --git a/web/src/pages/Edit/components/OutlineEdit.vue b/web/src/pages/Edit/components/OutlineEdit.vue index aea3eea2..1ab514fd 100644 --- a/web/src/pages/Edit/components/OutlineEdit.vue +++ b/web/src/pages/Edit/components/OutlineEdit.vue @@ -52,10 +52,10 @@ import { mapState, mapMutations } from 'vuex' import { nodeRichTextToTextWithWrap, textToNodeRichTextWithWrap, - getTextFromHtml, createUid, simpleDeepClone, - htmlEscape + htmlEscape, + handleInputPasteText } from 'simple-mind-map/src/utils' import { storeData } from '@/api' @@ -211,18 +211,7 @@ export default { // 拦截粘贴事件 onPaste(e) { - e.preventDefault() - const selection = window.getSelection() - if (!selection.rangeCount) return - selection.deleteFromDocument() - let text = (e.clipboardData || window.clipboardData).getData('text') - // 去除格式 - text = getTextFromHtml(text) - // 去除换行 - text = text.replaceAll(/\n/g, '') - const node = document.createTextNode(text) - selection.getRangeAt(0).insertNode(node) - selection.collapseToEnd() + handleInputPasteText(e) }, // 生成唯一的key From 3a6a2544b228784792841a5f74092b488fe3429b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A1=97=E8=A7=92=E5=B0=8F=E6=9E=97?= <1013335014@qq.com> Date: Wed, 3 Jan 2024 17:29:22 +0800 Subject: [PATCH 11/21] Doc: update --- README.md | 26 +++++++++++--------- web/src/assets/avatar/欣.jpg | Bin 0 -> 39711 bytes web/src/pages/Doc/en/introduction/index.md | 4 +++ web/src/pages/Doc/en/introduction/index.vue | 4 +++ web/src/pages/Doc/zh/introduction/index.md | 4 +++ web/src/pages/Doc/zh/introduction/index.vue | 4 +++ 6 files changed, 31 insertions(+), 11 deletions(-) create mode 100644 web/src/assets/avatar/欣.jpg diff --git a/README.md b/README.md index ecc47c1a..37eb864a 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [](https://github.com/wanglin2/mind-map/network/members)  -> 一个简单&强大的Web思维导图 +> 一个简单&强大的 Web 思维导图 本项目包含两部分： @@ -27,7 +27,7 @@ Github：[releases](https://github.com/wanglin2/mind-map/releases)。 > 客户端版本会落后于在线版本，尝试最新功能请优先使用在线版。 -> 如果访问github比较慢，可以使用：http://lxqnsys.com/simple-mind-map/#/index +> 如果访问 github 比较慢，可以使用：http://lxqnsys.com/simple-mind-map/#/index # 特性 @@ -37,7 +37,7 @@ Github：[releases](https://github.com/wanglin2/mind-map/releases)。 - [x] 节点内容支持文本（普通文本、富文本）、图片、图标、超链接、备注、标签、概要、数学公式 - [x] 节点支持拖拽（拖拽移动、自由调整）、多种节点形状，支持使用 DDM 完全自定义节点内容 - [x] 支持画布拖动、缩放 -- [x] 支持鼠标按键拖动选择和Ctrl+左键两种多选节点方式 +- [x] 支持鼠标按键拖动选择和 Ctrl+左键两种多选节点方式 - [x] 支持导出为`json`、`png`、`svg`、`pdf`、`markdown`、`xmind`，支持从`json`、`xmind`、`markdown`导入 - [x] 支持快捷键、前进后退、关联线、搜索替换、小地图、水印、滚动条 - [x] 提供丰富的配置，满足各种场景各种使用习惯 @@ -51,7 +51,7 @@ npm i simple-mind-map # 使用 -提供一个宽高不为0的容器元素： +提供一个宽高不为 0 的容器元素： ```html @@ -72,13 +72,13 @@ npm i simple-mind-map import MindMap from "simple-mind-map"; const mindMap = new MindMap({ - el: document.getElementById('mindMapContainer'), + el: document.getElementById("mindMapContainer"), data: { - "data": { - "text": "根节点" + data: { + text: "根节点", }, - "children": [] - } + children: [], + }, }); ``` @@ -88,7 +88,7 @@ const mindMap = new MindMap({ # License -请尽情享受开源：[MIT](./LICENSE) +[MIT](./LICENSE) # 微信交流群 @@ -244,4 +244,8 @@ const mindMap = new MindMap({v0.6.0版本以后，需要额外注册一个ExportPDF插件
继龙
-
\ 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 0000000000000000000000000000000000000000..09dc78bc3f193574a11b36ae8fb974ba1233a187
GIT binary patch
literal 39711
zcmbTe2|QHo`#(N*38jX|PWBloYgw{4ma)!^tw|daqhyInk0McxeN97_F^j=eYE&xi
zmXxv#d8AD%DkV}Xe)pNNmgo6?{{QisImel^-PirT-q-uO?)%JS_vCZfQna0;9gK$u
z26F&^u*ny&IMlx2Kp4!$1%`ydV8So~o@FpTu*L)aU_7!g0nR!MhUSr*S;z8dP3^-A
zgB=Zq@lWl82TSM$&I}zrwd5_~o!*1rxP)(Z9olvB1I*YxX!oAokwLq|lnqwt!i;Sk
zUHG9hf){69owK@>t&s9hI_w;Of83({_up&|PTqh?2=g2B8}sp~z<4Ei_#}8H@4%G6
zl?8Y>FV11$gNK)oUqDbuc#+6rutUvK7%vYWA1^
继龙
+
+ 欣
+
继龙
+
+ 欣
+
继龙
+
+ 欣
+
继龙
+
+ 欣
+
欣
+
+ 
+ 易空小易
+
diff --git a/web/src/pages/Doc/en/introduction/index.md b/web/src/pages/Doc/en/introduction/index.md
index d62dde94..2c404434 100644
--- a/web/src/pages/Doc/en/introduction/index.md
+++ b/web/src/pages/Doc/en/introduction/index.md
@@ -273,4 +273,8 @@ Open source is not easy. If this project is helpful to you, you can invite the a
欣
+ 易空小易
+
欣
+
+ 易空小易
+
欣
+
+ 易空小易
+
欣
+
+ 易空小易
+