From 83f5a9d34e8ac96e43f44b9c048c599725a04065 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 5 Dec 2018 15:48:15 +0800 Subject: [PATCH] Package gview: build-in function 'date' supports printing current datetime. --- g/os/gview/gview.go | 10 ++++++++-- geg/database/orm/mysql/gdb.go | 4 ++-- geg/os/gview/build_in_funcs/build_in_funcs.go | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/g/os/gview/gview.go b/g/os/gview/gview.go index cc5682df3..2cf3807a2 100644 --- a/g/os/gview/gview.go +++ b/g/os/gview/gview.go @@ -290,8 +290,14 @@ func (view *View) funcUrlDecode(url interface{}) string { } // 模板内置方法：date -func (view *View) funcDate(format string, timestamp interface{}) string { - return gtime.NewFromTimeStamp(gconv.Int64(timestamp)).Format(format) +func (view *View) funcDate(format string, timestamp...interface{}) string { + t := int64(0) + if len(timestamp) > 0 { + t = gconv.Int64(timestamp[0]) + } else { + t = gtime.Millisecond() + } + return gtime.NewFromTimeStamp(t).Format(format) } // 模板内置方法：compare diff --git a/geg/database/orm/mysql/gdb.go b/geg/database/orm/mysql/gdb.go index 761f4d1f4..d951d1821 100644 --- a/geg/database/orm/mysql/gdb.go +++ b/geg/database/orm/mysql/gdb.go @@ -502,10 +502,10 @@ func main() { //update1() //update2() //update3() - //linkopSelect1() + linkopSelect1() //linkopSelect2() //linkopSelect3() - linkopCount1() + //linkopCount1() //linkopUpdate1() //linkopUpdate2() //linkopUpdate3() diff --git a/geg/os/gview/build_in_funcs/build_in_funcs.go b/geg/os/gview/build_in_funcs/build_in_funcs.go index d39c683dd..07460aef0 100644 --- a/geg/os/gview/build_in_funcs/build_in_funcs.go +++ b/geg/os/gview/build_in_funcs/build_in_funcs.go @@ -14,6 +14,7 @@ func main() { {{"https%3A%2F%2Fgfer.me"|urldecode}} {{1540822968 | date "Y-m-d"}} {{"1540822968" | date "Y-m-d H:i:s"}} +{{date "Y-m-d H:i:s"}} {{compare "A" "B"}} {{compare "1" "2"}} {{compare 2 1}}