Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-09-22 00:20:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Export preview mode supports focus use https://github.com/siyuan-note/siyuan/issues/15340

Browse source
This commit is contained in:
Daniel 2025-07-23 17:00:29 +08:00
parent 508eb93183
commit 963cbfe15f
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 49 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/protyle/preview/index.ts
View file

@ -184,7 +184,7 @@ export class Preview {
}
this.mdTimeoutId = window.setTimeout(() => {
fetchPost("/api/export/preview", {
id: protyle.block.parentID || protyle.options.blockId,
id: protyle.block.id || protyle.options.blockId || protyle.block.parentID,
}, response => {
const oldScrollTop = protyle.preview.previewElement.scrollTop;
protyle.preview.previewElement.innerHTML = response.data.html;

49
kernel/model/export.go
View file

@ -573,7 +573,12 @@ func ExportResources(resourcePaths []string, mainName string) (exportFilePath st
func Preview(id string) (retStdHTML string) {
blockRefMode := Conf.Export.BlockRefMode
tree, _ := LoadTreeByBlockID(id)
bt := treenode.GetBlockTree(id)
if nil == bt {
return
}
tree := prepareExportTree(bt)
tree = exportTree(tree, false, false, true,
blockRefMode, Conf.Export.BlockEmbedMode, Conf.Export.FileAnnotationRefMode,
"#", "#", // 这里固定使用 # 包裹标签，否则无法正确解析标签 https://github.com/siyuan-note/siyuan/issues/13857
@ -584,6 +589,48 @@ func Preview(id string) (retStdHTML string) {
luteEngine.SetFootnotes(true)
addBlockIALNodes(tree, false)
// 聚焦导出的情况下，将第一个标题层级提升为一级（如果开启了添加文档标题的话提升为二级）
// Export preview mode supports focus use https://github.com/siyuan-note/siyuan/issues/15340
if "d" != bt.Type {
level := 1
var firstHeading *ast.Node
if !Conf.Export.AddTitle {
for n := tree.Root.FirstChild; nil != n; n = n.Next {
if ast.NodeHeading == n.Type && !n.ParentIs(ast.NodeBlockquote) {
firstHeading = n
break
}
}
} else {
for n := tree.Root.FirstChild.Next; nil != n; n = n.Next {
if ast.NodeHeading == n.Type && !n.ParentIs(ast.NodeBlockquote) {
firstHeading = n
break
}
}
level = 2
}
if nil != firstHeading {
hLevel := firstHeading.HeadingLevel
diff := level - hLevel
var children, childrenHeadings []*ast.Node
children = append(children, firstHeading)
children = append(children, treenode.HeadingChildren(firstHeading)...)
for _, c := range children {
ccH := c.ChildrenByType(ast.NodeHeading)
childrenHeadings = append(childrenHeadings, ccH...)
}
for _, h := range childrenHeadings {
h.HeadingLevel += diff
if 6 < h.HeadingLevel {
h.HeadingLevel = 6
} else if 1 > h.HeadingLevel {
h.HeadingLevel = 1
}
}
}
}
// 移除超级块的属性列表 https://github.com/siyuan-note/siyuan/issues/13451
var unlinks []*ast.Node
ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {