From c97e48178b0aea3d87a06f8414d5e885bb4b5659 Mon Sep 17 00:00:00 2001 From: zTreeAPI Date: Thu, 2 Jul 2020 17:10:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8D=B3=E6=97=B6=E6=B8=B2=E6=9F=93?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=20=E5=92=8C=20=E6=89=80=E8=A7=81=E5=8D=B3?= =?UTF-8?q?=E6=89=80=E5=BE=97=E6=A8=A1=E5=BC=8F=20=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E8=BF=87=E7=A8=8B=E4=B8=AD=E4=B8=8D=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=20Undo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ts/undo/IRUndo.ts | 4 ++++ src/ts/undo/WysiwygUndo.ts | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/ts/undo/IRUndo.ts b/src/ts/undo/IRUndo.ts index 227192c62..0ab84e5de 100644 --- a/src/ts/undo/IRUndo.ts +++ b/src/ts/undo/IRUndo.ts @@ -102,6 +102,10 @@ class IRUndo { } public addToUndoStack(vditor: IVditor) { + if (vditor.ir.composingLock) { + // 中文输入过程中不记录 undo + return; + } let cloneRange: Range; if (getSelection().rangeCount !== 0 && !vditor.ir.element.querySelector("wbr")) { const range = getSelection().getRangeAt(0); diff --git a/src/ts/undo/WysiwygUndo.ts b/src/ts/undo/WysiwygUndo.ts index 777bc5b72..84f4e66e2 100644 --- a/src/ts/undo/WysiwygUndo.ts +++ b/src/ts/undo/WysiwygUndo.ts @@ -103,6 +103,10 @@ class WysiwygUndo { } public addToUndoStack(vditor: IVditor) { + if (vditor.wysiwyg.composingLock) { + // 中文输入过程中不记录 undo + return; + } // wysiwyg/afterRenderEvent.ts 已经 debounce let cloneRange: Range; if (getSelection().rangeCount !== 0 && !vditor.wysiwyg.element.querySelector("wbr")) { From 4978065c82eaee1b54a6eb3bbee5f25315660557 Mon Sep 17 00:00:00 2001 From: zTreeAPI Date: Thu, 2 Jul 2020 18:19:26 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"=E5=8D=B3=E6=97=B6=E6=B8=B2?= =?UTF-8?q?=E6=9F=93=E6=A8=A1=E5=BC=8F=20=E5=92=8C=20=E6=89=80=E8=A7=81?= =?UTF-8?q?=E5=8D=B3=E6=89=80=E5=BE=97=E6=A8=A1=E5=BC=8F=20=E4=B8=AD?= =?UTF-8?q?=E6=96=87=E8=BE=93=E5=85=A5=E8=BF=87=E7=A8=8B=E4=B8=AD=E4=B8=8D?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=20Undo"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c97e48178b0aea3d87a06f8414d5e885bb4b5659. --- src/ts/undo/IRUndo.ts | 4 ---- src/ts/undo/WysiwygUndo.ts | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/ts/undo/IRUndo.ts b/src/ts/undo/IRUndo.ts index 0ab84e5de..227192c62 100644 --- a/src/ts/undo/IRUndo.ts +++ b/src/ts/undo/IRUndo.ts @@ -102,10 +102,6 @@ class IRUndo { } public addToUndoStack(vditor: IVditor) { - if (vditor.ir.composingLock) { - // 中文输入过程中不记录 undo - return; - } let cloneRange: Range; if (getSelection().rangeCount !== 0 && !vditor.ir.element.querySelector("wbr")) { const range = getSelection().getRangeAt(0); diff --git a/src/ts/undo/WysiwygUndo.ts b/src/ts/undo/WysiwygUndo.ts index 84f4e66e2..777bc5b72 100644 --- a/src/ts/undo/WysiwygUndo.ts +++ b/src/ts/undo/WysiwygUndo.ts @@ -103,10 +103,6 @@ class WysiwygUndo { } public addToUndoStack(vditor: IVditor) { - if (vditor.wysiwyg.composingLock) { - // 中文输入过程中不记录 undo - return; - } // wysiwyg/afterRenderEvent.ts 已经 debounce let cloneRange: Range; if (getSelection().rangeCount !== 0 && !vditor.wysiwyg.element.querySelector("wbr")) { From 35535af3ab7b2d85f0ed1bcb6a22e30642119ce2 Mon Sep 17 00:00:00 2001 From: zTreeAPI Date: Wed, 8 Jul 2020 11:41:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fixed=20issue:=20=E5=8D=B3=E6=97=B6?= =?UTF-8?q?=E6=B8=B2=E6=9F=93=E6=A8=A1=E5=BC=8F=20setValue=20=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=8F=8A=E6=97=B6=E6=B8=B2=E6=9F=93?= =?UTF-8?q?=20Code=20=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/index.ts b/src/index.ts index ca8c93179..9341c8290 100644 --- a/src/index.ts +++ b/src/index.ts @@ -31,6 +31,7 @@ import {IRUndo} from "./ts/undo/IRUndo"; import {WysiwygUndo} from "./ts/undo/WysiwygUndo"; import {Upload} from "./ts/upload/index"; import {addScript} from "./ts/util/addScript"; +import {processCodeRender} from "./ts/util/processCode"; import {Options} from "./ts/util/Options"; import {getCursorPosition, getEditorRange, setSelectionByPosition} from "./ts/util/selection"; import {WYSIWYG} from "./ts/wysiwyg"; @@ -338,6 +339,9 @@ class Vditor extends VditorMethod { }); } else { this.vditor.ir.element.innerHTML = this.vditor.lute.Md2VditorIRDOM(markdown); + this.vditor.ir.element.querySelectorAll(".vditor-ir__preview[data-render='2']").forEach((item: HTMLElement) => { + processCodeRender(item, this.vditor); + }); processAfterRender(this.vditor, { enableAddUndoStack: !clearStack, enableHint: false,