Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-09-22 08:30:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Database grouping by field https://github.com/siyuan-note/siyuan/issues/10964

Browse source
This commit is contained in:
Daniel 2025-08-01 22:25:51 +08:00
parent a90df6841c
commit d0f2fd173d
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
kernel/model/attribute_view.go
View file

@ -1395,7 +1395,7 @@ func RenderRepoSnapshotAttributeView(indexID, avID string) (viewable av.Viewable
}
}
viewable, err = renderAttributeView(attrView, "", "", "", 1, -1)
viewable, err = renderAttributeView(attrView, "", "", "", 1, -1, nil)
return
}
@ -1438,11 +1438,11 @@ func RenderHistoryAttributeView(avID, created string) (viewable av.Viewable, att
}
}
viewable, err = renderAttributeView(attrView, "", "", "", 1, -1)
viewable, err = renderAttributeView(attrView, "", "", "", 1, -1, nil)
return
}
func RenderAttributeView(blockID, avID, viewID, query string, page, pageSize int) (viewable av.Viewable, attrView *av.AttributeView, err error) {
func RenderAttributeView(blockID, avID, viewID, query string, page, pageSize int, groupPaging map[string]interface{}) (viewable av.Viewable, attrView *av.AttributeView, err error) {
waitForSyncingStorages()
if avJSONPath := av.GetAttributeViewDataPath(avID); !filelock.IsExist(avJSONPath) {
@ -1459,7 +1459,7 @@ func RenderAttributeView(blockID, avID, viewID, query string, page, pageSize int
return
}
viewable, err = renderAttributeView(attrView, blockID, viewID, query, page, pageSize)
viewable, err = renderAttributeView(attrView, blockID, viewID, query, page, pageSize, groupPaging)
return
}
@ -1471,7 +1471,7 @@ const (
groupValueNext7Days, groupValueNext30Days = "_@next7Days@_", "_@next30Days@_"
)
func renderAttributeView(attrView *av.AttributeView, blockID, viewID, query string, page, pageSize int) (viewable av.Viewable, err error) {
func renderAttributeView(attrView *av.AttributeView, blockID, viewID, query string, page, pageSize int, groupPaging map[string]interface{}) (viewable av.Viewable, err error) {
if 1 > len(attrView.Views) {
view, _, _ := av.NewTableViewWithBlockKey(ast.NewNodeID())
attrView.Views = append(attrView.Views, view)
@ -1558,7 +1558,17 @@ func renderAttributeView(attrView *av.AttributeView, blockID, viewID, query stri
var groups []av.Viewable
for _, groupView := range view.Groups {
groupViewable := sql.RenderGroupView(attrView, view, groupView, query)
err = renderViewableInstance(groupViewable, view, attrView, page, pageSize)
groupPage, groupPageSize := page, pageSize
if nil != groupPaging {
if paging := groupPaging[groupView.ID]; nil != paging {
pagingMap := paging.(map[string]interface{})
groupPage = int(pagingMap["page"].(float64))
groupPageSize = int(pagingMap["pageSize"].(float64))
}
}
err = renderViewableInstance(groupViewable, view, attrView, groupPage, groupPageSize)
if nil != err {
return
}