From a8b68864f63916d7a0b13c85ba40d20064455026 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 23 Oct 2025 18:01:29 +0800 Subject: [PATCH] :art: Embed blocks in superblocks support displaying breadcrumbs https://github.com/siyuan-note/siyuan/issues/16183 Signed-off-by: Daniel <845765@qq.com> --- app/appearance/langs/ar_SA.json | 2 +- app/appearance/langs/de_DE.json | 2 +- app/appearance/langs/en_US.json | 2 +- app/appearance/langs/es_ES.json | 2 +- app/appearance/langs/fr_FR.json | 2 +- app/appearance/langs/he_IL.json | 2 +- app/appearance/langs/it_IT.json | 2 +- app/appearance/langs/ja_JP.json | 2 +- app/appearance/langs/pl_PL.json | 2 +- app/appearance/langs/pt_BR.json | 2 +- app/appearance/langs/ru_RU.json | 2 +- app/appearance/langs/zh_CHT.json | 2 +- app/appearance/langs/zh_CN.json | 2 +- app/src/protyle/render/blockRender.ts | 8 ++------ 14 files changed, 15 insertions(+), 19 deletions(-) diff --git a/app/appearance/langs/ar_SA.json b/app/appearance/langs/ar_SA.json index ed66c31c6..f5ad2c745 100644 --- a/app/appearance/langs/ar_SA.json +++ b/app/appearance/langs/ar_SA.json @@ -583,7 +583,7 @@ "docNameAndContent": "اسم المستند ومحتواه", "breadcrumb": "شريط التنقل", "embedBlockBreadcrumb": "شريط التنقل في الكتل التضمين", - "embedBlockBreadcrumbTip": "بعد التمكين، تم عرض شريط التنقل في الكتل المضمنة؛ تم مجاهلة هذا الخيار عند شريط التنقل للكتل المضمنة في الكتل الخارقة ولا يظهر أبداً", + "embedBlockBreadcrumbTip": "عند التمكين، ستعرض الكتل المضمّنة مسار التنقل", "appearanceMode": "وضع المظهر", "editReadonly": "وضع القراءة فقط", "editReadonlyTip": "عند التمكين، سيكون محرر المستندات للقراءة فقط افتراضيًا. لا يزال بإمكانك البحث واستبدال النص، وتعديل المحتوى عبر API", diff --git a/app/appearance/langs/de_DE.json b/app/appearance/langs/de_DE.json index 8bae19c06..de57a2822 100644 --- a/app/appearance/langs/de_DE.json +++ b/app/appearance/langs/de_DE.json @@ -583,7 +583,7 @@ "docNameAndContent": "Dokumentname und -inhalt", "breadcrumb": "Breadcrumb", "embedBlockBreadcrumb": "Breadcrumb des eingebetteten Blocks", - "embedBlockBreadcrumbTip": "Nach der Aktivierung zeigen eingebettete Blöcke Breadcrumbs an, eingebettete Blöcke in Superblöcken ignorieren diese Option und zeigen niemals Breadcrumbs.", + "embedBlockBreadcrumbTip": "Nach der Aktivierung zeigen eingebettete Blöcke Breadcrumbs an.", "appearanceMode": "Darstellungsmodus", "editReadonly": "Schreibgeschützter Modus", "editReadonlyTip": "Nach der Aktivierung ist der Dokumenteditor standardmäßig schreibgeschützt. Textsuche und -ersetzung sowie API-Änderungen sind weiterhin möglich.", diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 48d5d34cb..2cf3527ac 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -583,7 +583,7 @@ "docNameAndContent": "Doc Name and Content", "breadcrumb": "Breadcrumb", "embedBlockBreadcrumb": "Embed Block Breadcrumb", - "embedBlockBreadcrumbTip": "When enabled, embed blocks will display breadcrumbs, embed blocks in super blocks ignore this option and never show breadcrumbs", + "embedBlockBreadcrumbTip": "When enabled, embed blocks will display breadcrumbs", "appearanceMode": "Appearance Mode", "editReadonly": "Read-only mode", "editReadonlyTip": "When enabled, the document editor will be read-only by default. You can still search and replace text, modify content via API", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 2d33b0d7e..5533fbd56 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -583,7 +583,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 los bloques incrustados, se mostrarán migas de pan, incrustar bloques en superbloques ignora esta opción y nunca muestra migas de pan", + "embedBlockBreadcrumbTip": "Después de habilitar los bloques incrustados, se mostrarán migas de pan", "appearanceMode": "Modo de apariencia", "editReadonly": "Modo de solo lectura", "editReadonlyTip": "Después de habilitarlo, el editor de documentos será de solo lectura por defecto. Aún puedes buscar y reemplazar texto, modificar contenido a través de la API", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 7083d8533..63a6b6a8c 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -583,7 +583,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é 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", + "embedBlockBreadcrumbTip": "Après avoir activé l'intégration, les blocs afficheront le fil d'Ariane", "appearanceMode": "Mode d'apparence", "editReadonly": "Mode lecture seule", "editReadonlyTip": "Lorsqu'il est activé, l'éditeur de document sera en lecture seule par défaut. Vous pouvez toujours rechercher et remplacer du texte, modifier le contenu via l'API", diff --git a/app/appearance/langs/he_IL.json b/app/appearance/langs/he_IL.json index bf4a229a6..11a13d8b3 100644 --- a/app/appearance/langs/he_IL.json +++ b/app/appearance/langs/he_IL.json @@ -583,7 +583,7 @@ "docNameAndContent": "שם המסמך ותוכן", "breadcrumb": "נתיב", "embedBlockBreadcrumb": "סמן אתר בלוק מוטמע", - "embedBlockBreadcrumbTip": "לאחר הפעולה, בלוקים מוטמעים יראו נתיב, בלוקים מוטמעים בבלוקים עליוניים מתעלמים מהאפשרות הזו ולא יראו נתיבים", + "embedBlockBreadcrumbTip": "כאשר מופעל, הבלוקים המוטמעים יציגו פירורי לחם", "appearanceMode": "מצב מראה", "editReadonly": "מצב קריאה בלבד", "editReadonlyTip": "כאשר מופעל, עורך המסמכים יהיה לקריאה בלבד כברירת מחדל. עדיין ניתן לחפש ולהחליף טקסט, לשנות תוכן דרך API", diff --git a/app/appearance/langs/it_IT.json b/app/appearance/langs/it_IT.json index 01a380f16..7c1cd7003 100644 --- a/app/appearance/langs/it_IT.json +++ b/app/appearance/langs/it_IT.json @@ -583,7 +583,7 @@ "docNameAndContent": "Nome documento e contenuto", "breadcrumb": "Breadcrumb", "embedBlockBreadcrumb": "Incorpora breadcrumb del blocco", - "embedBlockBreadcrumbTip": "Dopo l'abilitazione, i blocchi incorporati mostreranno i breadcrumb. I blocchi incorporati nei super blocchi ignorano questa opzione e non mostreranno mai breadcrumb", + "embedBlockBreadcrumbTip": "Dopo l'abilitazione, i blocchi incorporati mostreranno i breadcrumb", "appearanceMode": "Modalità aspetto", "editReadonly": "Modalità di sola lettura", "editReadonlyTip": "Quando abilitato, l'editor di documenti sarà in sola lettura per impostazione predefinita. Puoi ancora cercare e sostituire testo, modificare contenuti tramite API", diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json index 3a0a89bde..d2e9ae5ef 100644 --- a/app/appearance/langs/ja_JP.json +++ b/app/appearance/langs/ja_JP.json @@ -583,7 +583,7 @@ "docNameAndContent": "ドキュメントの名前と内容", "breadcrumb": "パンくずリスト", "embedBlockBreadcrumb": "埋め込みブロックのパンくずリスト", - "embedBlockBreadcrumbTip": "埋め込みブロックにパンくずリストを表示します
この設定にかかわらずスーパーブロック内の埋め込みブロックは常にパンくずリストが表示されません", + "embedBlockBreadcrumbTip": "埋め込みブロックにパンくずリストを表示します", "appearanceMode": "表示モード", "editReadonly": "読み取り専用モード", "editReadonlyTip": "有効にすると、ドキュメントエディターはデフォルトで読み取り専用になります。テキストの検索・置換や API による内容の変更は可能です", diff --git a/app/appearance/langs/pl_PL.json b/app/appearance/langs/pl_PL.json index 79262df06..c8f144eb5 100644 --- a/app/appearance/langs/pl_PL.json +++ b/app/appearance/langs/pl_PL.json @@ -583,7 +583,7 @@ "docNameAndContent": "Nazwa dokumentu i treść", "breadcrumb": "Okruszek", "embedBlockBreadcrumb": "Wbudowany okruszek bloku", - "embedBlockBreadcrumbTip": "Po włączeniu wbudowane bloki będą wyświetlać okruszki, wbudowane bloki w super blokach ignorują tę opcję i nigdy nie pokazują okruszków", + "embedBlockBreadcrumbTip": "Po włączeniu wbudowane bloki będą wyświetlać okruszki", "appearanceMode": "Tryb wyglądu", "editReadonly": "Tryb tylko do odczytu", "editReadonlyTip": "Po włączeniu edytor dokumentów będzie domyślnie tylko do odczytu. Nadal można wyszukiwać i zastępować tekst, modyfikować zawartość przez API", diff --git a/app/appearance/langs/pt_BR.json b/app/appearance/langs/pt_BR.json index bd72fd877..8a3e180d7 100644 --- a/app/appearance/langs/pt_BR.json +++ b/app/appearance/langs/pt_BR.json @@ -583,7 +583,7 @@ "docNameAndContent": "Nome e Conteúdo do Documento", "breadcrumb": "Navegação Estruturada", "embedBlockBreadcrumb": "Navegação Estruturada de Bloco Incorporado", - "embedBlockBreadcrumbTip": "Quando ativado, blocos incorporados exibirão navegação estrutural, blocos incorporados em super blocos ignoram esta opção e nunca mostram navegação estrutural", + "embedBlockBreadcrumbTip": "Quando ativado, blocos incorporados exibirão navegação estrutural", "appearanceMode": "Modo de Aparência", "editReadonly": "Modo somente leitura", "editReadonlyTip": "Quando ativado, o editor de documentos ficará somente leitura por padrão. Ainda é possível buscar e substituir texto, modificar conteúdo via API", diff --git a/app/appearance/langs/ru_RU.json b/app/appearance/langs/ru_RU.json index 6c8901d52..6aa563ece 100644 --- a/app/appearance/langs/ru_RU.json +++ b/app/appearance/langs/ru_RU.json @@ -583,7 +583,7 @@ "docNameAndContent": "Имя документа и содержание", "breadcrumb": "Крошки", "embedBlockBreadcrumb": "Встраиваемые блоковые крошки", - "embedBlockBreadcrumbTip": "После включения вложенные блоки будут отображать крошки, вложенные блоки в супер блоках игнорируют эту опцию и никогда не показывают крошки", + "embedBlockBreadcrumbTip": "После включения встраиваемые блоки будут показывать хлебные крошки", "appearanceMode": "Режим внешнего вида", "editReadonly": "Режим только для чтения", "editReadonlyTip": "После включения редактор документов будет по умолчанию только для чтения. По-прежнему можно искать и заменять текст, изменять содержимое через API", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 1bb664d41..6310d530e 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -583,7 +583,7 @@ "docNameAndContent": "文檔名和內容", "breadcrumb": "導覽路徑", "embedBlockBreadcrumb": "嵌入塊導覽路徑", - "embedBlockBreadcrumbTip": "啟用後嵌入塊將顯示導覽路徑，在超級塊中的嵌入塊忽略該選項，始終不顯示導覽路徑", + "embedBlockBreadcrumbTip": "啟用後嵌入塊將顯示導覽路徑", "appearanceMode": "外觀模式", "editReadonly": "只讀模式", "editReadonlyTip": "啟用後文檔編輯器將預設鎖定編輯。仍然能夠搜尋替換文字、透過 API 修改內容", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index d5684c163..9dddd8f5a 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -583,7 +583,7 @@ "docNameAndContent": "文档名和内容", "breadcrumb": "面包屑", "embedBlockBreadcrumb": "嵌入块面包屑", - "embedBlockBreadcrumbTip": "启用后嵌入块将显示面包屑，在超级块中的嵌入块忽略该选项，始终不显示面包屑", + "embedBlockBreadcrumbTip": "启用后嵌入块将显示面包屑", "appearanceMode": "外观模式", "editReadonly": "只读模式", "editReadonlyTip": "启用后文档编辑器将默认锁定编辑。仍然能够搜索替换文本、通过 API 修改内容", diff --git a/app/src/protyle/render/blockRender.ts b/app/src/protyle/render/blockRender.ts index 027d08b9e..13534bf99 100644 --- a/app/src/protyle/render/blockRender.ts +++ b/app/src/protyle/render/blockRender.ts @@ -1,4 +1,4 @@ -import {hasClosestByAttribute, hasTopClosestByClassName} from "../util/hasClosest"; +import {hasClosestByAttribute} from "../util/hasClosest"; import {fetchPost, fetchSyncPost} from "../../util/fetch"; import {processRender} from "../util/processCode"; import {highlightRender} from "./highlightRender"; @@ -40,11 +40,7 @@ export const blockRender = (protyle: IProtyle, element: Element, top?: number) = } else { breadcrumb = window.siyuan.config.editor.embedBlockBreadcrumb; } - // https://github.com/siyuan-note/siyuan/issues/7575 - const sbElement = hasTopClosestByClassName(item, "sb"); - if (sbElement) { - breadcrumb = false; - } + if (content.startsWith("//!js")) { try { const includeIDs = new Function(