github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-02 22:21:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/config/query.ts
View File

@ -226,13 +226,6 @@ export const query = {
<span class="fn__space"></span> <span class="fn__space"></span>
<input class="b3-switch" id="virtualRefDoc" type="checkbox"${window.siyuan.config.search.virtualRefDoc ? " checked" : ""}/> <input class="b3-switch" id="virtualRefDoc" type="checkbox"${window.siyuan.config.search.virtualRefDoc ? " checked" : ""}/>
</label> </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>
</div> </div>
<label class="fn__flex b3-label config__item"> <label class="fn__flex b3-label config__item">
@ -284,7 +277,6 @@ export const query = {
virtualRefAlias: (query.element.querySelector("#virtualRefAlias") as HTMLInputElement).checked, virtualRefAlias: (query.element.querySelector("#virtualRefAlias") as HTMLInputElement).checked,
virtualRefAnchor: (query.element.querySelector("#virtualRefAnchor") as HTMLInputElement).checked, virtualRefAnchor: (query.element.querySelector("#virtualRefAnchor") as HTMLInputElement).checked,
virtualRefDoc: (query.element.querySelector("#virtualRefDoc") as HTMLInputElement).checked, virtualRefDoc: (query.element.querySelector("#virtualRefDoc") as HTMLInputElement).checked,
virtualRefKeywordsLimit: parseInt((query.element.querySelector("#virtualRefKeywordsLimit") as HTMLInputElement).value),
}, response => { }, response => {
window.siyuan.config.search = response.data; window.siyuan.config.search = response.data;
}); });

1
app/src/types/index.d.ts vendored
View File

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

4
kernel/api/setting.go
View File

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

18
kernel/conf/search.go
View File

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

3
kernel/model/conf.go
View File

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

5
kernel/model/virutalref.go
View File

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