github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-03 04:31:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 Improve backmention highlighting https://github.com/siyuan-note/siyuan/issues/13328

Browse Source
This commit is contained in:
Daniel 2024-12-13 10:42:04 +08:00
parent 441b6f7f65
commit 8f89caf22e
No known key found for this signature in database
GPG Key ID: 86211BA83DF03017
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/api/ref.go
View File

@ -60,9 +60,10 @@ func getBackmentionDoc(c *gin.Context) {
if val, ok := arg["highlight"]; ok { if val, ok := arg["highlight"]; ok {
highlight = val.(bool) highlight = val.(bool)
} }
backlinks := model.GetBackmentionDoc(defID, refTreeID, keyword, containChildren, highlight) backlinks, keywords := model.GetBackmentionDoc(defID, refTreeID, keyword, containChildren, highlight)
ret.Data = map[string]interface{}{ ret.Data = map[string]interface{}{
"backmentions": backlinks, "backmentions": backlinks,
"keywords": keywords,
} }
} }
@ -86,9 +87,10 @@ func getBacklinkDoc(c *gin.Context) {
if val, ok := arg["highlight"]; ok { if val, ok := arg["highlight"]; ok {
highlight = val.(bool) highlight = val.(bool)
} }
backlinks := model.GetBacklinkDoc(defID, refTreeID, keyword, containChildren, highlight) backlinks, keywords := model.GetBacklinkDoc(defID, refTreeID, keyword, containChildren, highlight)
ret.Data = map[string]interface{}{ ret.Data = map[string]interface{}{
"backlinks": backlinks, "backlinks": backlinks,
"keywords": keywords,
} }
} }

15
kernel/model/backlink.go
View File

@ -62,8 +62,7 @@ type Backlink struct {
node *ast.Node // 仅用于按文档内容顺序排序 node *ast.Node // 仅用于按文档内容顺序排序
} }
func GetBackmentionDoc(defID, refTreeID, keyword string, containChildren, highlight bool) (ret []*Backlink) { func GetBackmentionDoc(defID, refTreeID, keyword string, containChildren, highlight bool) (ret []*Backlink, keywords []string) {
var keywords []string
keyword = strings.TrimSpace(keyword) keyword = strings.TrimSpace(keyword)
if "" != keyword { if "" != keyword {
keywords = strings.Split(keyword, " ") keywords = strings.Split(keyword, " ")
@ -98,6 +97,11 @@ func GetBackmentionDoc(defID, refTreeID, keyword string, containChildren, highli
mentionKeywords = append(mentionKeywords, strings.Split(keyword, " ")...) mentionKeywords = append(mentionKeywords, strings.Split(keyword, " ")...)
} }
mentionKeywords = gulu.Str.RemoveDuplicatedElem(mentionKeywords) mentionKeywords = gulu.Str.RemoveDuplicatedElem(mentionKeywords)
keywords = append(keywords, mentionKeywords...)
keywords = gulu.Str.RemoveDuplicatedElem(keywords)
if 1 > len(keywords) {
keywords = []string{}
}
var refTree *parse.Tree var refTree *parse.Tree
trees := filesys.LoadTrees(mentionBlockIDs) trees := filesys.LoadTrees(mentionBlockIDs)
@ -118,12 +122,15 @@ func GetBackmentionDoc(defID, refTreeID, keyword string, containChildren, highli
return return
} }
func GetBacklinkDoc(defID, refTreeID, keyword string, containChildren, highlight bool) (ret []*Backlink) { func GetBacklinkDoc(defID, refTreeID, keyword string, containChildren, highlight bool) (ret []*Backlink, keywords []string) {
var keywords []string
keyword = strings.TrimSpace(keyword) keyword = strings.TrimSpace(keyword)
if "" != keyword { if "" != keyword {
keywords = strings.Split(keyword, " ") keywords = strings.Split(keyword, " ")
} }
keywords = gulu.Str.RemoveDuplicatedElem(keywords)
if 1 > len(keywords) {
keywords = []string{}
}
ret = []*Backlink{} ret = []*Backlink{}
sqlBlock := sql.GetBlock(defID) sqlBlock := sql.GetBlock(defID)