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

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

Browse source
This commit is contained in:
Vanessa 2024-04-10 18:01:39 +08:00
commit 7d8e928ce6
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kernel/model/attribute_view.go
View file

@ -83,9 +83,7 @@ func GetAttributeViewPrimaryKeyValues(avID, keyword string, page, pageSize int)
}
}
if gulu.Str.Contains(kv.Block.ID, view.Table.RowIDs) {
tmp[kv.Block.ID] = kv
}
tmp[kv.Block.ID] = kv
}
}
}
@ -97,7 +95,7 @@ func GetAttributeViewPrimaryKeyValues(avID, keyword string, page, pageSize int)
}
if 1 > pageSize {
pageSize = 32
pageSize = 16
}
start := (page - 1) * pageSize
end := start + pageSize

2
kernel/treenode/node.go
View file

@ -342,7 +342,7 @@ func FirstLeafBlock(node *ast.Node) (ret *ast.Node) {
func CountBlockNodes(node *ast.Node) (ret int) {
ast.Walk(node, func(n *ast.Node, entering bool) ast.WalkStatus {
if !entering || !n.IsBlock() || ast.NodeList == n.Type || ast.NodeListItem == n.Type || ast.NodeBlockquote == n.Type || ast.NodeSuperBlock == n.Type {
if !entering || !n.IsBlock() || ast.NodeList == n.Type || ast.NodeBlockquote == n.Type || ast.NodeSuperBlock == n.Type {
return ast.WalkContinue
}