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

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

Browse source
This commit is contained in:
Vanessa 2025-09-01 22:19:37 +08:00
commit ba2f7272ca
2 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
kernel/model/attribute_view_render.go
View file

@ -88,6 +88,11 @@ func renderAttributeView(attrView *av.AttributeView, nodeID, viewID, query strin
}
func renderAttributeViewGroups(viewable av.Viewable, attrView *av.AttributeView, view *av.View, query string, page, pageSize int, groupPaging map[string]interface{}) (err error) {
groupKey := view.GetGroupKey(attrView)
if nil == groupKey {
return
}
// 当前日期可能会变，所以如果是按日期分组则需要重新生成分组
if isGroupByDate(view) {
createdDate := time.UnixMilli(view.GroupCreated).Format("2006-01-02")
@ -97,9 +102,10 @@ func renderAttributeViewGroups(viewable av.Viewable, attrView *av.AttributeView,
}
}
groupKey := view.GetGroupKey(attrView)
if nil == groupKey {
return
// 如果是按模板分组则需要重新生成分组
if isGroupByTemplate(attrView, view) {
regenAttrViewGroups(attrView)
av.SaveAttributeView(attrView)
}
// 如果存在分组的话渲染分组视图
@ -352,6 +358,18 @@ func isGroupByDate(view *av.View) bool {
return av.GroupMethodDateDay == view.Group.Method || av.GroupMethodDateWeek == view.Group.Method || av.GroupMethodDateMonth == view.Group.Method || av.GroupMethodDateYear == view.Group.Method || av.GroupMethodDateRelative == view.Group.Method
}
func isGroupByTemplate(attrView *av.AttributeView, view *av.View) bool {
if nil == view.Group {
return false
}
groupKey := view.GetGroupKey(attrView)
if nil == groupKey {
return false
}
return av.KeyTypeTemplate == groupKey.Type
}
func renderViewableInstance(viewable av.Viewable, view *av.View, attrView *av.AttributeView, page, pageSize int) (err error) {
if nil == viewable {
err = av.ErrViewNotFound

2
kernel/sql/av.go
View file

@ -79,7 +79,7 @@ func RenderView(attrView *av.AttributeView, view *av.View, query string) (ret av
func renderView(attrView *av.AttributeView, view *av.View, query string,
depth *int, cachedAttrViews map[string]*av.AttributeView) (ret av.Viewable) {
if 2 < *depth {
if 7 < *depth {
return
}