diff --git a/app/src/config/query.ts b/app/src/config/query.ts index 662d1903d..4f89afb61 100644 --- a/app/src/config/query.ts +++ b/app/src/config/query.ts @@ -226,13 +226,6 @@ export const query = { - - - ${window.siyuan.languages.keywordsLimit} - - - - @@ -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; }); diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts index 745068107..62102a1d2 100644 --- a/app/src/types/index.d.ts +++ b/app/src/types/index.d.ts @@ -487,7 +487,6 @@ declare interface IConfig { virtualRefAlias: boolean virtualRefAnchor: boolean virtualRefDoc: boolean - virtualRefKeywordsLimit: boolean }, stat: { treeCount: number diff --git a/kernel/api/setting.go b/kernel/api/setting.go index 17c5ff701..8f67456f5 100644 --- a/kernel/api/setting.go +++ b/kernel/api/setting.go @@ -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 diff --git a/kernel/conf/search.go b/kernel/conf/search.go index f7b772489..a71c2b567 100644 --- a/kernel/conf/search.go +++ b/kernel/conf/search.go @@ -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, } } diff --git a/kernel/model/conf.go b/kernel/model/conf.go index de0a553fb..cf31474d1 100644 --- a/kernel/model/conf.go +++ b/kernel/model/conf.go @@ -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() diff --git a/kernel/model/virutalref.go b/kernel/model/virutalref.go index 0130b1469..d0ca24d44 100644 --- a/kernel/model/virutalref.go +++ b/kernel/model/virutalref.go @@ -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 }