From 09da0f7388946ada61a657610048d75ffe4bf8f6 Mon Sep 17 00:00:00 2001
From: John <john@johng.cn>
Date: Mon, 9 Sep 2019 23:02:40 +0800
Subject: [PATCH] improving gview with ghttp for controller

---
 .../net/ghttp/server/controller/template/main/main1.html   | 3 ++-
 .../net/ghttp/server/controller/template/main/main2.html   | 3 ++-
 .example/net/ghttp/server/controller/view.go               | 7 ++-----
 frame/gmvc/view.go                                         | 4 +---
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.example/net/ghttp/server/controller/template/main/main1.html b/.example/net/ghttp/server/controller/template/main/main1.html
index fdb0016f3..ac8fb6186 100644
--- a/.example/net/ghttp/server/controller/template/main/main1.html
+++ b/.example/net/ghttp/server/controller/template/main/main1.html
@@ -1 +1,2 @@
-<h1>MAIN1</h1>
\ No newline at end of file
+<h1>MAIN1</h1>
+<h1>Name: {{.name}}</h1>
\ No newline at end of file
diff --git a/.example/net/ghttp/server/controller/template/main/main2.html b/.example/net/ghttp/server/controller/template/main/main2.html
index 608512269..3d2351aea 100644
--- a/.example/net/ghttp/server/controller/template/main/main2.html
+++ b/.example/net/ghttp/server/controller/template/main/main2.html
@@ -1 +1,2 @@
-<h1>MAIN2</h1>
\ No newline at end of file
+<h1>MAIN2</h1>
+<h1>Name: {{.name}}</h1>
\ No newline at end of file
diff --git a/.example/net/ghttp/server/controller/view.go b/.example/net/ghttp/server/controller/view.go
index 19e722ce9..83302a526 100644
--- a/.example/net/ghttp/server/controller/view.go
+++ b/.example/net/ghttp/server/controller/view.go
@@ -10,11 +10,8 @@ type Controller struct {
 }
 
 func (c *Controller) Index() {
-	c.View.Display("layout.html")
-}
-
-// 不符合规范，不会被自动注册
-func (c *Controller) Test(value interface{}) {
+	c.View.Assign("name", "john")
+	c.View.Assign("mainTpl", "main/main2.html")
 	c.View.Display("layout.html")
 }
 
diff --git a/frame/gmvc/view.go b/frame/gmvc/view.go
index 9b9340942..4c1d14045 100644
--- a/frame/gmvc/view.go
+++ b/frame/gmvc/view.go
@@ -91,18 +91,16 @@ func (view *View) BindFuncMap(funcMap gview.FuncMap) {
 }
 
 // 解析并显示指定模板
-func (view *View) Display(file ...string) error {
+func (view *View) Display(file ...string) {
 	name := "index.tpl"
 	if len(file) > 0 {
 		name = file[0]
 	}
 	if content, err := view.Parse(name); err != nil {
 		view.response.Write("Tpl Parsing Error: " + err.Error())
-		return err
 	} else {
 		view.response.Write(content)
 	}
-	return nil
 }
 
 // 解析并显示模板内容