diff --git a/web/src/lang/en_us.js b/web/src/lang/en_us.js index 22157e28..aa4c4cc1 100644 --- a/web/src/lang/en_us.js +++ b/web/src/lang/en_us.js @@ -77,7 +77,12 @@ export default { tagPositionRight: 'Text right', tagPositionBottom: 'Text bottom', alwaysShowExpandBtn: 'Always show expand btn', - enableAutoEnterTextEditWhenKeydown: 'Auto enter text edit when keydown' + enableAutoEnterTextEditWhenKeydown: 'Auto enter text edit when keydown', + confirm: 'Confirm', + cancel: 'Cancel', + changeRichTextTip: 'This operation will clear all historical modification records and modify the mind map data. Do you want to continue?', + changeRichTextTip2: 'Do you want to switch to rich text mode?', + changeRichTextTip3: 'Do you want to switch to non rich text mode?' }, color: { moreColor: 'More color' diff --git a/web/src/lang/zh_cn.js b/web/src/lang/zh_cn.js index 4ee38b48..367b3332 100644 --- a/web/src/lang/zh_cn.js +++ b/web/src/lang/zh_cn.js @@ -75,7 +75,12 @@ export default { tagPositionRight: '文本右侧', tagPositionBottom: '文本下面', alwaysShowExpandBtn: '是否一直显示展开收起按钮', - enableAutoEnterTextEditWhenKeydown: '键盘输入时自动进入文本编辑' + enableAutoEnterTextEditWhenKeydown: '键盘输入时自动进入文本编辑', + confirm: '确定', + cancel: '取消', + changeRichTextTip: '该操作会清空所有历史修改记录,并且修改思维导图数据,是否继续?', + changeRichTextTip2: '是否切换为富文本模式?', + changeRichTextTip3: '是否切换为非富文本模式?' }, color: { moreColor: '更多颜色' diff --git a/web/src/lang/zh_tw.js b/web/src/lang/zh_tw.js index cd92b4f4..3feec32c 100644 --- a/web/src/lang/zh_tw.js +++ b/web/src/lang/zh_tw.js @@ -76,7 +76,12 @@ export default { watermarkAngle: '旋轉角度', watermarkTextOpacity: '文字透明度', watermarkTextFontSize: '字型大小', - belowNode: '顯示在節點下方' + belowNode: '顯示在節點下方', + confirm: '確定', + cancel: '取消', + changeRichTextTip: '該操作會清空所有曆史修改記錄,並且修改思維導圖數據,是否繼續?', + changeRichTextTip2: '是否切換爲富文本模式?', + changeRichTextTip3: '是否切換爲非富文本模式?' }, color: { moreColor: '更多顏色' diff --git a/web/src/pages/Edit/components/Outline.vue b/web/src/pages/Edit/components/Outline.vue index c660d9af..533ae7d4 100644 --- a/web/src/pages/Edit/components/Outline.vue +++ b/web/src/pages/Edit/components/Outline.vue @@ -212,7 +212,7 @@ export default { if (!targetNode) return this.notHandleDataChange = true if (richText) { - targetNode.setText(textToNodeRichTextWithWrap(text), true, true) + targetNode.setText(textToNodeRichTextWithWrap(text), true) } else { targetNode.setText(text) } diff --git a/web/src/pages/Edit/components/OutlineEdit.vue b/web/src/pages/Edit/components/OutlineEdit.vue index 5c5471b6..fc1c0d96 100644 --- a/web/src/pages/Edit/components/OutlineEdit.vue +++ b/web/src/pages/Edit/components/OutlineEdit.vue @@ -149,7 +149,6 @@ export default { const richText = node.data.data.richText const text = richText ? e.target.innerHTML : e.target.innerText node.data.data.text = richText ? textToNodeRichTextWithWrap(text) : text - if (richText) node.data.data.resetRichText = true node.data.textCache = e.target.innerHTML this.save() }, @@ -170,9 +169,6 @@ export default { }, children: [] } - if (richText) { - data.data.resetRichText = true - } if (e.keyCode === 13 && !e.shiftKey) { e.preventDefault() if (node.data.root) { diff --git a/web/src/pages/Edit/components/Setting.vue b/web/src/pages/Edit/components/Setting.vue index d7378528..149e54f2 100644 --- a/web/src/pages/Edit/components/Setting.vue +++ b/web/src/pages/Edit/components/Setting.vue @@ -214,7 +214,9 @@
{{ $t('setting.enableAutoEnterTextEditWhenKeydown') }}
@@ -496,10 +498,26 @@ export default { // 切换是否开启节点富文本编辑 enableNodeRichTextChange(e) { - this.mindMap.renderer.textEdit.hideEditTextBox() - this.setLocalConfig({ - openNodeRichText: e - }) + this.$confirm( + this.$t('setting.changeRichTextTip'), + e + ? this.$t('setting.changeRichTextTip2') + : this.$t('setting.changeRichTextTip3'), + { + confirmButtonText: this.$t('setting.confirm'), + cancelButtonText: this.$t('setting.cancel'), + type: 'warning' + } + ) + .then(() => { + this.mindMap.renderer.textEdit.hideEditTextBox() + this.setLocalConfig({ + openNodeRichText: e + }) + }) + .catch(() => { + this.enableNodeRichText = !this.enableNodeRichText + }) }, // 本地配置