chore: 调整分页参数为PageSize

tangtanglove · tangtanglove · commit 4f0abf8098ab · 2024-11-27T18:06:05.000+08:00
diff --git a/app/admin/resources/action_log.go b/app/admin/resources/action_log.go
@@ -23,7 +23,7 @@ func (p *ActionLog) Init(ctx *quark.Context) interface{} {
 	p.Model = &model.ActionLog{}
 
 	// 分页
-	p.PerPage = 10
+	p.PageSize = 10
 
 	// 是否具有导出功能
 	p.WithExport = true
diff --git a/app/admin/resources/config.go b/app/admin/resources/config.go
@@ -24,7 +24,7 @@ func (p *Config) Init(ctx *quark.Context) interface{} {
 	p.Model = &model.Config{}
 
 	// 分页
-	p.PerPage = 10
+	p.PageSize = 10
 
 	return p
 }
diff --git a/app/admin/resources/department.go b/app/admin/resources/department.go
@@ -36,7 +36,7 @@ func (p *Department) Init(ctx *quark.Context) interface{} {
 	p.IndexQueryOrder = "sort asc, id asc"
 
 	// 分页
-	p.PerPage = false
+	p.PageSize = false
 
 	return p
 }
diff --git a/app/admin/resources/file.go b/app/admin/resources/file.go
@@ -22,7 +22,7 @@ func (p *File) Init(ctx *quark.Context) interface{} {
 	p.Model = &model.File{}
 
 	// 分页
-	p.PerPage = 10
+	p.PageSize = 10
 
 	return p
 }
diff --git a/app/admin/resources/menu.go b/app/admin/resources/menu.go
@@ -34,7 +34,7 @@ func (p *Menu) Init(ctx *quark.Context) interface{} {
 	p.QueryOrder = "sort asc"
 
 	// 分页
-	p.PerPage = false
+	p.PageSize = false
 
 	return p
 }
diff --git a/app/admin/resources/permission.go b/app/admin/resources/permission.go
@@ -24,7 +24,7 @@ func (p *Permission) Init(ctx *quark.Context) interface{} {
 	p.Model = &model.Permission{}
 
 	// 分页
-	p.PerPage = 10
+	p.PageSize = 10
 
 	return p
 }
diff --git a/app/admin/resources/picture.go b/app/admin/resources/picture.go
@@ -23,7 +23,7 @@ func (p *Picture) Init(ctx *quark.Context) interface{} {
 	p.Model = &model.Picture{}
 
 	// 分页
-	p.PerPage = 10
+	p.PageSize = 10
 
 	return p
 }
diff --git a/app/admin/resources/position.go b/app/admin/resources/position.go
@@ -23,7 +23,7 @@ func (p *Position) Init(ctx *quark.Context) interface{} {
 	p.Model = &model.Position{}
 
 	// 分页
-	p.PerPage = 10
+	p.PageSize = 10
 
 	// 默认排序
 	p.IndexQueryOrder = "sort asc, id asc"
diff --git a/app/admin/resources/role.go b/app/admin/resources/role.go
@@ -27,7 +27,7 @@ func (p *Role) Init(ctx *quark.Context) interface{} {
 	p.Model = &model.Role{}
 
 	// 分页
-	p.PerPage = 10
+	p.PageSize = 10
 
 	// 默认排序
 	p.IndexQueryOrder = "id asc"
diff --git a/app/admin/resources/user.go b/app/admin/resources/user.go
@@ -38,7 +38,7 @@ func (p *User) Init(ctx *quark.Context) interface{} {
 	p.Model = &model.User{}
 
 	// 分页
-	p.PerPage = 10
+	p.PageSize = 10
 
 	// 是否具有导出功能
 	p.WithExport = true
diff --git a/engine.go b/engine.go
@@ -22,7 +22,7 @@ const (
 	AppName = "QuarkGo"
 
 	// 版本号
-	Version = "3.5.10"
+	Version = "3.6.0"
 
 	// 包名
 	PkgName = "github.com/quarkcloudio/quark-go/v3"
diff --git a/template/admin/component/table/table.go b/template/admin/component/table/table.go
@@ -243,12 +243,13 @@ func (p *Component) SetDatasource(datasource interface{}) *Component {
 }
 
 // 表格分页
-func (p *Component) SetPagination(current int, pageSize int, total int, defaultCurrent int) *Component {
-	p.Pagination = map[string]int{
-		"current":        current,
-		"pageSize":       pageSize,
-		"total":          total,
-		"defaultCurrent": defaultCurrent,
+func (p *Component) SetPagination(current int, pageSize int, total int, defaultCurrent int, pageSizeOptions []int) *Component {
+	p.Pagination = map[string]interface{}{
+		"current":         current,
+		"pageSize":        pageSize,
+		"total":           total,
+		"defaultCurrent":  defaultCurrent,
+		"pageSizeOptions": pageSizeOptions,
 	}
 
 	return p
diff --git a/template/admin/resource/requests/index.go b/template/admin/resource/requests/index.go
@@ -32,16 +32,19 @@ func (p *IndexRequest) QueryData(ctx *quark.Context) interface{} {
 	query := template.BuildIndexQuery(ctx, model, searches, filters, p.columnFilters(ctx), p.orderings(ctx))
 
 	// 获取分页
-	perPage := template.GetPerPage()
-	if perPage == nil {
+	pageSize := template.GetPageSize()
+
+	// 指定每页可以显示多少条，[10, 20, 50, 100]
+	pageSizeOptions := template.GetPageSizeOptions()
+	if pageSize == nil {
 		query.Find(&lists)
 
 		// 返回解析列表
 		return p.performsList(ctx, lists)
 	}
 
 	// 不分页，直接返回lists
-	if reflect.TypeOf(perPage).String() != "int" {
+	if reflect.TypeOf(pageSize).String() != "int" {
 		query.Find(&lists)
 
 		// 返回解析列表
@@ -59,7 +62,7 @@ func (p *IndexRequest) QueryData(ctx *quark.Context) interface{} {
 				page = int(data["current"].(float64))
 			}
 			if data["pageSize"] != nil {
-				perPage = int(data["pageSize"].(float64))
+				pageSize = int(data["pageSize"].(float64))
 			}
 		}
 	}
@@ -68,16 +71,17 @@ func (p *IndexRequest) QueryData(ctx *quark.Context) interface{} {
 	query.Count(&total)
 
 	// 获取列表
-	query.Limit(perPage.(int)).Offset((page - 1) * perPage.(int)).Find(&lists)
+	query.Limit(pageSize.(int)).Offset((page - 1) * pageSize.(int)).Find(&lists)
 
 	// 解析列表
 	result := p.performsList(ctx, lists)
 
 	return map[string]interface{}{
-		"currentPage": page,
-		"perPage":     perPage,
-		"total":       total,
-		"items":       result,
+		"page":            page,
+		"pageSize":        pageSize,
+		"pageSizeOptions": pageSizeOptions,
+		"total":           total,
+		"items":           result,
 	}
 }
 
diff --git a/template/admin/resource/resource.go b/template/admin/resource/resource.go
@@ -46,7 +46,8 @@ type Template struct {
 	TableActionColumnWidth int                    // 列表页表格行为列的宽度
 	TablePolling           int                    // 列表页表格是否轮询数据
 	TableListToTree        interface{}            // 列表页数据转换为树形结构, true 或者 map[string]interface{}{"pkName": "id",""pidName": "pid","childrenName": "children","rootId":0}
-	PerPage                interface{}            // 列表页分页配置
+	PageSize               interface{}            // 列表页分页配置
+	PageSizeOptions        []int                  // 指定每页可以显示多少条，[10, 20, 50, 100]
 	QueryOrder             string                 // 全局排序规则
 	IndexQueryOrder        string                 // 列表页排序规则
 	ExportQueryOrder       string                 // 导出数据排序规则
@@ -193,8 +194,13 @@ func (p *Template) GetTablePolling() int {
 }
 
 // 获取分页配置
-func (p *Template) GetPerPage() interface{} {
-	return p.PerPage
+func (p *Template) GetPageSize() interface{} {
+	return p.PageSize
+}
+
+// 指定每页可以显示多少条，[10, 20, 50, 100]
+func (p *Template) GetPageSizeOptions() []int {
+	return p.PageSizeOptions
 }
 
 // 列表页列表数据转换为树形结构
diff --git a/template/admin/resource/resource_index.go b/template/admin/resource/resource_index.go
@@ -114,21 +114,22 @@ func (p *Template) IndexComponentRender(ctx *quark.Context, data interface{}) in
 		SetSearches(indexSearches)
 
 	// 获取分页
-	perPage := template.GetPerPage()
-	if perPage == nil {
+	pageSize := template.GetPageSize()
+	if pageSize == nil {
 		return table.SetDatasource(data)
 	}
 
 	// 不分页，直接返回数据
-	if reflect.TypeOf(perPage).String() != "int" {
+	if reflect.TypeOf(pageSize).String() != "int" {
 		return table.SetDatasource(data)
 	} else {
-		current := data.(map[string]interface{})["currentPage"]
-		perPage := data.(map[string]interface{})["perPage"]
+		current := data.(map[string]interface{})["page"]
+		pageSize := data.(map[string]interface{})["pageSize"]
+		pageSizeOptions := data.(map[string]interface{})["pageSizeOptions"]
 		total := data.(map[string]interface{})["total"]
 		items := data.(map[string]interface{})["items"]
 		component = table.
-			SetPagination(current.(int), perPage.(int), int(total.(int64)), 1).
+			SetPagination(current.(int), pageSize.(int), int(total.(int64)), 1, pageSizeOptions.([]int)).
 			SetDatasource(items)
 	}
 
diff --git a/template/admin/resource/types/resourcer.go b/template/admin/resource/types/resourcer.go
@@ -58,7 +58,10 @@ type Resourcer interface {
 	GetTableListToTree() interface{}
 
 	// 获取分页配置
-	GetPerPage() interface{}
+	GetPageSize() interface{}
+
+	// 指定每页可以显示多少条，[10, 20, 50, 100]
+	GetPageSizeOptions() []int
 
 	// 获取全局排序规则
 	GetQueryOrder() string
diff --git a/web/app/admin/491.async.js b/web/app/admin/491.async.js

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ func (p Config) Init(ctx quark.Context) interface{} {`
`24`	`24`	`p.Model = &model.Config{}`
`25`	`25`
`26`	`26`	`// 分页`
`27`		`- p.PerPage = 10`
	`27`	`+ p.PageSize = 10`
`28`	`28`
`29`	`29`	`return p`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func (p Department) Init(ctx quark.Context) interface{} {`
`36`	`36`	`p.IndexQueryOrder = "sort asc, id asc"`
`37`	`37`
`38`	`38`	`// 分页`
`39`		`- p.PerPage = false`
	`39`	`+ p.PageSize = false`
`40`	`40`
`41`	`41`	`return p`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ func (p File) Init(ctx quark.Context) interface{} {`
`22`	`22`	`p.Model = &model.File{}`
`23`	`23`
`24`	`24`	`// 分页`
`25`		`- p.PerPage = 10`
	`25`	`+ p.PageSize = 10`
`26`	`26`
`27`	`27`	`return p`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func (p Menu) Init(ctx quark.Context) interface{} {`
`34`	`34`	`p.QueryOrder = "sort asc"`
`35`	`35`
`36`	`36`	`// 分页`
`37`		`- p.PerPage = false`
	`37`	`+ p.PageSize = false`
`38`	`38`
`39`	`39`	`return p`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ func (p Permission) Init(ctx quark.Context) interface{} {`
`24`	`24`	`p.Model = &model.Permission{}`
`25`	`25`
`26`	`26`	`// 分页`
`27`		`- p.PerPage = 10`
	`27`	`+ p.PageSize = 10`
`28`	`28`
`29`	`29`	`return p`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ func (p Picture) Init(ctx quark.Context) interface{} {`
`23`	`23`	`p.Model = &model.Picture{}`
`24`	`24`
`25`	`25`	`// 分页`
`26`		`- p.PerPage = 10`
	`26`	`+ p.PageSize = 10`
`27`	`27`
`28`	`28`	`return p`
`29`	`29`	`}`