Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 07:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 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

4
kernel/model/attribute_view.go
View file

@ -1557,7 +1557,7 @@ func renderAttributeView(attrView *av.AttributeView, blockID, viewID, query stri
var groups []av.Viewable var groups []av.Viewable
for _, groupView := range view.Groups { 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) err = renderViewableInstance(groupViewable, view, attrView, page, pageSize)
if nil != err { if nil != err {
return return
@ -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) { 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.Filter(viewable, attrView)
av.Sort(viewable, attrView) av.Sort(viewable, attrView)
items := viewable.(av.Collection).GetItems() items := viewable.(av.Collection).GetItems()

4
kernel/sql/av.go
View file

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