bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-06-24 00:40:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

统一使用gview.Params类型作为模板变量类型

Browse Source
This commit is contained in:
John
2018-10-15 22:45:04 +08:00
parent b57d2668e8
commit 5f7a9fc423
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
g/net/ghttp/ghttp_response_view.go
View File

@ -43,7 +43,7 @@ func (r *Response) WriteTplContent(content string, params map[string]interface{}
}
// 解析模板文件，并返回模板内容
func (r *Response) ParseTpl(tpl string, params map[string]interface{}, funcmap...map[string]interface{}) ([]byte, error) {
func (r *Response) ParseTpl(tpl string, params gview.Params, funcmap...map[string]interface{}) ([]byte, error) {
fmap := make(gview.FuncMap)
if len(funcmap) > 0 {
fmap = funcmap[0]
@ -52,7 +52,7 @@ func (r *Response) ParseTpl(tpl string, params map[string]interface{}, funcmap..
}
// 解析并返回模板内容
func (r *Response) ParseTplContent(content string, params map[string]interface{}, funcmap...map[string]interface{}) ([]byte, error) {
func (r *Response) ParseTplContent(content string, params gview.Params, funcmap...map[string]interface{}) ([]byte, error) {
fmap := make(gview.FuncMap)
if len(funcmap) > 0 {
fmap = funcmap[0]

4
g/os/gview/gview.go
View File

@ -112,7 +112,7 @@ func (view *View) Assign(key string, value interface{}) {
}
// 解析模板，返回解析后的内容
func (view *View) Parse(file string, params map[string]interface{}, funcmap...map[string]interface{}) ([]byte, error) {
func (view *View) Parse(file string, params Params, funcmap...map[string]interface{}) ([]byte, error) {
path := view.paths.Search(file)
if path == "" {
return nil, errors.New("tpl \"" + file + "\" not found")
@ -155,7 +155,7 @@ func (view *View) Parse(file string, params map[string]interface{}, funcmap...ma
}
// 直接解析模板内容，返回解析后的内容
func (view *View) ParseContent(content string, params map[string]interface{}, funcmap...map[string]interface{}) ([]byte, error) {
func (view *View) ParseContent(content string, params Params, funcmap...map[string]interface{}) ([]byte, error) {
view.mu.RLock()
defer view.mu.RUnlock()
name := gconv.String(ghash.BKDRHash64([]byte(content)))