Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Vanessa 2025-12-05 10:35:15 +08:00
commit 4c50508884

View file

@ -212,7 +212,7 @@ func GetBlockSiblingID(id string) (parent, previous, next string) {
parent = parentBlock.ID
if ast.NodeDocument == parentBlock.Type {
parent = parentBlock.ID
parent = treenode.FirstLeafBlock(parentBlock).ID
if nil != current.Previous && current.Previous.IsBlock() {
previous = current.Previous.ID
@ -230,6 +230,16 @@ func GetBlockSiblingID(id string) (parent, previous, next string) {
return
}
if ast.NodeListItem != parentBlock.Type {
if parentBlock = treenode.ParentBlock(parentBlock); nil != parentBlock {
parent = parentBlock.ID
if ast.NodeDocument == parentBlock.Type {
parent = treenode.FirstLeafBlock(parentBlock).ID
}
}
}
parentBlock = treenode.ParentBlock(current)
for ; nil != parentBlock; parentBlock = treenode.ParentBlock(parentBlock) {
if nil != parentBlock.Previous && parentBlock.Previous.IsBlock() {
previous = parentBlock.Previous.ID
@ -239,6 +249,7 @@ func GetBlockSiblingID(id string) (parent, previous, next string) {
break
}
}
parentBlock = treenode.ParentBlock(current)
for ; nil != parentBlock; parentBlock = treenode.ParentBlock(parentBlock) {
if nil != parentBlock.Next && parentBlock.Next.IsBlock() {