From ee5eb01c5292892ec9156223d4b3a5749cd6e8b5 Mon Sep 17 00:00:00 2001
From: Achuan-2 <achuan-2@outlook.com>
Date: Thu, 25 Sep 2025 16:54:01 +0800
Subject: [PATCH] :art: The embed block of a heading supports hiding the
 heading itself

---
 app/appearance/langs/ar_SA.json       |  6 +++-
 app/appearance/langs/de_DE.json       |  6 +++-
 app/appearance/langs/en_US.json       |  6 +++-
 app/appearance/langs/es_ES.json       |  6 +++-
 app/appearance/langs/fr_FR.json       |  6 +++-
 app/appearance/langs/he_IL.json       |  6 +++-
 app/appearance/langs/it_IT.json       |  6 +++-
 app/appearance/langs/ja_JP.json       |  6 +++-
 app/appearance/langs/pl_PL.json       |  6 +++-
 app/appearance/langs/pt_BR.json       |  6 +++-
 app/appearance/langs/ru_RU.json       |  6 +++-
 app/appearance/langs/zh_CHT.json      |  6 +++-
 app/appearance/langs/zh_CN.json       |  6 +++-
 app/src/config/editor.ts              | 13 +++++++++
 app/src/mobile/settings/editor.ts     | 11 +++++++
 app/src/protyle/gutter/index.ts       | 39 +++++++++++++++++--------
 app/src/protyle/render/blockRender.ts |  6 ++--
 app/src/types/config.d.ts             |  7 +++++
 kernel/api/search.go                  |  4 +--
 kernel/conf/editor.go                 |  2 ++
 kernel/model/block.go                 | 42 +++++++++++++++++++++------
 kernel/model/blockinfo.go             | 17 +++++++++--
 kernel/model/render.go                | 34 ++++++++++++++++++++--
 23 files changed, 208 insertions(+), 45 deletions(-)

diff --git a/app/appearance/langs/ar_SA.json b/app/appearance/langs/ar_SA.json
index 9c9cb883e..0f3e39c22 100644
--- a/app/appearance/langs/ar_SA.json
+++ b/app/appearance/langs/ar_SA.json
@@ -674,7 +674,11 @@
   "turnToDynamic": "نص المرساة الديناميكي",
   "sizeLimit": "الحد الأقصى",
   "trafficStat": "إحصاءات حركة المرور",
-  "hideHeadingBelowBlocks": "إخفاء الكتل تحت العنوان",
+  "headingEmbedMode": "إعدادات تضمين كتلة العنوان",
+  "headingEmbedModeTip": "تعيين نمط عرض كتلة العنوان في الكتلة المضمنة",
+  "showHeadingWithBlocks": "إظهار العنوان مع الكتل أدناه",
+  "showHeadingOnlyTitle": "إظهار العنوان فقط",
+  "showHeadingOnlyBlocks": "إظهار الكتل تحت العنوان فقط",
   "matchDiacritics": "مطابقة علامات التشكيل",
   "copyHPath": "نسخ المسار المقروء",
   "justify": "محاذاة من الجانبين",
diff --git a/app/appearance/langs/de_DE.json b/app/appearance/langs/de_DE.json
index 971070d69..4d954979c 100644
--- a/app/appearance/langs/de_DE.json
+++ b/app/appearance/langs/de_DE.json
@@ -674,7 +674,11 @@
   "turnToDynamic": "Dynamischer Ankertext",
   "sizeLimit": "Limit",
   "trafficStat": "Verkehrsstatistiken",
-  "hideHeadingBelowBlocks": "Blöcke unter der Überschrift ausblenden",
+  "headingEmbedMode": "Überschrift-Block-Einbettungseinstellungen",
+  "headingEmbedModeTip": "Stellen Sie den Anzeigestil von Überschrift-Blöcken in eingebetteten Blöcken ein",
+  "showHeadingWithBlocks": "Überschrift mit Blöcken darunter anzeigen",
+  "showHeadingOnlyTitle": "Nur Überschrift anzeigen",
+  "showHeadingOnlyBlocks": "Nur Blöcke unter der Überschrift anzeigen",
   "matchDiacritics": "Diakritika abgleichen",
   "copyHPath": "Lesbaren Pfad kopieren",
   "justify": "Rechtsfertigen",
diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
index 8da46964b..dabd89227 100644
--- a/app/appearance/langs/en_US.json
+++ b/app/appearance/langs/en_US.json
@@ -674,7 +674,11 @@
   "turnToDynamic": "Dynamic anchor text",
   "sizeLimit": "Limit",
   "trafficStat": "Traffic statistics",
-  "hideHeadingBelowBlocks": "Hide blocks below heading",
+  "headingEmbedMode": "Heading block embed settings",
+  "showHeadingWithBlocks": "Show heading with blocks below",
+  "showHeadingOnlyTitle": "Show heading only",
+  "showHeadingOnlyBlocks": "Show only blocks below heading",
+  "headingEmbedModeTip": "Set the display style of heading blocks in embed blocks",
   "matchDiacritics": "Match Diacritics",
   "copyHPath": "Copy readable path",
   "justify": "Justify",
diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
index 075e63424..624a3b8e9 100644
--- a/app/appearance/langs/es_ES.json
+++ b/app/appearance/langs/es_ES.json
@@ -674,7 +674,11 @@
   "turnToDynamic": "Texto de anclaje dinámico",
   "sizeLimit": "Límite",
   "trafficStat": "Estadísticas de tráfico",
-  "hideHeadingBelowBlocks": "Ocultar bloques por debajo del encabezamiento",
+  "headingEmbedMode": "Configuración de incrustación de bloque de encabezado",
+  "headingEmbedModeTip": "Establecer el estilo de visualización de los bloques de encabezado en los bloques incrustados",
+  "showHeadingWithBlocks": "Mostrar encabezado con bloques debajo",
+  "showHeadingOnlyTitle": "Mostrar solo el encabezado",
+  "showHeadingOnlyBlocks": "Mostrar solo bloques debajo del encabezado",
   "matchDiacritics": " Hacer coincidir los diacríticos",
   "copyHPath": "Copiar ruta legible",
   "justify": "Justificar",
diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
index 5565a13a7..0aff37dd7 100644
--- a/app/appearance/langs/fr_FR.json
+++ b/app/appearance/langs/fr_FR.json
@@ -674,7 +674,11 @@
   "turnToDynamic": "Texte d'ancrage dynamique",
   "sizeLimit": "Limite",
   "trafficStat": "Statistiques de trafic",
-  "hideHeadingBelowBlocks": "Masquer les blocs sous l'en-tête",
+  "headingEmbedMode": "Paramètres d'intégration de bloc de titre",
+  "showHeadingWithBlocks": "Afficher l'en-tête avec les blocs en dessous",
+  "showHeadingOnlyTitle": "Afficher uniquement l'en-tête",
+  "showHeadingOnlyBlocks": "Afficher uniquement les blocs sous l'en-tête",
+  "headingEmbedModeTip": "Définir le style d'affichage des blocs de titre dans les blocs intégrés",
   "matchDiacritics": "Respecter les accents et diacritiques",
   "copyHPath": "Copier le chemin lisible",
   "justify": "Justifier",
diff --git a/app/appearance/langs/he_IL.json b/app/appearance/langs/he_IL.json
index 686a75a65..0b8846624 100644
--- a/app/appearance/langs/he_IL.json
+++ b/app/appearance/langs/he_IL.json
@@ -674,7 +674,11 @@
   "turnToDynamic": "טקסט עוגן דינמי",
   "sizeLimit": "מגבלה",
   "trafficStat": "סטטיסטיקות תעבורה",
-  "hideHeadingBelowBlocks": "החבא בלוקים מתחת לכותרת",
+  "headingEmbedMode": "הגדרות הטמעת בלוק כותרת",
+  "headingEmbedModeTip": "הגדר את סגנון התצוגה של בלוקי כותרת בבלוקים מוטמעים",
+  "showHeadingWithBlocks": "הצג כותרת עם בלוקים מתחתיה",
+  "showHeadingOnlyTitle": "הצג כותרת בלבד",
+  "showHeadingOnlyBlocks": "הצג רק בלוקים מתחת לכותרת",
   "matchDiacritics": "התאם טעמים",
   "copyHPath": "העתק נתיב קריא",
   "justify": "התאם",
diff --git a/app/appearance/langs/it_IT.json b/app/appearance/langs/it_IT.json
index a6a0d69b5..5510b114d 100644
--- a/app/appearance/langs/it_IT.json
+++ b/app/appearance/langs/it_IT.json
@@ -674,7 +674,11 @@
   "turnToDynamic": "Testo ancora dinamico",
   "sizeLimit": "Limite",
   "trafficStat": "Statistiche traffico",
-  "hideHeadingBelowBlocks": "Nascondi blocchi sotto l'intestazione",
+  "headingEmbedMode": "Impostazioni incorporamento blocco intestazione",
+  "headingEmbedModeTip": "Imposta lo stile di visualizzazione dei blocchi di intestazione nei blocchi incorporati",
+  "showHeadingWithBlocks": "Mostra intestazione con blocchi sottostanti",
+  "showHeadingOnlyTitle": "Mostra solo intestazione",
+  "showHeadingOnlyBlocks": "Mostra solo blocchi sotto l'intestazione",
   "matchDiacritics": "Corrispondenza con diacritici",
   "copyHPath": "Copia percorso leggibile",
   "justify": "Giustifica",
diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json
index 96d7a608d..a51c59a3a 100644
--- a/app/appearance/langs/ja_JP.json
+++ b/app/appearance/langs/ja_JP.json
@@ -674,7 +674,11 @@
   "turnToDynamic": "動的アンカーテキスト",
   "sizeLimit": "制限",
   "trafficStat": "トラフィック統計",
-  "hideHeadingBelowBlocks": "見出し以下のブロックを非表示にする",
+  "headingEmbedMode": "見出しブロック埋め込み設定",
+  "headingEmbedModeTip": "見出しブロックの埋め込みブロック内での表示スタイルを設定",
+  "showHeadingWithBlocks": "見出しと下のブロックを表示",
+  "showHeadingOnlyTitle": "見出しのみ表示",
+  "showHeadingOnlyBlocks": "見出し下のブロックのみ表示",
   "matchDiacritics": "ダイアクリティカルマークを一致させる",
   "copyHPath": "パスをコピー",
   "justify": "両端揃え",
diff --git a/app/appearance/langs/pl_PL.json b/app/appearance/langs/pl_PL.json
index 963045f4c..151b03a5e 100644
--- a/app/appearance/langs/pl_PL.json
+++ b/app/appearance/langs/pl_PL.json
@@ -674,7 +674,11 @@
   "turnToDynamic": "Dynamiczny tekst zakotwiczenia",
   "sizeLimit": "Limit",
   "trafficStat": "Statystyki ruchu",
-  "hideHeadingBelowBlocks": "Ukryj bloki poniżej nagłówka",
+  "headingEmbedMode": "Ustawienia osadzania bloku nagłówka",
+  "headingEmbedModeTip": "Ustaw styl wyświetlania bloków nagłówkowych w blokach osadzonych",
+  "showHeadingWithBlocks": "Pokaż nagłówek z blokami poniżej",
+  "showHeadingOnlyTitle": "Pokaż tylko nagłówek",
+  "showHeadingOnlyBlocks": "Pokaż tylko bloki poniżej nagłówka",
   "matchDiacritics": "Dopasuj diakrytyki",
   "copyHPath": "Kopiuj czytelną ścieżkę",
   "justify": "Wyrównanie",
diff --git a/app/appearance/langs/pt_BR.json b/app/appearance/langs/pt_BR.json
index b1a0e6bec..d7be0a38c 100644
--- a/app/appearance/langs/pt_BR.json
+++ b/app/appearance/langs/pt_BR.json
@@ -674,7 +674,11 @@
   "turnToDynamic": "Texto âncora dinâmico",
   "sizeLimit": "Limite",
   "trafficStat": "Estatísticas de tráfego",
-  "hideHeadingBelowBlocks": "Ocultar blocos abaixo do título",
+  "headingEmbedMode": "Configurações de incorporação de bloco de cabeçalho",
+  "headingEmbedModeTip": "Definir o estilo de exibição dos blocos de cabeçalho nos blocos incorporados",
+  "showHeadingWithBlocks": "Mostrar título com blocos abaixo",
+  "showHeadingOnlyTitle": "Mostrar apenas o título",
+  "showHeadingOnlyBlocks": "Mostrar apenas blocos abaixo do título",
   "matchDiacritics": "Corresponder Diacríticos",
   "copyHPath": "Copiar caminho legível",
   "justify": "Justificar",
diff --git a/app/appearance/langs/ru_RU.json b/app/appearance/langs/ru_RU.json
index 6a6cdefa7..8fbf3a80b 100644
--- a/app/appearance/langs/ru_RU.json
+++ b/app/appearance/langs/ru_RU.json
@@ -674,7 +674,11 @@
   "turnToDynamic": "Динамический анкорный текст",
   "sizeLimit": "Лимит",
   "trafficStat": "Статистика трафика",
-  "hideHeadingBelowBlocks": "Скрыть блоки ниже заголовка",
+  "headingEmbedMode": "Настройки встраивания блока заголовка",
+  "headingEmbedModeTip": "Установить стиль отображения блока заголовка во встроенном блоке",
+  "showHeadingWithBlocks": "Показать заголовок с блоками ниже",
+  "showHeadingOnlyTitle": "Показать только заголовок",
+  "showHeadingOnlyBlocks": "Показать только блоки ниже заголовка",
   "matchDiacritics": "Совпадение диакритики",
   "copyHPath": "Скопировать читаемый путь",
   "justify": "Выровнять",
diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
index 9ff140cd7..667e84fb9 100644
--- a/app/appearance/langs/zh_CHT.json
+++ b/app/appearance/langs/zh_CHT.json
@@ -674,7 +674,11 @@
   "turnToDynamic": "動態錨文字",
   "sizeLimit": "上限",
   "trafficStat": "流量統計",
-  "hideHeadingBelowBlocks": "隱藏標題下方的塊",
+  "headingEmbedMode": "標題塊嵌入設定",
+  "headingEmbedModeTip": "設定標題塊在嵌入塊中的顯示樣式",
+  "showHeadingWithBlocks": "顯示標題與下方的區塊",
+  "showHeadingOnlyTitle": "僅顯示標題",
+  "showHeadingOnlyBlocks": "僅顯示標題下方的區塊",
   "matchDiacritics": "符合變音符號",
   "copyHPath": "複製可讀路徑",
   "justify": "兩側對齊",
diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
index addda041b..b94ebbc3b 100644
--- a/app/appearance/langs/zh_CN.json
+++ b/app/appearance/langs/zh_CN.json
@@ -674,7 +674,11 @@
   "turnToDynamic": "动态锚文本",
   "sizeLimit": "上限",
   "trafficStat": "流量统计",
-  "hideHeadingBelowBlocks": "隐藏标题下方的块",
+  "headingEmbedMode": "标题块嵌入设置",
+  "showHeadingWithBlocks": "显示标题与下方的块",
+  "showHeadingOnlyTitle": "仅显示标题",
+  "showHeadingOnlyBlocks": "仅显示标题下方的块",
+  "headingEmbedModeTip": "设置标题块在嵌入块中的显示样式",
   "matchDiacritics": "匹配变音符号",
   "copyHPath": "复制可读路径",
   "justify": "两侧对齐",
diff --git a/app/src/config/editor.ts b/app/src/config/editor.ts
index 1475c7a60..315a9ab1c 100644
--- a/app/src/config/editor.ts
+++ b/app/src/config/editor.ts
@@ -69,6 +69,18 @@ export const editor = {
     <span class="fn__space"></span>
     <input class="b3-switch fn__flex-center" id="embedBlockBreadcrumb" type="checkbox"${window.siyuan.config.editor.embedBlockBreadcrumb ? " checked" : ""}/>
 </label>
+<div class="fn__flex b3-label config__item">
+    <div class="fn__flex-1">
+        ${window.siyuan.languages.headingEmbedMode}
+        <div class="b3-label__text">${window.siyuan.languages.headingEmbedModeTip}</div>
+    </div>
+    <span class="fn__space"></span>
+    <select class="b3-select fn__flex-center fn__size200" id="headingEmbedMode">
+      <option value="0" ${window.siyuan.config.editor.headingEmbedMode === 0 ? "selected" : ""}>${window.siyuan.languages.showHeadingWithBlocks}</option>
+      <option value="1" ${window.siyuan.config.editor.headingEmbedMode === 1 ? "selected" : ""}>${window.siyuan.languages.showHeadingOnlyTitle}</option>
+      <option value="2" ${window.siyuan.config.editor.headingEmbedMode === 2 ? "selected" : ""}>${window.siyuan.languages.showHeadingOnlyBlocks}</option>
+    </select>
+</div>
 <label class="fn__flex b3-label">
     <div class="fn__flex-1">
         ${window.siyuan.languages.outlineOutdent}
@@ -428,6 +440,7 @@ export const editor = {
                 displayNetImgMark: (editor.element.querySelector("#displayNetImgMark") as HTMLInputElement).checked,
                 codeSyntaxHighlightLineNum: (editor.element.querySelector("#codeSyntaxHighlightLineNum") as HTMLInputElement).checked,
                 embedBlockBreadcrumb: (editor.element.querySelector("#embedBlockBreadcrumb") as HTMLInputElement).checked,
+                headingEmbedMode: parseInt((editor.element.querySelector("#headingEmbedMode") as HTMLSelectElement).value),
                 listLogicalOutdent: (editor.element.querySelector("#listLogicalOutdent") as HTMLInputElement).checked,
                 listItemDotNumberClickFocus: (editor.element.querySelector("#listItemDotNumberClickFocus") as HTMLInputElement).checked,
                 spellcheck: (editor.element.querySelector("#spellcheck") as HTMLInputElement).checked,
diff --git a/app/src/mobile/settings/editor.ts b/app/src/mobile/settings/editor.ts
index 77343dce7..c8d42bb84 100644
--- a/app/src/mobile/settings/editor.ts
+++ b/app/src/mobile/settings/editor.ts
@@ -33,6 +33,7 @@ const setEditor = (modelMainElement: Element) => {
     window.siyuan.config.editor.displayNetImgMark = (modelMainElement.querySelector("#displayNetImgMark") as HTMLInputElement).checked;
     window.siyuan.config.editor.codeSyntaxHighlightLineNum = (modelMainElement.querySelector("#codeSyntaxHighlightLineNum") as HTMLInputElement).checked;
     window.siyuan.config.editor.embedBlockBreadcrumb = (modelMainElement.querySelector("#embedBlockBreadcrumb") as HTMLInputElement).checked;
+    window.siyuan.config.editor.headingEmbedMode = parseInt((modelMainElement.querySelector("#headingEmbedMode") as HTMLSelectElement).value);
     window.siyuan.config.editor.listLogicalOutdent = (modelMainElement.querySelector("#listLogicalOutdent") as HTMLInputElement).checked;
     window.siyuan.config.editor.listItemDotNumberClickFocus = (modelMainElement.querySelector("#listItemDotNumberClickFocus") as HTMLInputElement).checked;
     window.siyuan.config.editor.spellcheck = (modelMainElement.querySelector("#spellcheck") as HTMLInputElement).checked;
@@ -115,6 +116,16 @@ export const initEditor = () => {
     <span class="fn__space"></span>
     <input class="b3-switch fn__flex-center" id="embedBlockBreadcrumb" type="checkbox"${window.siyuan.config.editor.embedBlockBreadcrumb ? " checked" : ""}/>
 </label>
+<div class="b3-label">
+    ${window.siyuan.languages.headingEmbedMode}
+    <span class="fn__hr"></span>
+    <select class="b3-select fn__block" id="headingEmbedMode">
+      <option value="0" ${window.siyuan.config.editor.headingEmbedMode === 0 ? "selected" : ""}>${window.siyuan.languages.showHeadingWithBlocks}</option>
+      <option value="1" ${window.siyuan.config.editor.headingEmbedMode === 1 ? "selected" : ""}>${window.siyuan.languages.showHeadingOnlyTitle}</option>
+      <option value="2" ${window.siyuan.config.editor.headingEmbedMode === 2 ? "selected" : ""}>${window.siyuan.languages.showHeadingOnlyBlocks}</option>
+    </select>
+    <div class="b3-label__text">${window.siyuan.languages.headingEmbedModeTip}</div>
+</div>
 <label class="fn__flex b3-label">
     <div class="fn__flex-1">
         ${window.siyuan.languages.outlineOutdent}
diff --git a/app/src/protyle/gutter/index.ts b/app/src/protyle/gutter/index.ts
index 778c41c65..60fc91d6f 100644
--- a/app/src/protyle/gutter/index.ts
+++ b/app/src/protyle/gutter/index.ts
@@ -1628,20 +1628,35 @@ export class Gutter {
                         });
                     }
                 }, {
-                    id: "hideHeadingBelowBlocks",
-                    label: `<div class="fn__flex" style="margin-bottom: 4px"><span>${window.siyuan.languages.hideHeadingBelowBlocks}</span><span class="fn__space fn__flex-1"></span>
-<input type="checkbox" class="b3-switch fn__flex-center"${nodeElement.getAttribute("custom-heading-mode") === "1" ? " checked" : ""}></div>`,
+                    id: "headingEmbedMode",
+                    label: `<div class="fn__flex" style="margin-bottom: 4px">
+                        <span>${window.siyuan.languages.headingEmbedMode}</span>
+                        <span class="fn__space fn__flex-1"></span>
+                        <select class="b3-select fn__flex-center" style="margin-left: 8px;">
+                            <option value="0"${nodeElement.getAttribute("custom-heading-mode") === "0" ? " selected" : ""}>${window.siyuan.languages.showHeadingWithBlocks}</option>
+                            <option value="1"${nodeElement.getAttribute("custom-heading-mode") === "1" ? " selected" : ""}>${window.siyuan.languages.showHeadingOnlyTitle}</option>
+                            <option value="2"${nodeElement.getAttribute("custom-heading-mode") === "2" ? " selected" : ""}>${window.siyuan.languages.showHeadingOnlyBlocks}</option>
+                            <option value=""${!nodeElement.getAttribute("custom-heading-mode") ? " selected" : ""}>${window.siyuan.languages.default}</option>
+                        </select>
+                    </div>`,
                     bind(element) {
-                        element.addEventListener("click", (event: MouseEvent & { target: HTMLElement }) => {
-                            const inputElement = element.querySelector("input");
-                            if (event.target.tagName !== "INPUT") {
-                                inputElement.checked = !inputElement.checked;
+                        element.addEventListener("change", () => {
+                            const selectElement = element.querySelector("select") as HTMLSelectElement;
+                            const value = selectElement.value;
+                            if (value === "") {
+                                // 默认设置，清空 custom-heading-mode 属性
+                                nodeElement.removeAttribute("custom-heading-mode");
+                                fetchPost("/api/attr/setBlockAttrs", {
+                                    id,
+                                    attrs: {"custom-heading-mode": ""}
+                                });
+                            } else {
+                                nodeElement.setAttribute("custom-heading-mode", value);
+                                fetchPost("/api/attr/setBlockAttrs", {
+                                    id,
+                                    attrs: {"custom-heading-mode": value}
+                                });
                             }
-                            nodeElement.setAttribute("custom-heading-mode", inputElement.checked ? "1" : "0");
-                            fetchPost("/api/attr/setBlockAttrs", {
-                                id,
-                                attrs: {"custom-heading-mode": inputElement.checked ? "1" : "0"}
-                            });
                             nodeElement.removeAttribute("data-render");
                             blockRender(protyle, nodeElement);
                             window.siyuan.menus.menu.remove();
diff --git a/app/src/protyle/render/blockRender.ts b/app/src/protyle/render/blockRender.ts
index 63abb3bdb..027d08b9e 100644
--- a/app/src/protyle/render/blockRender.ts
+++ b/app/src/protyle/render/blockRender.ts
@@ -59,7 +59,7 @@ export const blockRender = (protyle: IProtyle, element: Element, top?: number) =
                             fetchPost("/api/search/getEmbedBlock", {
                                 embedBlockID: item.getAttribute("data-node-id"),
                                 includeIDs: promiseIds,
-                                headingMode: item.getAttribute("custom-heading-mode") === "1" ? 1 : 0,
+                                headingMode: ["0", "1", "2"].includes(item.getAttribute("custom-heading-mode")) ? parseInt(item.getAttribute("custom-heading-mode")) : window.siyuan.config.editor.headingEmbedMode,
                                 breadcrumb
                             }, (response) => {
                                 renderEmbed(response.data.blocks || [], protyle, item, top);
@@ -74,7 +74,7 @@ export const blockRender = (protyle: IProtyle, element: Element, top?: number) =
                     fetchPost("/api/search/getEmbedBlock", {
                         embedBlockID: item.getAttribute("data-node-id"),
                         includeIDs,
-                        headingMode: item.getAttribute("custom-heading-mode") === "1" ? 1 : 0,
+                        headingMode: ["0", "1", "2"].includes(item.getAttribute("custom-heading-mode")) ? parseInt(item.getAttribute("custom-heading-mode")) : window.siyuan.config.editor.headingEmbedMode,
                         breadcrumb
                     }, (response) => {
                         renderEmbed(response.data.blocks || [], protyle, item, top);
@@ -89,7 +89,7 @@ export const blockRender = (protyle: IProtyle, element: Element, top?: number) =
             fetchPost("/api/search/searchEmbedBlock", {
                 embedBlockID: item.getAttribute("data-node-id"),
                 stmt: content,
-                headingMode: item.getAttribute("custom-heading-mode") === "1" ? 1 : 0,
+                headingMode: ["0", "1", "2"].includes(item.getAttribute("custom-heading-mode")) ? parseInt(item.getAttribute("custom-heading-mode")) : window.siyuan.config.editor.headingEmbedMode,
                 excludeIDs: [item.getAttribute("data-node-id"), protyle.block.rootID],
                 breadcrumb
             }, (response) => {
diff --git a/app/src/types/config.d.ts b/app/src/types/config.d.ts
index 44e3d3f98..5cfbdddd0 100644
--- a/app/src/types/config.d.ts
+++ b/app/src/types/config.d.ts
@@ -399,6 +399,13 @@ declare namespace Config {
          * Whether the embedded block displays breadcrumbs
          */
         embedBlockBreadcrumb: boolean;
+        /**
+         * Heading embed mode for embedded blocks
+         * - `0`: Show title with blocks below (default)
+         * - `1`: Show only title
+         * - `2`: Show only blocks below title
+         */
+        headingEmbedMode: number;
         /**
          * Common emoji icons
          */
diff --git a/kernel/api/search.go b/kernel/api/search.go
index bab4b9ef8..a6d7bdb7f 100644
--- a/kernel/api/search.go
+++ b/kernel/api/search.go
@@ -251,7 +251,7 @@ func getEmbedBlock(c *gin.Context) {
 	for _, includeID := range includeIDsArg {
 		includeIDs = append(includeIDs, includeID.(string))
 	}
-	headingMode := 0 // 0：带标题下方块
+	headingMode := 0 // 0：显示标题与下方的块，1：仅显示标题，2：仅显示标题下方的块（默认）
 	headingModeArg := arg["headingMode"]
 	if nil != headingModeArg {
 		headingMode = int(headingModeArg.(float64))
@@ -304,7 +304,7 @@ func searchEmbedBlock(c *gin.Context) {
 	for _, excludeID := range excludeIDsArg {
 		excludeIDs = append(excludeIDs, excludeID.(string))
 	}
-	headingMode := 0 // 0：带标题下方块
+	headingMode := 0 // 0：显示标题与下方的块，1：仅显示标题，2：仅显示标题下方的块（默认）
 	headingModeArg := arg["headingMode"]
 	if nil != headingModeArg {
 		headingMode = int(headingModeArg.(float64))
diff --git a/kernel/conf/editor.go b/kernel/conf/editor.go
index cffeb0534..d07d7e840 100644
--- a/kernel/conf/editor.go
+++ b/kernel/conf/editor.go
@@ -52,6 +52,7 @@ type Editor struct {
 	BacklinkExpandCount             int            `json:"backlinkExpandCount"`             // 反向链接默认展开数量
 	BackmentionExpandCount          int            `json:"backmentionExpandCount"`          // 反链提及默认展开数量
 	BacklinkContainChildren         bool           `json:"backlinkContainChildren"`         // 反向链接是否包含子块进行计算
+	HeadingEmbedMode                int            `json:"headingEmbedMode"`                // 标题嵌入块模式，0：显示标题与下方的块，1：仅显示标题，2：仅显示标题下方的块
 	Markdown                        *util.Markdown `json:"markdown"`                        // Markdown 配置
 }
 
@@ -88,6 +89,7 @@ func NewEditor() *Editor {
 		BacklinkExpandCount:             8,
 		BackmentionExpandCount:          -1,
 		BacklinkContainChildren:         true,
+		HeadingEmbedMode:                0,
 		Markdown:                        util.MarkdownSettings,
 	}
 }
diff --git a/kernel/model/block.go b/kernel/model/block.go
index 9ebe50a33..b6f4d888c 100644
--- a/kernel/model/block.go
+++ b/kernel/model/block.go
@@ -1058,16 +1058,40 @@ func getEmbeddedBlock(trees map[string]*parse.Tree, sqlBlock *sql.Block, heading
 	for _, n := range unlinks {
 		n.Unlink()
 	}
-	nodes = append(nodes, def)
-	if 0 == headingMode && ast.NodeHeading == def.Type && "1" != def.IALAttr("fold") {
-		children := treenode.HeadingChildren(def)
-		for _, c := range children {
-			if "1" == c.IALAttr("heading-fold") {
-				// 嵌入块包含折叠标题时不应该显示其下方块 https://github.com/siyuan-note/siyuan/issues/4765
-				continue
+	// headingMode: 0=显示标题与下方的块，1=仅显示标题，2=仅显示标题下方的块（默认）
+	if ast.NodeHeading == def.Type {
+		if 1 == headingMode {
+			// 仅显示标题
+			nodes = append(nodes, def)
+		} else if 2 == headingMode {
+			// 仅显示标题下方的块（去除标题）
+			if "1" != def.IALAttr("fold") {
+				children := treenode.HeadingChildren(def)
+				for _, c := range children {
+					if "1" == c.IALAttr("heading-fold") {
+						// 嵌入块包含折叠标题时不应该显示其下方块 https://github.com/siyuan-note/siyuan/issues/4765
+						continue
+					}
+					nodes = append(nodes, c)
+				}
+			}
+		} else {
+			// 0: 显示标题与下方的块
+			nodes = append(nodes, def)
+			if "1" != def.IALAttr("fold") {
+				children := treenode.HeadingChildren(def)
+				for _, c := range children {
+					if "1" == c.IALAttr("heading-fold") {
+						// 嵌入块包含折叠标题时不应该显示其下方块 https://github.com/siyuan-note/siyuan/issues/4765
+						continue
+					}
+					nodes = append(nodes, c)
+				}
 			}
-			nodes = append(nodes, c)
 		}
+	} else {
+		// 非标题块，直接添加
+		nodes = append(nodes, def)
 	}
 
 	b := treenode.GetBlockTree(def.ID)
@@ -1095,7 +1119,7 @@ func getEmbeddedBlock(trees map[string]*parse.Tree, sqlBlock *sql.Block, heading
 	}
 
 	if breadcrumb {
-		blockPaths = buildBlockBreadcrumb(def, nil, true)
+		blockPaths = buildBlockBreadcrumb(def, nil, true, headingMode)
 	}
 	if 1 > len(blockPaths) {
 		blockPaths = []*BlockPath{}
diff --git a/kernel/model/blockinfo.go b/kernel/model/blockinfo.go
index 365f2e32c..43d6067bb 100644
--- a/kernel/model/blockinfo.go
+++ b/kernel/model/blockinfo.go
@@ -495,7 +495,7 @@ func BuildBlockBreadcrumb(id string, excludeTypes []string) (ret []*BlockPath, e
 	return
 }
 
-func buildBlockBreadcrumb(node *ast.Node, excludeTypes []string, isEmbedBlock bool) (ret []*BlockPath) {
+func buildBlockBreadcrumb(node *ast.Node, excludeTypes []string, isEmbedBlock bool, headingMode ...int) (ret []*BlockPath) {
 	ret = []*BlockPath{}
 	if nil == node {
 		return
@@ -505,6 +505,12 @@ func buildBlockBreadcrumb(node *ast.Node, excludeTypes []string, isEmbedBlock bo
 		return
 	}
 
+	// 默认 headingMode 为 0
+	mode := 0
+	if len(headingMode) > 0 {
+		mode = headingMode[0]
+	}
+
 	headingLevel := 16
 	maxNameLen := 1024
 	var hPath string
@@ -564,8 +570,13 @@ func buildBlockBreadcrumb(node *ast.Node, excludeTypes []string, isEmbedBlock bo
 			}
 		} else {
 			if ast.NodeDocument != parent.Type {
-				// 在嵌入块中隐藏最后一个非文档路径的面包屑中的文本 Hide text in breadcrumb of last non-document path in embed block https://github.com/siyuan-note/siyuan/issues/13866
-				name = ""
+				// 当headingMode=2（仅显示标题下方的块）且当前节点是标题时，保留标题名称
+				if 2 == mode && ast.NodeHeading == parent.Type && parent == node {
+					// 保留标题名称，不清空
+				} else {
+					// 在嵌入块中隐藏最后一个非文档路径的面包屑中的文本 Hide text in breadcrumb of last non-document path in embed block https://github.com/siyuan-note/siyuan/issues/13866
+					name = ""
+				}
 			}
 		}
 
diff --git a/kernel/model/render.go b/kernel/model/render.go
index 5c2944b4b..12a63256f 100644
--- a/kernel/model/render.go
+++ b/kernel/model/render.go
@@ -302,9 +302,37 @@ func resolveEmbedR(n *ast.Node, blockEmbedMode int, luteEngine *lute.Lute, resol
 					} else if "h" == sqlBlock.Type {
 						h := treenode.GetNodeInTree(subTree, sqlBlock.ID)
 						var hChildren []*ast.Node
-						hChildren = append(hChildren, h)
-						hChildren = append(hChildren, treenode.HeadingChildren(h)...)
-
+						
+						// 从嵌入块的 IAL 属性中解析 custom-heading-mode，默认值为 0
+						blockHeadingMode := 0 // 默认值
+						if customHeadingMode := n.IALAttr("custom-heading-mode"); "" != customHeadingMode {
+							if mode, err := strconv.Atoi(customHeadingMode); nil == err && (mode == 0 || mode == 1 || mode == 2) {
+								blockHeadingMode = mode
+							}
+						}
+						
+						// 根据 blockHeadingMode 处理标题块的显示
+						// blockHeadingMode: 0=显示标题与下方的块，1=仅显示标题，2=仅显示标题下方的块（默认）
+						if 1 == blockHeadingMode {
+							// 仅显示标题
+							hChildren = append(hChildren, h)
+						} else if 2 == blockHeadingMode {
+							// 仅显示标题下方的块（默认行为）
+							if "1" != h.IALAttr("fold") {
+								children := treenode.HeadingChildren(h)
+								for _, c := range children {
+									if "1" == c.IALAttr("heading-fold") {
+										// 嵌入块包含折叠标题时不应该显示其下方块 https://github.com/siyuan-note/siyuan/issues/4765
+										continue
+									}
+									hChildren = append(hChildren, c)
+								}
+							}
+						} else {
+							// 0: 显示标题与下方的块
+							hChildren = append(hChildren, h)
+							hChildren = append(hChildren, treenode.HeadingChildren(h)...)
+						}
 						if 0 == blockEmbedMode {
 							embedTopLevel := 0
 							for _, hChild := range hChildren {