From 0e42ca74d492dcbeab365f0b0f0b09bcef91a21d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=AB=8B=E5=B8=AE?= <3294713004@qq.com> Date: Sat, 12 Oct 2024 20:51:19 +0800 Subject: [PATCH] =?UTF-8?q?Fix:=20=E4=BF=AE=E5=A4=8D=E5=9B=BE=E5=BD=A2?= =?UTF-8?q?=E5=9D=97=E8=BD=AC=E4=BB=A3=E7=A0=81=E6=97=B6=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=92=8C=E5=87=BD=E6=95=B0=E5=90=8D=E6=9C=AA?= =?UTF-8?q?=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/modules/mixly-modules/common/editor-blockly.js | 9 +++++++++ common/modules/mixly-modules/common/editor-mix.js | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/common/modules/mixly-modules/common/editor-blockly.js b/common/modules/mixly-modules/common/editor-blockly.js index 64703f24..02b12c7d 100644 --- a/common/modules/mixly-modules/common/editor-blockly.js +++ b/common/modules/mixly-modules/common/editor-blockly.js @@ -181,6 +181,10 @@ class EditorBlockly extends EditorBase { return $xml[0].outerHTML; } + this.getRawCode = (workspace, generator) => { + return generator?.workspaceToCode(workspace) || ''; + } + this.getCode = (workspace, generator) => { let code = generator?.workspaceToCode(workspace) || ''; code = code.replace(/(_E[0-9A-F]{1}_[0-9A-F]{2}_[0-9A-F]{2})+/g, function (s) { @@ -327,6 +331,11 @@ class EditorBlockly extends EditorBase { return EditorBlockly.getXML(workspace); } + getRawCode() { + const workspace = this.#getTargetWorkspace_(); + return EditorBlockly.getRawCode(workspace, Blockly.generator); + } + getCode() { const workspace = this.#getTargetWorkspace_(); return EditorBlockly.getCode(workspace, Blockly.generator); diff --git a/common/modules/mixly-modules/common/editor-mix.js b/common/modules/mixly-modules/common/editor-mix.js index 7c668220..53c7d348 100644 --- a/common/modules/mixly-modules/common/editor-mix.js +++ b/common/modules/mixly-modules/common/editor-mix.js @@ -458,8 +458,8 @@ class EditorMix extends EditorBase { getCode() { const blockPage = this.getPage('block'); const codePage = this.getPage('code'); - if (this.drag.shown === Drag.Extend.POSITIVE) { - return blockPage.getCode(); + if (this.drag.shown !== Drag.Extend.NEGATIVE) { + return blockPage.getRawCode(); } else { return codePage.getCode(); }