From fe247d1e282c6f28b59ebf4a4868672c3c5f45dd Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 25 Jul 2024 16:10:21 +0800 Subject: [PATCH] Refactor SUI core to load backend scripts for templates --- sui/core/build.go | 4 ++++ sui/storages/local/build.go | 10 ---------- sui/storages/local/page.go | 7 +++++++ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/sui/core/build.go b/sui/core/build.go index 55dc7245..b4575a5d 100644 --- a/sui/core/build.go +++ b/sui/core/build.go @@ -650,12 +650,16 @@ func (page *Page) BuildScripts(ctx *BuildContext, option *BuildOption, component code := string(source) if constants != "" { code = fmt.Sprintf("this.Constants = %s\n%s", constants, code) + } parent := "body" if !ispage { parent = "head" code = fmt.Sprintf("function %s(){\n%s\n}\n", component, addTabToEachLine(code)) + if constants != "" { + fmt.Println("page.Script.ConstantsToString", page.Route) + } } scripts = append(scripts, ScriptNode{ diff --git a/sui/storages/local/build.go b/sui/storages/local/build.go index 36c02d89..f9800dc9 100644 --- a/sui/storages/local/build.go +++ b/sui/storages/local/build.go @@ -354,11 +354,6 @@ func (page *Page) Build(globalCtx *core.GlobalBuildContext, option *core.BuildOp } page.Root = root - err = page.loadBackendScript() - if err != nil { - return nil, err - } - html, warnings, err := page.Page.Compile(ctx, option) if err != nil { return warnings, fmt.Errorf("Compile the page %s error: %s", page.Route, err.Error()) @@ -431,11 +426,6 @@ func (page *Page) BuildAsComponent(globalCtx *core.GlobalBuildContext, option *c option.AssetRoot = filepath.Join(root, "assets") } - err := page.loadBackendScript() - if err != nil { - return nil, err - } - html, messages, err := page.Page.CompileAsComponent(ctx, option) if err != nil { return warnings, err diff --git a/sui/storages/local/page.go b/sui/storages/local/page.go index aa8caf7a..841be543 100644 --- a/sui/storages/local/page.go +++ b/sui/storages/local/page.go @@ -453,6 +453,13 @@ func (page *Page) Load() error { // Set the page global data page.GlobalData = page.tmpl.GlobalData + + // Load the backend script + err := page.loadBackendScript() + if err != nil { + return err + } + return nil }