🔥 移除 设置 - 搜索 - 虚拟引用 - 关键字数量限制 Fix https://github.com/siyuan-note/siyuan/issues/7634

This commit is contained in:
Liang Ding 2023-03-12 16:29:14 +08:00
parent 003a4b3344
commit 66f6388c3d
No known key found for this signature in database
GPG Key ID: 136F30F901A2231D
6 changed files with 9 additions and 30 deletions

View File

@ -226,13 +226,6 @@ export const query = {
<span class="fn__space"></span>
<input class="b3-switch" id="virtualRefDoc" type="checkbox"${window.siyuan.config.search.virtualRefDoc ? " checked" : ""}/>
</label>
<label class="fn__flex" style="flex: 2">
<div class=>
${window.siyuan.languages.keywordsLimit}
</div>
<span class="fn__space"></span>
<input class="b3-text-field" id="virtualRefKeywordsLimit" type="number" min="1" max="10240" value="${window.siyuan.config.search.virtualRefKeywordsLimit}">
</label>
</div>
</div>
<label class="fn__flex b3-label config__item">
@ -284,7 +277,6 @@ export const query = {
virtualRefAlias: (query.element.querySelector("#virtualRefAlias") as HTMLInputElement).checked,
virtualRefAnchor: (query.element.querySelector("#virtualRefAnchor") as HTMLInputElement).checked,
virtualRefDoc: (query.element.querySelector("#virtualRefDoc") as HTMLInputElement).checked,
virtualRefKeywordsLimit: parseInt((query.element.querySelector("#virtualRefKeywordsLimit") as HTMLInputElement).value),
}, response => {
window.siyuan.config.search = response.data;
});

View File

@ -487,7 +487,6 @@ declare interface IConfig {
virtualRefAlias: boolean
virtualRefAnchor: boolean
virtualRefDoc: boolean
virtualRefKeywordsLimit: boolean
},
stat: {
treeCount: number

View File

@ -234,7 +234,6 @@ func setSearch(c *gin.Context) {
oldVirtualRefAlias := model.Conf.Search.VirtualRefAlias
oldVirtualRefAnchor := model.Conf.Search.VirtualRefAnchor
oldVirtualRefDoc := model.Conf.Search.VirtualRefDoc
oldVirtualRefKeywordsLimit := model.Conf.Search.VirtualRefKeywordsLimit
model.Conf.Search = s
model.Conf.Save()
@ -246,8 +245,7 @@ func setSearch(c *gin.Context) {
if oldVirtualRefName != s.VirtualRefName ||
oldVirtualRefAlias != s.VirtualRefAlias ||
oldVirtualRefAnchor != s.VirtualRefAnchor ||
oldVirtualRefDoc != s.VirtualRefDoc ||
oldVirtualRefKeywordsLimit != s.VirtualRefKeywordsLimit {
oldVirtualRefDoc != s.VirtualRefDoc {
model.ResetVirtualBlockRefCache()
}
ret.Data = s

View File

@ -52,11 +52,10 @@ type Search struct {
BacklinkMentionDoc bool `json:"backlinkMentionDoc"`
BacklinkMentionKeywordsLimit int `json:"backlinkMentionKeywordsLimit"`
VirtualRefName bool `json:"virtualRefName"`
VirtualRefAlias bool `json:"virtualRefAlias"`
VirtualRefAnchor bool `json:"virtualRefAnchor"`
VirtualRefDoc bool `json:"virtualRefDoc"`
VirtualRefKeywordsLimit int `json:"virtualRefKeywordsLimit"`
VirtualRefName bool `json:"virtualRefName"`
VirtualRefAlias bool `json:"virtualRefAlias"`
VirtualRefAnchor bool `json:"virtualRefAnchor"`
VirtualRefDoc bool `json:"virtualRefDoc"`
}
func NewSearch() *Search {
@ -88,11 +87,10 @@ func NewSearch() *Search {
BacklinkMentionDoc: true,
BacklinkMentionKeywordsLimit: 512,
VirtualRefName: true,
VirtualRefAlias: false,
VirtualRefAnchor: true,
VirtualRefDoc: true,
VirtualRefKeywordsLimit: 512,
VirtualRefName: true,
VirtualRefAlias: false,
VirtualRefAnchor: true,
VirtualRefDoc: true,
}
}

View File

@ -308,9 +308,6 @@ func InitConf() {
if 1 > Conf.Search.BacklinkMentionKeywordsLimit {
Conf.Search.BacklinkMentionKeywordsLimit = 512
}
if 1 > Conf.Search.VirtualRefKeywordsLimit {
Conf.Search.VirtualRefKeywordsLimit = 512
}
if nil == Conf.Stat {
Conf.Stat = conf.NewStat()

View File

@ -225,11 +225,6 @@ func getVirtualRefKeywords(docName string) (ret []string) {
// 虚拟引用排除当前文档名 https://github.com/siyuan-note/siyuan/issues/4537
ret = gulu.Str.ExcludeElem(ret, []string{docName})
ret = prepareMarkKeywords(ret)
// 在 设置 - 搜索 中分别增加虚拟引用和反链提及 `关键字数量限制` https://github.com/siyuan-note/siyuan/issues/6603
if Conf.Search.VirtualRefKeywordsLimit < len(ret) {
ret = ret[:Conf.Search.VirtualRefKeywordsLimit]
}
return
}