test/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf.git synced 2024-12-02 12:17:53 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

完成gpage包改进，增加与ghttp的路由耦合性，增加分页URL生成模板特性

Browse Source
This commit is contained in:
john 2018-07-30 12:58:28 +08:00
parent c1d0da164b
commit b8d32e4576
5 changed files with 71 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
g/util/gpage/gpage.go
View File

@ -10,18 +10,18 @@ package gpage
import (
"fmt"
"math"
"strings"
url2 "net/url"
"gitee.com/johng/gf/g/util/gconv"
"gitee.com/johng/gf/g/net/ghttp"
"gitee.com/johng/gf/g/util/gregex"
"gitee.com/johng/gf/g/util/gutil"
"gitee.com/johng/gf/g/util/gstr"
)
// 分页对象
type Page struct {
Url *url2.URL // 当前页面的URL对象
Router *ghttp.Router // 当前页面的路由对象(与gf框架耦合，在静态分页下有效)
UrlTemplate string // URL生成规则，内部可使用{.page}变量指定页码
TotalSize int // 总共数据条数
TotalPage int // 总页数
CurrentPage int // 当前页码
@ -37,7 +37,7 @@ type Page struct {
}
// 创建一个分页对象，输入参数分别为：
// 总数量、每页数量、当前页码、当前的URL(URI+QUERY)、(可选)路由规则(例如: /user/list/:page、/order/list/*page)
// 总数量、每页数量、当前页码、当前的URL(URI+QUERY)、(可选)路由规则(例如: /user/list/:page、/order/list/*page、/order/list/{page}.html)
func New(TotalSize, perPage int, CurrentPage interface{}, url string, router...*ghttp.Router) *Page {
u, _ := url2.Parse(url)
page := &Page {
@ -69,6 +69,11 @@ func (page *Page) EnableAjax(actionName string) {
page.AjaxActionName = actionName
}
// 设置URL生成规则模板，模板中可使用{.page}变量指定页码位置
func (page *Page) SetUrlTemplate(template string) {
page.UrlTemplate = template
}
// 获取显示"下一页"的内容.
func (page *Page) NextPage(styles ... string) string {
var curStyle, style string
@ -242,18 +247,29 @@ func (page *Page) GetContent(mode int) string {
// 为指定的页面返回地址值
func (page *Page) GetUrl(pageNo int) string {
url := *page.Url
if len(page.UrlTemplate) > 0 {
// 指定URL生成模板
url.Path = gstr.Replace(page.UrlTemplate, "{.page}", gconv.String(pageNo))
return url.String()
}
if page.Router != nil {
// Router的规则与ghttp高度耦合
if page.Router != nil {
gutil.Dump(page.Router)
url.Path, _ = gregex.ReplaceStringFunc(page.Router.RegRule, url.Path, func(s string) string {
gutil.Dump(s)
if strings.EqualFold(s, page.PageName) {
s = gconv.String(pageNo)
match1, _ := gregex.MatchString(page.Router.RegRule, page.Router.Uri)
match2, _ := gregex.MatchString(page.Router.RegRule, url.Path)
if len(match1) > 1 && len(match1) == len(match2) {
path := page.Router.Uri
rule := fmt.Sprintf(`^[:\*]%s|\{%s\}`, page.PageName, page.PageName)
for i := 1; i < len(match1); i++ {
replace := match2[i]
if gregex.IsMatchString(rule, match1[i]) {
replace = gconv.String(pageNo)
}
path = gstr.Replace(path, match1[i], replace)
}
return s
})
return url.String()
url.Path = path
return url.String()
}
}
}
values := page.Url.Query()

2
geg/util/gpage/gpage_ajax.go
View File

@ -10,7 +10,7 @@ import (
func main() {
s := ghttp.GetServer()
s.BindHandler("/page/ajax", func(r *ghttp.Request){
page := gpage.New(100, 10, r.Get("page"), r.URL.String(), r.Router.Uri)
page := gpage.New(100, 10, r.Get("page"), r.URL.String(), r.Router)
page.EnableAjax("DoAjax")
buffer, _ := gview.ParseContent(`
<html>

2
geg/util/gpage/gpage_custom1.go
View File

@ -23,7 +23,7 @@ func wrapContent(page *gpage.Page) string {
func main() {
s := ghttp.GetServer()
s.BindHandler("/page/custom1/*page", func(r *ghttp.Request){
page := gpage.New(100, 10, r.Get("page"), r.URL.String(), r.Router.Uri)
page := gpage.New(100, 10, r.Get("page"), r.URL.String(), r.Router)
content := wrapContent(page)
buffer, _ := gview.ParseContent(`
<html>

2
geg/util/gpage/gpage_custom2.go
View File

@ -24,7 +24,7 @@ func pageContent(page *gpage.Page) string {
func main() {
s := ghttp.GetServer()
s.BindHandler("/page/custom2/*page", func(r *ghttp.Request){
page := gpage.New(100, 10, r.Get("page"), r.URL.String(), r.Router.Uri)
page := gpage.New(100, 10, r.Get("page"), r.URL.String(), r.Router)
buffer, _ := gview.ParseContent(`
<html>
<head>

40
geg/util/gpage/gpage_template.go Normal file
View File

@ -0,0 +1,40 @@
package main
import (
"gitee.com/johng/gf/g"
"gitee.com/johng/gf/g/os/gview"
"gitee.com/johng/gf/g/net/ghttp"
"gitee.com/johng/gf/g/util/gpage"
)
func main() {
s := g.Server()
s.BindHandler("/page/template/{page}.html", func(r *ghttp.Request){
page := gpage.New(100, 10, r.Get("page"), r.URL.String())
page.SetUrlTemplate("/page/template/{.page}.html")
buffer, _ := gview.ParseContent(`
<html>
<head>
<style>
a,span {padding:8px; font-size:16px;}
div{margin:5px 5px 20px 5px}
</style>
</head>
<body>
<div>{{.page1}}</div>
<div>{{.page2}}</div>
<div>{{.page3}}</div>
<div>{{.page4}}</div>
</body>
</html>
`, g.Map{
"page1" : gview.HTML(page.GetContent(1)),
"page2" : gview.HTML(page.GetContent(2)),
"page3" : gview.HTML(page.GetContent(3)),
"page4" : gview.HTML(page.GetContent(4)),
})
r.Response.Write(buffer)
})
s.SetPort(8199)
s.Run()
}