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

🎨 Improve av https://github.com/siyuan-note/siyuan/issues/15643

Browse source
This commit is contained in:
Daniel 2025-08-22 00:00:38 +08:00
parent f8bccc2d9f
commit 83af400f65
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
kernel/model/attribute_view.go
View file

@ -538,14 +538,19 @@ func SetAttributeViewGroup(avID, blockID string, group *av.ViewGroup) (err error
if view.Group.HideEmpty != oldHideEmpty {
if !oldHideEmpty && view.Group.HideEmpty { // 启用隐藏空分组
for _, g := range view.Groups {
if g.GroupHidden == 0 && 1 > len(g.GroupItemIDs) {
groupViewable := sql.RenderGroupView(attrView, view, g, "")
// 必须经过渲染才能得到最终的条目数
renderViewableInstance(groupViewable, view, attrView, 1, -1)
if g.GroupHidden == 0 && 1 > groupViewable.(av.Collection).CountItems() {
g.GroupHidden = 1
}
}
}
if oldHideEmpty && !view.Group.HideEmpty { // 禁用隐藏空分组
for _, g := range view.Groups {
if g.GroupHidden == 1 && 1 > len(g.GroupItemIDs) {
groupViewable := sql.RenderGroupView(attrView, view, g, "")
renderViewableInstance(groupViewable, view, attrView, 1, -1)
if g.GroupHidden == 1 && 1 > groupViewable.(av.Collection).CountItems() {
g.GroupHidden = 0
}
}

6
kernel/model/attribute_view_render.go
View file

@ -184,14 +184,16 @@ func hideEmptyGroupViews(view *av.View, viewable av.Viewable) {
return
}
groupHidden := viewable.GetGroupHidden()
if !view.Group.HideEmpty {
if 2 != viewable.GetGroupHidden() {
if 2 != groupHidden {
viewable.SetGroupHidden(0)
}
return
}
if 1 == viewable.GetGroupHidden() && 0 < viewable.(av.Collection).CountItems() {
itemCount := viewable.(av.Collection).CountItems()
if 1 == groupHidden && 0 < itemCount {
viewable.SetGroupHidden(0)
}
}