Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-21 09:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

✨ 行级元素支持多重样式类型 https://github.com/siyuan-note/siyuan/issues/2911

Browse source
This commit is contained in:
Liang Ding 2022-09-16 18:02:04 +08:00
parent dcee38bcfa
commit c5f0b96929
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
13 changed files with 133 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

13
kernel/sql/database.go
View file

@ -269,7 +269,7 @@ func refsFromTree(tree *parse.Tree) (refs []*Ref, fileAnnotationRefs []*FileAnno
return ast.WalkContinue
}
if ast.NodeBlockRefID == n.Type {
if treenode.IsBlockRef(n) {
ref := buildRef(tree, n)
refs = append(refs, ref)
} else if ast.NodeFileAnnotationRefID == n.Type {
@ -306,9 +306,9 @@ func refsFromTree(tree *parse.Tree) (refs []*Ref, fileAnnotationRefs []*FileAnno
return
}
func buildRef(tree *parse.Tree, refIDNode *ast.Node) *Ref {
markdown := treenode.FormatNode(refIDNode.Parent, luteEngine)
defBlockID := refIDNode.TokensStr()
func buildRef(tree *parse.Tree, refNode *ast.Node) *Ref {
markdown := treenode.FormatNode(refNode, luteEngine)
defBlockID, text, _ := treenode.GetBlockRef(refNode)
var defBlockParentID, defBlockRootID, defBlockPath string
defBlock := treenode.GetBlockTree(defBlockID)
if nil != defBlock {
@ -316,8 +316,7 @@ func buildRef(tree *parse.Tree, refIDNode *ast.Node) *Ref {
defBlockRootID = defBlock.RootID
defBlockPath = defBlock.Path
}
text := treenode.GetDynamicBlockRefText(refIDNode.Parent)
parentBlock := treenode.ParentBlock(refIDNode)
parentBlock := treenode.ParentBlock(refNode)
return &Ref{
ID: ast.NewNodeID(),
DefBlockID: defBlockID,
@ -330,7 +329,7 @@ func buildRef(tree *parse.Tree, refIDNode *ast.Node) *Ref {
Path: tree.Path,
Content: text,
Markdown: markdown,
Type: treenode.TypeAbbr(refIDNode.Type.String()),
Type: treenode.TypeAbbr(refNode.Type.String()),
}
}