From 7c193c260812406b42da582383b5a56bd267fa23 Mon Sep 17 00:00:00 2001 From: Rizky Date: Sat, 27 Jul 2024 18:22:32 +0700 Subject: [PATCH] fix --- .../popup/script/code-edit/prop-instance.ts | 15 +++--- .../popup/script/code-edit/prop-master.ts | 48 ++++++++++--------- 2 files changed, 35 insertions(+), 28 deletions(-) diff --git a/app/web/src/nova/ed/panel/popup/script/code-edit/prop-instance.ts b/app/web/src/nova/ed/panel/popup/script/code-edit/prop-instance.ts index 89052e82..0ccb918d 100644 --- a/app/web/src/nova/ed/panel/popup/script/code-edit/prop-instance.ts +++ b/app/web/src/nova/ed/panel/popup/script/code-edit/prop-instance.ts @@ -9,12 +9,15 @@ export const codeEditPropInstance = (p: PG, value: string) => { if (meta) { const mprop = meta.mitem?.get("component")?.get("props")?.get(prop_name); if (mprop) { - const valueBuilt = codeBuild({ _: value })["_"]; - mprop.doc?.transact(() => { - mprop.set("value", value); - mprop.set("valueBuilt", valueBuilt); - }); - return valueBuilt; + try { + const valueBuilt = codeBuild({ _: value })["_"]; + mprop.doc?.transact(() => { + mprop.set("value", value); + mprop.set("valueBuilt", valueBuilt); + }); + } catch (e: any) { + return e.message; + } } } }; diff --git a/app/web/src/nova/ed/panel/popup/script/code-edit/prop-master.ts b/app/web/src/nova/ed/panel/popup/script/code-edit/prop-master.ts index 965d9d7c..4075711d 100644 --- a/app/web/src/nova/ed/panel/popup/script/code-edit/prop-master.ts +++ b/app/web/src/nova/ed/panel/popup/script/code-edit/prop-master.ts @@ -14,29 +14,33 @@ export const codeEditPropMaster = (p: PG, value: string) => { ?.get("props") ?.get(prop_name); if (mprop) { - const valueBuilt = codeBuild({ _: value })["_"]; - mprop.doc?.transact(() => { - if (prop_kind === "value") { - mprop.set("value", value); - mprop.set("valueBuilt", valueBuilt); - } else if (prop_kind === "onChange") { - mprop.set("onChange", value); - mprop.set("onChangeBuilt", valueBuilt); - } else if (prop_kind === "gen") { - mprop.set("gen", value); - mprop.set("genBuilt", valueBuilt); - } else if (prop_kind === "visible") { - mprop.set("visible", value); - } else if (prop_kind === "typings") { - mprop.set("typings", value); - } else if (prop_kind === "option") { - const meta = mprop.get("meta"); - if (meta) { - meta.set("options", value); - meta.set("optionsBuilt", valueBuilt); + try { + const valueBuilt = codeBuild({ _: value })["_"]; + mprop.doc?.transact(() => { + if (prop_kind === "value") { + mprop.set("value", value); + mprop.set("valueBuilt", valueBuilt); + } else if (prop_kind === "onChange") { + mprop.set("onChange", value); + mprop.set("onChangeBuilt", valueBuilt); + } else if (prop_kind === "gen") { + mprop.set("gen", value); + mprop.set("genBuilt", valueBuilt); + } else if (prop_kind === "visible") { + mprop.set("visible", value); + } else if (prop_kind === "typings") { + mprop.set("typings", value); + } else if (prop_kind === "option") { + const meta = mprop.get("meta"); + if (meta) { + meta.set("options", value); + meta.set("optionsBuilt", valueBuilt); + } } - } - }); + }); + } catch (e: any) { + return e.message; + } } } };