Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-22 00:06:09 +01: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 2024-09-06 16:58:39 +08:00
commit c74f1ce0d9
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
kernel/model/transaction.go
View file

@ -1231,9 +1231,18 @@ func getRefDefIDs(node *ast.Node) (refDefIDs []string) {
func pushSetDefRefCount(rootID, blockID string) {
sql.WaitForWritingDatabase()
refCounts := sql.QueryRefCount([]string{blockID})
bt := treenode.GetBlockTree(blockID)
if nil == bt {
return
}
refCounts := sql.QueryRootChildrenRefCount(bt.RootID)
refCount := refCounts[blockID]
util.PushSetDefRefCount(rootID, blockID, refCount)
var rootRefCount int
for _, count := range refCounts {
rootRefCount += count
}
util.PushSetDefRefCount(rootID, blockID, refCount, rootRefCount)
}
func upsertAvBlockRel(node *ast.Node) {

4
kernel/util/websocket.go
View file

@ -262,8 +262,8 @@ func PushSetRefDynamicText(rootID, blockID, defBlockID, refText string) {
BroadcastByType("main", "setRefDynamicText", 0, "", map[string]interface{}{"rootID": rootID, "blockID": blockID, "defBlockID": defBlockID, "refText": refText})
}
func PushSetDefRefCount(rootID, blockID string, refCount int) {
BroadcastByType("main", "setDefRefCount", 0, "", map[string]interface{}{"rootID": rootID, "blockID": blockID, "refCount": refCount})
func PushSetDefRefCount(rootID, blockID string, refCount, rootRefCount int) {
BroadcastByType("main", "setDefRefCount", 0, "", map[string]interface{}{"rootID": rootID, "blockID": blockID, "refCount": refCount, "rootRefCount": rootRefCount})
}
func PushProtyleLoading(rootID, msg string) {