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

🐛 Unable to obtain the correct number of view entries when viewing unreferenced databases or historical databases (#17088)

Browse source
This commit is contained in:
Jeffrey Chen 2026-03-03 09:49:15 +08:00 • committed by GitHub
parent b77580c86e
commit 75d29419c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 88 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

31
kernel/model/attribute_view_render.go
View file

@ -104,8 +104,14 @@ func renderAttributeViewGroups(viewable av.Viewable, attrView *av.AttributeView,
preferredGroupKey := getKanbanPreferredGroupKey(attrView)
group := &av.ViewGroup{Field: preferredGroupKey.ID}
setAttributeViewGroup(attrView, view, group)
av.SaveAttributeView(attrView)
if err = av.SaveAttributeView(attrView); err != nil {
logging.LogErrorf("save attribute view [%s] failed: %s", attrView.ID, err)
return
}
groupKey = view.GetGroupKey(attrView)
if nil == groupKey {
return
}
} else {
return
}
@ -116,20 +122,29 @@ func renderAttributeViewGroups(viewable av.Viewable, attrView *av.AttributeView,
createdDate := time.UnixMilli(view.GroupCreated).Format("2006-01-02")
if time.Now().Format("2006-01-02") != createdDate {
genAttrViewGroups(view, attrView) // 仅重新生成一个视图的分组以提升性能
av.SaveAttributeView(attrView)
if err = av.SaveAttributeView(attrView); err != nil {
logging.LogErrorf("save attribute view [%s] failed: %s", attrView.ID, err)
return
}
}
}
// 如果是按模板分组则需要重新生成分组
if isGroupByTemplate(attrView, view) {
genAttrViewGroups(view, attrView) // 仅重新生成一个视图的分组以提升性能
av.SaveAttributeView(attrView)
if err = av.SaveAttributeView(attrView); err != nil {
logging.LogErrorf("save attribute view [%s] failed: %s", attrView.ID, err)
return
}
}
// 渲染分组视图
if nil == view.Groups {
genAttrViewGroups(view, attrView)
av.SaveAttributeView(attrView)
if err = av.SaveAttributeView(attrView); err != nil {
logging.LogErrorf("save attribute view [%s] failed: %s", attrView.ID, err)
return
}
}
for _, groupView := range view.Groups {
@ -510,10 +525,13 @@ func RenderRepoSnapshotAttributeView(indexID, avID string) (viewable av.Viewable
}
attrView = av.NewAttributeView(avID)
err = av.ErrAttributeViewNotFound
return
} else {
data, readErr := repo.OpenFile(avFile)
if nil != readErr {
logging.LogErrorf("read attribute view [%s] failed: %s", avID, readErr)
err = readErr
return
}
@ -537,6 +555,7 @@ func RenderHistoryAttributeView(blockID, avID, viewID, query string, page, pageS
createdUnix, parseErr := strconv.ParseInt(created, 10, 64)
if nil != parseErr {
logging.LogErrorf("parse created [%s] failed: %s", created, parseErr)
err = fmt.Errorf("parse created [%s] failed: %w", created, parseErr)
return
}
@ -548,6 +567,7 @@ func RenderHistoryAttributeView(blockID, avID, viewID, query string, page, pageS
return
}
if 1 > len(matches) {
err = av.ErrAttributeViewNotFound
return
}
@ -565,10 +585,13 @@ func RenderHistoryAttributeView(blockID, avID, viewID, query string, page, pageS
}
attrView = av.NewAttributeView(avID)
err = av.ErrAttributeViewNotFound
return
} else {
data, readErr := os.ReadFile(avJSONPath)
if nil != readErr {
logging.LogErrorf("read attribute view [%s] failed: %s", avID, readErr)
err = readErr
return
}