feat: 支持主列表选择每页条数 (#242)

admin/service/service.go

@@ -166,6 +166,12 @@ type ClientListResult struct {
 
 // ListClientPageForUser 按网页登录身份、搜索词和统一页大小返回客户端列表。
 func ListClientPageForUser(db *sql.DB, actor *model.User, keyword string, threshold time.Duration, requestedPage int) (*ClientListResult, error) {
+	return ListClientPageForUserWithPageSize(db, actor, keyword, threshold, requestedPage, DefaultPageSize)
+}
+
+// ListClientPageForUserWithPageSize 按白名单页容量返回当前账号可见客户端。
+func ListClientPageForUserWithPageSize(db *sql.DB, actor *model.User, keyword string, threshold time.Duration, requestedPage, pageSize int) (*ClientListResult, error) {
+	pageSize = NormalizePageSize(pageSize)
 	visibleUserID, err := visibleClientUserID(actor)
 	if err != nil {
 		return nil, err
@@ -175,15 +181,15 @@ func ListClientPageForUser(db *sql.DB, actor *model.User, keyword string, thresh
 	if page < 1 {
 		page = 1
 	}
-	rows, total, err := repository.ListClientsForUserPage(db, keyword, visibleUserID, PageSize, (page-1)*PageSize)
+	rows, total, err := repository.ListClientsForUserPage(db, keyword, visibleUserID, pageSize, (page-1)*pageSize)
 	if err != nil {
 		return nil, err
 	}
-	totalPages := TotalPages(total)
+	totalPages := TotalPages(total, pageSize)
 	clampedPage := ClampPage(page, totalPages)
 	if clampedPage != page {
 		page = clampedPage
-		rows, _, err = repository.ListClientsForUserPage(db, keyword, visibleUserID, PageSize, (page-1)*PageSize)
+		rows, _, err = repository.ListClientsForUserPage(db, keyword, visibleUserID, pageSize, (page-1)*pageSize)
 		if err != nil {
 			return nil, err
 		}