From 4394b6cbc8dcb87db7689f661e6080747ea12479 Mon Sep 17 00:00:00 2001 From: Rizky Date: Tue, 9 Jan 2024 13:10:01 +0700 Subject: [PATCH] wip fix scope --- app/web/src/nova/ed/panel/popup/script/scope/scope.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/web/src/nova/ed/panel/popup/script/scope/scope.tsx b/app/web/src/nova/ed/panel/popup/script/scope/scope.tsx index 57bf1c02..70d6be1b 100644 --- a/app/web/src/nova/ed/panel/popup/script/scope/scope.tsx +++ b/app/web/src/nova/ed/panel/popup/script/scope/scope.tsx @@ -43,6 +43,10 @@ export const declareScope = (p: PG, meta: IMeta, monaco: Monaco) => { }; gen_content(cur, p, paths, merged_import_map, monaco); + + if (cur !== "page" && !parent_id) { + return merged_import_map[paths[0][0].item.id]; + } return merged_import_map[parent_id]; }; @@ -56,7 +60,8 @@ const gen_content = ( const added = new Set(); for (const path of paths) { let idx = 0; - let last_import = ""; + let last_import = cur !== "page" ? import_map[path[0].item.id] : ""; + for (const m of path) { if (!added.has(m.item.id) && m.item.adv?.js) { added.add(m.item.id);