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

🎨 Fixed mirroring database display view https://github.com/siyuan-note/siyuan/issues/15279

Browse source
This commit is contained in:
Daniel 2025-07-15 17:22:40 +08:00
parent 62f0f05cef
commit 6efdc23573
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
kernel/model/attribute_view.go
View file

@ -1284,7 +1284,7 @@ func RenderRepoSnapshotAttributeView(indexID, avID string) (viewable av.Viewable
}
}
viewable, err = renderAttributeView(attrView, "", "", 1, -1)
viewable, err = renderAttributeView(attrView, "", "", "", 1, -1)
return
}
@ -1327,11 +1327,11 @@ func RenderHistoryAttributeView(avID, created string) (viewable av.Viewable, att
}
}
viewable, err = renderAttributeView(attrView, "", "", 1, -1)
viewable, err = renderAttributeView(attrView, "", "", "", 1, -1)
return
}
func RenderAttributeView(avID, viewID, query string, page, pageSize int) (viewable av.Viewable, attrView *av.AttributeView, err error) {
func RenderAttributeView(blockID, avID, viewID, query string, page, pageSize int) (viewable av.Viewable, attrView *av.AttributeView, err error) {
waitForSyncingStorages()
if avJSONPath := av.GetAttributeViewDataPath(avID); !filelock.IsExist(avJSONPath) {
@ -1348,7 +1348,7 @@ func RenderAttributeView(avID, viewID, query string, page, pageSize int) (viewab
return
}
viewable, err = renderAttributeView(attrView, viewID, query, page, pageSize)
viewable, err = renderAttributeView(attrView, blockID, viewID, query, page, pageSize)
return
}
@ -1358,7 +1358,7 @@ const (
groupNameNext7Days, groupNameNext30Days = "_@next7Days@_", "_@next30Days@_"
)
func renderAttributeView(attrView *av.AttributeView, viewID, query string, page, pageSize int) (viewable av.Viewable, err error) {
func renderAttributeView(attrView *av.AttributeView, blockID, viewID, query string, page, pageSize int) (viewable av.Viewable, err error) {
if 1 > len(attrView.Views) {
view, _, _ := av.NewTableViewWithBlockKey(ast.NewNodeID())
attrView.Views = append(attrView.Views, view)
@ -1369,6 +1369,17 @@ func renderAttributeView(attrView *av.AttributeView, viewID, query string, page,
}
}
if "" == viewID && "" != blockID {
if "" != blockID {
node, _, getErr := getNodeByBlockID(nil, blockID)
if nil != getErr {
logging.LogWarnf("get node by block ID [%s] failed: %s", blockID, getErr)
} else {
viewID = node.IALAttr(av.NodeAttrView)
}
}
}
var view *av.View
if "" != viewID {
view, _ = attrView.GetCurrentView(viewID)