${window.siyuan.languages.generateHistory}
@@ -386,6 +394,7 @@ export const editor = {
blockRefDynamicAnchorTextMaxLen: parseInt((editor.element.querySelector("#blockRefDynamicAnchorTextMaxLen") as HTMLInputElement).value),
backlinkExpandCount: parseInt((editor.element.querySelector("#backlinkExpandCount") as HTMLInputElement).value),
backmentionExpandCount: parseInt((editor.element.querySelector("#backmentionExpandCount") as HTMLInputElement).value),
+ backlinkContainChildren: (editor.element.querySelector("#backlinkContainChildren") as HTMLInputElement).checked,
dynamicLoadBlocks: dynamicLoadBlocks,
codeLigatures: (editor.element.querySelector("#codeLigatures") as HTMLInputElement).checked,
codeTabSpaces: parseInt((editor.element.querySelector("#codeTabSpaces") as HTMLInputElement).value),
diff --git a/app/src/config/search.ts b/app/src/config/search.ts
index 8d3ffd658..23e894875 100644
--- a/app/src/config/search.ts
+++ b/app/src/config/search.ts
@@ -24,8 +24,9 @@ export const initConfigSearch = (element: HTMLElement, app: App) => {
"onlySearchForDoc", "onlySearchForDocTip", "dynamicLoadBlocks", "dynamicLoadBlocksTip", "fontSizeScrollZoom", "fontSizeScrollZoomTip",
"listItemDotNumberClickFocus", "listItemDotNumberClickFocusTip", "editorMarkdownInlineAsterisk", "editorMarkdownInlineUnderscore",
"editorMarkdownInlineSup", "editorMarkdownInlineSupTip", "editorMarkdownInlineSub", "editorMarkdownInlineSubTip",
- "editorMarkdownInlineTag", "editorMarkdownInlineTagTip", "editorMarkdownInlineMath", "editorMarkdownInlineMathTip",
- "allowHTMLBLockScript", "allowHTMLBLockScriptTip",
+ "editorMarkdownInlineTag", "editorMarkdownInlineTagTip", "editorMarkdownInlineMath", "editorMarkdownInlineMathTip", "editorMarkdownInlineStrikethrough", "editorMarkdownInlineStrikethroughTip",
+ "allowHTMLBLockScript", "allowHTMLBLockScriptTip", "backlinkExpandCount", "backlinkExpandTip", "backmentionExpandCount", "backmentionExpandTip",
+ "backlinkContainChildren", "backlinkContainChildrenTip"
]),
// 文档树
diff --git a/app/src/layout/dock/Backlink.ts b/app/src/layout/dock/Backlink.ts
index 9590fccf1..08f316b7f 100644
--- a/app/src/layout/dock/Backlink.ts
+++ b/app/src/layout/dock/Backlink.ts
@@ -437,7 +437,6 @@ export class Backlink extends Model {
defID: this.blockId,
refTreeID: docId,
keyword: isMention ? this.inputsElement[1].value : this.inputsElement[0].value,
- containChildren: false
}, (response) => {
svgElement.removeAttribute("disabled");
svgElement.classList.add("b3-list-item__arrow--open");
diff --git a/app/src/mobile/settings/editor.ts b/app/src/mobile/settings/editor.ts
index 1db63aa33..32e56c654 100644
--- a/app/src/mobile/settings/editor.ts
+++ b/app/src/mobile/settings/editor.ts
@@ -45,6 +45,7 @@ const setEditor = (modelMainElement: Element) => {
window.siyuan.config.editor.blockRefDynamicAnchorTextMaxLen = parseInt((modelMainElement.querySelector("#blockRefDynamicAnchorTextMaxLen") as HTMLInputElement).value);
window.siyuan.config.editor.backlinkExpandCount = parseInt((modelMainElement.querySelector("#backlinkExpandCount") as HTMLInputElement).value);
window.siyuan.config.editor.backmentionExpandCount = parseInt((modelMainElement.querySelector("#backmentionExpandCount") as HTMLInputElement).value);
+ window.siyuan.config.editor.backlinkContainChildren = (modelMainElement.querySelector("#backlinkContainChildren") as HTMLInputElement).checked;
window.siyuan.config.editor.codeLigatures = (modelMainElement.querySelector("#codeLigatures") as HTMLInputElement).checked;
window.siyuan.config.editor.codeTabSpaces = parseInt((modelMainElement.querySelector("#codeTabSpaces") as HTMLInputElement).value);
window.siyuan.config.editor.fontSize = parseInt((modelMainElement.querySelector("#fontSize") as HTMLInputElement).value);
@@ -220,6 +221,14 @@ export const initEditor = () => {
${window.siyuan.languages.backmentionExpandTip}
+
${window.siyuan.languages.generateHistory}
diff --git a/app/src/protyle/util/reload.ts b/app/src/protyle/util/reload.ts
index 47b699a61..b39fd91a4 100644
--- a/app/src/protyle/util/reload.ts
+++ b/app/src/protyle/util/reload.ts
@@ -44,7 +44,6 @@ export const reloadProtyle = (protyle: IProtyle, focus: boolean, updateReadonly?
defID: protyle.element.getAttribute("data-defid"),
refTreeID: protyle.block.rootID,
keyword: isMention ? inputsElement[1].value : inputsElement[0].value,
- containChildren: false
}, response => {
protyle.options.backlinkData = isMention ? response.data.backmentions : response.data.backlinks;
renderBacklink(protyle, protyle.options.backlinkData);
diff --git a/app/src/types/config.d.ts b/app/src/types/config.d.ts
index 14c34d48b..9bebba93f 100644
--- a/app/src/types/config.d.ts
+++ b/app/src/types/config.d.ts
@@ -341,6 +341,10 @@ declare namespace Config {
* The default number of backlinks to mention
*/
backmentionExpandCount: number;
+ /**
+ * Whether the backlink contains children
+ */
+ backlinkContainChildren: boolean;
/**
* The maximum length of the dynamic anchor text for block references
*/
diff --git a/kernel/api/ref.go b/kernel/api/ref.go
index 24939b7e9..a912ce561 100644
--- a/kernel/api/ref.go
+++ b/kernel/api/ref.go
@@ -51,7 +51,7 @@ func getBackmentionDoc(c *gin.Context) {
defID := arg["defID"].(string)
refTreeID := arg["refTreeID"].(string)
keyword := arg["keyword"].(string)
- containChildren := false
+ containChildren := model.Conf.Editor.BacklinkContainChildren
if val, ok := arg["containChildren"]; ok {
containChildren = val.(bool)
}
@@ -73,7 +73,7 @@ func getBacklinkDoc(c *gin.Context) {
defID := arg["defID"].(string)
refTreeID := arg["refTreeID"].(string)
keyword := arg["keyword"].(string)
- containChildren := false
+ containChildren := model.Conf.Editor.BacklinkContainChildren
if val, ok := arg["containChildren"]; ok {
containChildren = val.(bool)
}
@@ -109,7 +109,7 @@ func getBacklink2(c *gin.Context) {
if nil != mentionSortArg {
mentionSort, _ = strconv.Atoi(mentionSortArg.(string))
}
- containChildren := false
+ containChildren := model.Conf.Editor.BacklinkContainChildren
if val, ok := arg["containChildren"]; ok {
containChildren = val.(bool)
}
@@ -145,7 +145,7 @@ func getBacklink(c *gin.Context) {
if nil != arg["beforeLen"] {
beforeLen = int(arg["beforeLen"].(float64))
}
- containChildren := false
+ containChildren := model.Conf.Editor.BacklinkContainChildren
if val, ok := arg["containChildren"]; ok {
containChildren = val.(bool)
}
diff --git a/kernel/conf/editor.go b/kernel/conf/editor.go
index 71a567966..607a0e912 100644
--- a/kernel/conf/editor.go
+++ b/kernel/conf/editor.go
@@ -51,6 +51,7 @@ type Editor struct {
OnlySearchForDoc bool `json:"onlySearchForDoc"` // 是否启用 [[ 仅搜索文档块
BacklinkExpandCount int `json:"backlinkExpandCount"` // 反向链接默认展开数量
BackmentionExpandCount int `json:"backmentionExpandCount"` // 反链提及默认展开数量
+ BacklinkContainChildren bool `json:"backlinkContainChildren"` // 反向链接是否包含子块进行计算
Markdown *util.Markdown `json:"markdown"` // Markdown 配置
}
@@ -86,6 +87,7 @@ func NewEditor() *Editor {
RTL: false,
BacklinkExpandCount: 8,
BackmentionExpandCount: -1,
+ BacklinkContainChildren: false,
Markdown: util.MarkdownSettings,
}
}
diff --git a/kernel/model/backlink.go b/kernel/model/backlink.go
index 9d8af1af3..461294716 100644
--- a/kernel/model/backlink.go
+++ b/kernel/model/backlink.go
@@ -96,7 +96,9 @@ func GetBackmentionDoc(defID, refTreeID, keyword string, containChildren bool) (
trees := filesys.LoadTrees(mentionBlockIDs)
for id, tree := range trees {
backlink := buildBacklink(id, tree, mentionKeywords, luteEngine)
- ret = append(ret, backlink)
+ if nil != backlink {
+ ret = append(ret, backlink)
+ }
}
return
}
@@ -133,7 +135,9 @@ func GetBacklinkDoc(defID, refTreeID, keyword string, containChildren bool) (ret
keywords = append(keywords, keyword)
}
backlink := buildBacklink(linkRef.ID, refTree, keywords, luteEngine)
- ret = append(ret, backlink)
+ if nil != backlink {
+ ret = append(ret, backlink)
+ }
}
return
}