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

🐛 空列表中插入任务列表面包屑显示问题 Fix https://github.com/siyuan-note/siyuan/issues/5665

Browse source
This commit is contained in:
Liang Ding 2022-08-17 17:33:18 +08:00
parent e25c78b547
commit f1572520d4
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
kernel/model/blockinfo.go
View file

@ -194,6 +194,10 @@ func buildBlockBreadcrumb(node *ast.Node) (ret []*BlockPath) {
continue
}
id := parent.ID
fc := parent.FirstChild
if nil != fc && ast.NodeTaskListItemMarker == fc.Type {
fc = fc.Next
}
name := html.EscapeHTMLStr(parent.IALAttr("name"))
if ast.NodeDocument == parent.Type {
@ -201,7 +205,7 @@ func buildBlockBreadcrumb(node *ast.Node) (ret []*BlockPath) {
} else {
if "" == name {
if ast.NodeListItem == parent.Type {
name = gulu.Str.SubStr(renderBlockText(parent.FirstChild), maxNameLen)
name = gulu.Str.SubStr(renderBlockText(fc), maxNameLen)
} else {
name = gulu.Str.SubStr(renderBlockText(parent), maxNameLen)
}
@ -215,12 +219,12 @@ func buildBlockBreadcrumb(node *ast.Node) (ret []*BlockPath) {
if ast.NodeList == parent.Type || ast.NodeSuperBlock == parent.Type || ast.NodeBlockquote == parent.Type {
add = false
}
if ast.NodeParagraph == parent.Type && nil != parent.Parent && ast.NodeListItem == parent.Parent.Type && nil == parent.Next && nil == parent.Previous {
if ast.NodeParagraph == parent.Type && nil != parent.Parent && ast.NodeListItem == parent.Parent.Type && nil == parent.Next && (nil == parent.Previous || ast.NodeTaskListItemMarker == parent.Previous.Type) {
add = false
}
if ast.NodeListItem == parent.Type {
if "" == name {
name = gulu.Str.SubStr(renderBlockText(parent.FirstChild), maxNameLen)
name = gulu.Str.SubStr(renderBlockText(fc), maxNameLen)
}
}