opencode/yao
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #530 from trheyi/main

Browse source 
[fix] sui preview render
This commit is contained in:
Max 2023-12-17 17:38:07 +08:00 • committed by GitHub
commit 140d963883
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
sui/core/page.go
View file

@ -76,24 +76,28 @@ func (page *Page) Data(request *Request) (Data, map[string]interface{}, error) {
// Exec get the data
func (page *Page) Exec(request *Request) (Data, error) {
if page.Codes.DATA.Code == "" {
return map[string]interface{}{}, nil
// Global data
data := map[string]interface{}{}
global := map[string]interface{}{}
var err error
if page.GlobalData != nil {
global, err = request.ExecString(string(page.GlobalData))
if err != nil {
return nil, err
}
}
data, err := request.ExecString(page.Codes.DATA.Code)
if page.Codes.DATA.Code == "" {
data["$global"] = global
return data, nil
}
data, err = request.ExecString(page.Codes.DATA.Code)
if err != nil {
return nil, err
}
// Global data
if page.GlobalData != nil {
global, err := request.ExecString(string(page.GlobalData))
if err != nil {
return nil, err
}
data["$global"] = global
}
data["$global"] = global
return data, nil
}

2
sui/core/preview.go
View file

@ -25,7 +25,7 @@ func (page *Page) PreviewRender(referer string) (string, error) {
// Get the data
var data Data = nil
if page.Codes.DATA.Code != "" {
if page.Codes.DATA.Code != "" || page.GlobalData != nil {
data, err = page.Exec(request)
if err != nil {
warnings = append(warnings, err.Error())