0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-12-08 22:17:51 +08:00
commit 740422ba14
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
kernel/model/attribute_view.go
View file

@ -624,15 +624,21 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View, page, p
// 分页
ret.RowCount = len(ret.Rows)
ret.PageSize = view.Table.PageSize
if 0 < pageSize {
start := (page - 1) * pageSize
end := start + pageSize
if len(ret.Rows) < end {
end = len(ret.Rows)
}
ret.Rows = ret.Rows[start:end]
if 1 > view.Table.PageSize {
view.Table.PageSize = 50
}
ret.PageSize = view.Table.PageSize
if 1 > pageSize {
pageSize = ret.PageSize
}
start := (page - 1) * pageSize
end := start + pageSize
if len(ret.Rows) < end {
end = len(ret.Rows)
}
ret.Rows = ret.Rows[start:end]
return
}