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

Update regular expressions in data.go and parser.go

Browse source
This commit is contained in:
Max 2024-01-17 15:17:04 +08:00
parent 1651d9e654
commit f2f3fa354f
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sui/core/data.go
View file

@ -11,8 +11,9 @@ import (
"github.com/yaoapp/kun/log"
)
var stmtRe = regexp.MustCompile(`\{\{([^}]+)\}\}`)
var propRe = regexp.MustCompile(`\[\{([^}]+)\}\]`)
// If set the map value, should keep the space at the end of the statement
var stmtRe = regexp.MustCompile(`\{\{(.*?)\}\}`)
var propRe = regexp.MustCompile(`\[\{(.*?)\}\]`)
// Data data for the template
type Data map[string]interface{}

9
sui/core/parser.go
View file

@ -331,6 +331,9 @@ func (parser *TemplateParser) ifStatementNode(sel *goquery.Selection) {
}
if res == true {
parser.removeParsed(sel)
parser.parseElementAttrs(sel)
parser.parsed(sel)
parser.show(sel)
return
}
@ -345,6 +348,9 @@ func (parser *TemplateParser) ifStatementNode(sel *goquery.Selection) {
}
if res == true {
parser.removeParsed(elifNode)
parser.parseElementAttrs(elifNode)
parser.parsed(elifNode)
parser.show(elifNode)
return
}
@ -352,6 +358,9 @@ func (parser *TemplateParser) ifStatementNode(sel *goquery.Selection) {
// else
if elseNode != nil {
parser.removeParsed(elseNode)
parser.parseElementAttrs(elseNode)
parser.parsed(elseNode)
parser.show(elseNode)
}
}