From 82da6e9e682278e436935e6724077656228b299e Mon Sep 17 00:00:00 2001 From: Rizky Date: Tue, 24 Oct 2023 13:14:55 +0700 Subject: [PATCH] fixing undefined --- app/web/src/render/live/logic/tree-scope.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/web/src/render/live/logic/tree-scope.tsx b/app/web/src/render/live/logic/tree-scope.tsx index b7f89652..38df3be1 100644 --- a/app/web/src/render/live/logic/tree-scope.tsx +++ b/app/web/src/render/live/logic/tree-scope.tsx @@ -148,7 +148,7 @@ export const mergeScopeUpwards = ( scope = { ...cur.scope, ...indexedScope, ...cur.comp?.propval }; for (const [k, v] of Object.entries(scope)) { - finalScope[k] = v; + if (typeof finalScope[k] === "undefined") finalScope[k] = v; } if (opt?.each) { if (!opt.each(cur, scope)) { @@ -160,6 +160,10 @@ export const mergeScopeUpwards = ( cur = p.treeMeta[cur.parent_id]; } + if (meta.item.name === "item" && meta.item.type === "item") { + console.log(finalScope); + } + return finalScope; }; @@ -207,7 +211,7 @@ const createPassProp = ( if (k === "children") continue; meta.scope[k] = v; } - + return modifyChildIndex(arg.children, scopeIndex); }