Merge pull request #555 from trheyi/main

Update regular expressions in data.go

sui/core/data.go

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

sui/core/parser.go

@@ -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)
 	}
 }