0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2024-11-11 12:26:27 +08:00
commit 6b6ce37ca2
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/electron-builder-darwin-arm64.yml
View file

@ -58,5 +58,5 @@ extraResources:
- from: "src/assets/fonts"
to: "appearance/fonts"
filter: "!**/{.DS_Store}"
- from: "pandoc/pandoc-darwin-amd64.zip"
- from: "pandoc/pandoc-darwin-arm64.zip"
to: "pandoc.zip"

4
app/electron-builder-linux-arm64.yml
View file

@ -63,4 +63,6 @@ extraResources:
filter: "!**/{.DS_Store,custom.css}"
- from: "src/assets/fonts"
to: "appearance/fonts"
filter: "!**/{.DS_Store}"
filter: "!**/{.DS_Store}"
- from: "pandoc/pandoc-linux-arm64.zip"
to: "pandoc.zip"

6
kernel/model/backlink.go
View file

@ -571,7 +571,8 @@ func buildLinkRefs(defRootID string, refs []*sql.Ref, keyword string) (ret []*Bl
if nil != refBlock && p.FContent == refBlock.Content { // 使用内容判断是否是列表项下第一个子块
// 如果是列表项下第一个子块，则后续会通过列表项传递或关联处理，所以这里就不处理这个段落了
processedParagraphs.Add(p.ID)
if !strings.Contains(p.Content, keyword) && !strings.Contains(path.Base(p.HPath), keyword) {
if !strings.Contains(p.Content, keyword) && !strings.Contains(path.Base(p.HPath), keyword) &&
!strings.Contains(p.Name, keyword) && !strings.Contains(p.Alias, keyword) && !strings.Contains(p.Memo, keyword) && !strings.Contains(p.Tag, keyword) {
refsCount--
continue
}
@ -587,7 +588,8 @@ func buildLinkRefs(defRootID string, refs []*sql.Ref, keyword string) (ret []*Bl
}
}
if !strings.Contains(ref.Content, keyword) && !strings.Contains(path.Base(ref.HPath), keyword) {
if !strings.Contains(ref.Content, keyword) && !strings.Contains(path.Base(ref.HPath), keyword) &&
!strings.Contains(ref.Name, keyword) && !strings.Contains(ref.Alias, keyword) && !strings.Contains(ref.Memo, keyword) && !strings.Contains(ref.Tag, keyword) {
refsCount--
continue
}

8
kernel/model/conf.go
View file

@ -220,10 +220,6 @@ func InitConf() {
util.UseSingleLineSave = Conf.FileTree.UseSingleLineSave
util.CurrentCloudRegion = Conf.CloudRegion
Conf.System.DisabledFeatures = util.DisabledFeatures
if 1 > len(Conf.System.DisabledFeatures) {
Conf.System.DisabledFeatures = []string{}
}
if nil == Conf.Tag {
Conf.Tag = conf.NewTag()
@ -311,6 +307,10 @@ func InitConf() {
Conf.System.ID = util.GetDeviceID()
Conf.System.Name = util.GetDeviceName()
}
Conf.System.DisabledFeatures = util.DisabledFeatures
if 1 > len(Conf.System.DisabledFeatures) {
Conf.System.DisabledFeatures = []string{}
}
if nil == Conf.Snippet {
Conf.Snippet = conf.NewSnpt()