0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🐛 包含较大列表的文档加载不全 https://github.com/siyuan-note/siyuan/issues/5798

Browse source
This commit is contained in:
Liang Ding 2022-09-03 12:14:41 +08:00
parent 8eb59a56d3
commit 39b4587eb5
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
kernel/api/filetree.go
View file

@ -634,7 +634,7 @@ func getDoc(c *gin.Context) {
size = 36
}
blockCount, content, parentID, parent2ID, rootID, typ, eof, boxID, docPath, err := model.GetDoc(startID, endID, id, index, keyword, mode, size)
blockCount, childBlockCount, content, parentID, parent2ID, rootID, typ, eof, boxID, docPath, err := model.GetDoc(startID, endID, id, index, keyword, mode, size)
if errors.Is(err, filelock.ErrUnableLockFile) {
ret.Code = 2
ret.Data = id
@ -652,17 +652,18 @@ func getDoc(c *gin.Context) {
}
ret.Data = map[string]interface{}{
"id": id,
"mode": mode,
"parentID": parentID,
"parent2ID": parent2ID,
"rootID": rootID,
"type": typ,
"content": content,
"blockCount": blockCount,
"eof": eof,
"box": boxID,
"path": docPath,
"id": id,
"mode": mode,
"parentID": parentID,
"parent2ID": parent2ID,
"rootID": rootID,
"type": typ,
"content": content,
"blockCount": blockCount,
"childBlockCount": childBlockCount,
"eof": eof,
"box": boxID,
"path": docPath,
}
}

3
kernel/model/file.go
View file

@ -421,7 +421,7 @@ func BlockWordCount(id string) (blockRuneCount, blockWordCount, rootBlockRuneCou
return
}
func GetDoc(startID, endID, id string, index int, keyword string, mode int, size int) (blockCount int, dom, parentID, parent2ID, rootID, typ string, eof bool, boxID, docPath string, err error) {
func GetDoc(startID, endID, id string, index int, keyword string, mode int, size int) (blockCount, childBlockCount int, dom, parentID, parent2ID, rootID, typ string, eof bool, boxID, docPath string, err error) {
WaitForWritingFiles() // 写入数据时阻塞，避免获取到的数据不一致
inputIndex := index
@ -529,6 +529,7 @@ func GetDoc(startID, endID, id string, index int, keyword string, mode int, size
}
blockCount = tree.DocBlockCount()
childBlockCount = treenode.CountBlockNodes(tree.Root)
if ast.NodeDocument == node.Type {
parentID = node.ID
parent2ID = parentID