From df52d35efa6eadb0db0eecc4bf44873309d7e1c4 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 21 Oct 2024 20:11:50 +0800 Subject: [PATCH] :art: The backlink panel no longer displays breadcrumbs of the first-level blocks https://github.com/siyuan-note/siyuan/issues/12862 --- kernel/model/backlink.go | 4 ++-- kernel/model/block.go | 2 +- kernel/model/blockinfo.go | 10 ++++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/kernel/model/backlink.go b/kernel/model/backlink.go index f9bdaf9d2..9d8af1af3 100644 --- a/kernel/model/backlink.go +++ b/kernel/model/backlink.go @@ -171,10 +171,10 @@ func buildBacklink(refID string, refTree *parse.Tree, keywords []string, luteEng dom := renderBlockDOMByNodes(renderNodes, luteEngine) blockPaths := []*BlockPath{} - if nil != n.Parent && nil != n.Parent.Parent { + if nil != n.Parent && ast.NodeDocument != n.Parent.Type && nil != n.Parent.Parent && ast.NodeDocument != n.Parent.Parent.Type { // 仅在多余一层时才显示面包屑,这样界面展示更加简洁 // The backlink panel no longer displays breadcrumbs of the first-level blocks https://github.com/siyuan-note/siyuan/issues/12862 - blockPaths = buildBlockBreadcrumb(n, nil) + blockPaths = buildBlockBreadcrumb(n, nil, false) } ret = &Backlink{DOM: dom, BlockPaths: blockPaths, Expand: expand} return diff --git a/kernel/model/block.go b/kernel/model/block.go index 69e643a57..d6009de12 100644 --- a/kernel/model/block.go +++ b/kernel/model/block.go @@ -887,7 +887,7 @@ func getEmbeddedBlock(trees map[string]*parse.Tree, sqlBlock *sql.Block, heading } if breadcrumb { - blockPaths = buildBlockBreadcrumb(def, nil) + blockPaths = buildBlockBreadcrumb(def, nil, true) } if 1 > len(blockPaths) { blockPaths = []*BlockPath{} diff --git a/kernel/model/blockinfo.go b/kernel/model/blockinfo.go index ccfbcdba3..79d0ef897 100644 --- a/kernel/model/blockinfo.go +++ b/kernel/model/blockinfo.go @@ -416,11 +416,11 @@ func BuildBlockBreadcrumb(id string, excludeTypes []string) (ret []*BlockPath, e return } - ret = buildBlockBreadcrumb(node, excludeTypes) + ret = buildBlockBreadcrumb(node, excludeTypes, true) return } -func buildBlockBreadcrumb(node *ast.Node, excludeTypes []string) (ret []*BlockPath) { +func buildBlockBreadcrumb(node *ast.Node, excludeTypes []string, displayCurrentNodeContent bool) (ret []*BlockPath) { ret = []*BlockPath{} if nil == node { return @@ -480,6 +480,12 @@ func buildBlockBreadcrumb(node *ast.Node, excludeTypes []string) (ret []*BlockPa name = strings.ReplaceAll(name, editor.Caret, "") name = util.EscapeHTML(name) + + if parent == node && !displayCurrentNodeContent { + // 反链中不显示当前块内容 https://github.com/siyuan-note/siyuan/issues/12862#issuecomment-2426406327 + name = "" + } + if add { ret = append([]*BlockPath{{ ID: id,