Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-09-22 00:20:47 +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:07:11 +08:00
parent 61bc821754
commit a90df6841c
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kernel/model/attribute_view.go
View file

@ -1557,7 +1557,7 @@ func renderAttributeView(attrView *av.AttributeView, blockID, viewID, query stri
var groups []av.Viewable
for _, groupView := range view.Groups {
groupViewable := sql.RenderGroupView(attrView, view, groupView)
groupViewable := sql.RenderGroupView(attrView, view, groupView, query)
err = renderViewableInstance(groupViewable, view, attrView, page, pageSize)
if nil != err {
return
@ -1856,7 +1856,7 @@ func genAttrViewViewGroups(view *av.View, attrView *av.AttributeView) {
if av.GroupOrderDesc == view.Group.Order {
slices.Reverse(relativeDateGroups)
}
view.Groups = relativeDateGroups
} else {
sort.SliceStable(view.Groups, func(i, j int) bool {
@ -3216,7 +3216,7 @@ func getNewValueByNearItem(nearItem av.Item, key *av.Key, blockID string) (ret *
}
func getNearItem(attrView *av.AttributeView, view, groupView *av.View, previousItemID string) (ret av.Item) {
viewable := sql.RenderGroupView(attrView, view, groupView)
viewable := sql.RenderGroupView(attrView, view, groupView, "")
av.Filter(viewable, attrView)
av.Sort(viewable, attrView)
items := viewable.(av.Collection).GetItems()

4
kernel/sql/av.go
View file

@ -32,7 +32,7 @@ import (
"github.com/siyuan-note/siyuan/kernel/util"
)
func RenderGroupView(attrView *av.AttributeView, view, groupView *av.View) (ret av.Viewable) {
func RenderGroupView(attrView *av.AttributeView, view, groupView *av.View, query string) (ret av.Viewable) {
switch groupView.LayoutType {
case av.LayoutTypeTable:
groupView.Table.Columns = view.Table.Columns
@ -42,7 +42,7 @@ func RenderGroupView(attrView *av.AttributeView, view, groupView *av.View) (ret
groupView.Filters = view.Filters
groupView.Sorts = view.Sorts
return RenderView(attrView, groupView, "")
return RenderView(attrView, groupView, query)
}
func RenderView(attrView *av.AttributeView, view *av.View, query string) (ret av.Viewable) {