${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: `
${window.siyuan.languages.hideHeadingBelowBlocks}
-
`,
+ id: "headingEmbedMode",
+ label: `
+ ${window.siyuan.languages.headingEmbedMode}
+
+
+
`,
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 {