From 4e7c89827329109cbcf9d5c5eb04266288561752 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Tue, 18 Oct 2022 22:04:35 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BD=8D=E4=BA=8E=E8=B6=85=E7=BA=A7?= =?UTF-8?q?=E5=9D=97=E4=B8=AD=E7=9A=84=E5=B5=8C=E5=85=A5=E5=9D=97=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=9D=A2=E5=8C=85=E5=B1=91=20Fix=20https://g?= =?UTF-8?q?ithub.com/siyuan-note/siyuan/issues/6258?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/appearance/langs/en_US.json | 2 +- app/appearance/langs/es_ES.json | 2 +- app/appearance/langs/fr_FR.json | 2 +- app/appearance/langs/zh_CHT.json | 2 +- app/appearance/langs/zh_CN.json | 2 +- kernel/model/block.go | 15 ++++++--------- kernel/model/search.go | 1 + 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index ec3bbf8b2..e603cdaf5 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -2,7 +2,7 @@ "docNameAndContent": "Doc Name and Content", "breadcrumb": "Breadcrumb", "embedBlockBreadcrumb": "Embed Block Breadcrumb", - "embedBlockBreadcrumbTip": "After enabling embed block will show breadcrumbs", + "embedBlockBreadcrumbTip": "After enabling embed blocks will display breadcrumbs, embed blocks in super blocks ignore this option and never show breadcrumbs", "appearanceMode": "Appearance Mode", "editMode": "Edit Mode", "editReadonly": "Read-only mode", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index c606ae3db..a0fc214ed 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -2,7 +2,7 @@ "docNameAndContent": "Nombre y contenido del documento", "miga de pan": "Miga de pan", "embedBlockBreadcrumb": "Incrustar migas de pan de bloque", - "embedBlockBreadcrumbTip": "Después de habilitar el bloque incrustado, se mostrarán migas de pan", + "embedBlockBreadcrumbTip": "Después de habilitar los bloques incrustados, se mostrarán migas de pan, incrustar bloques en superbloques ignora esta opción y nunca muestra migas de pan", "appearanceMode": "Modo de apariencia", "editMode": "Modo de edición", "editReadonly": "Modo de solo lectura", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 184fc1192..9b8b37579 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -2,7 +2,7 @@ "docNameAndContent": "Nom et contenu du document", "fil d'Ariane": "Fil d'Ariane", "embedBlockBreadcrumb": "Intégrer le fil d'Ariane du bloc", - "embedBlockBreadcrumbTip": "Après avoir activé le bloc d'intégration, le fil d'Ariane s'affichera", + "embedBlockBreadcrumbTip": "Après avoir activé l'intégration, les blocs afficheront le fil d'Ariane, intégrer des blocs dans des super blocs ignorent cette option et n'affichent jamais le fil d'Ariane", "appearanceMode": "Mode d'apparence", "editMode": "Mode d'édition", "editReadonly": "Mode lecture seule", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 7caf5b8e3..991f44294 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -2,7 +2,7 @@ "docNameAndContent": "文檔名和內容", "breadcrumb": "麵包屑", "embedBlockBreadcrumb": "嵌入塊麵包屑", - "embedBlockBreadcrumbTip": "啟用後嵌入塊將顯示麵包屑", + "embedBlockBreadcrumbTip": "啟用後嵌入塊將顯示麵包屑，在超級塊中的嵌入塊忽略該選項，始終不顯示麵包屑", "appearanceMode": "外觀模式", "editMode": "編輯模式", "editReadonly": "只讀模式", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 1f5b53e2c..0714507d9 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -2,7 +2,7 @@ "docNameAndContent": "文档名和内容", "breadcrumb": "面包屑", "embedBlockBreadcrumb": "嵌入块面包屑", - "embedBlockBreadcrumbTip": "启用后嵌入块将显示面包屑", + "embedBlockBreadcrumbTip": "启用后嵌入块将显示面包屑，在超级块中的嵌入块忽略该选项，始终不显示面包屑", "appearanceMode": "外观模式", "editMode": "编辑模式", "editReadonly": "只读模式", diff --git a/kernel/model/block.go b/kernel/model/block.go index 79049e4db..99820f511 100644 --- a/kernel/model/block.go +++ b/kernel/model/block.go @@ -393,14 +393,6 @@ func getEmbeddedBlock(embedBlockID string, trees map[string]*parse.Tree, sqlBloc if nil == def { return } - embedNodeTree, _ := loadTreeByBlockID(embedBlockID) - if nil == embedNodeTree { - return - } - embedNode := treenode.GetNodeInTree(embedNodeTree, embedBlockID) - if nil == embedNode { - return - } var unlinks, nodes []*ast.Node ast.Walk(def, func(n *ast.Node, entering bool) ast.WalkStatus { @@ -444,7 +436,12 @@ func getEmbeddedBlock(embedBlockID string, trees map[string]*parse.Tree, sqlBloc block = &Block{Box: def.Box, Path: def.Path, HPath: b.HPath, ID: def.ID, Type: def.Type.String(), Content: dom} // 位于超级块中的嵌入块不显示面包屑 https://github.com/siyuan-note/siyuan/issues/6258 - inSuperBlock := embedNode.ParentIs(ast.NodeSuperBlock) + inSuperBlock := false + embedNodeTree, _ := loadTreeByBlockID(embedBlockID) + if nil != embedNodeTree { + embedNode := treenode.GetNodeInTree(embedNodeTree, embedBlockID) + inSuperBlock = nil != embedNode && embedNode.ParentIs(ast.NodeSuperBlock) + } if breadcrumb && !inSuperBlock { blockPaths = buildBlockBreadcrumb(def) diff --git a/kernel/model/search.go b/kernel/model/search.go index 564cf569d..27233cf69 100644 --- a/kernel/model/search.go +++ b/kernel/model/search.go @@ -44,6 +44,7 @@ type EmbedBlock struct { } func SearchEmbedBlock(embedBlockID, stmt string, excludeIDs []string, headingMode int, breadcrumb bool) (ret []*EmbedBlock) { + time.Sleep(512 * time.Millisecond /* 前端队列轮询间隔 */) WaitForWritingFiles() return searchEmbedBlock(embedBlockID, stmt, excludeIDs, headingMode, breadcrumb) }