diff --git a/app/electron-builder-darwin-arm64.yml b/app/electron-builder-darwin-arm64.yml index 86c8064b4..d59459291 100644 --- a/app/electron-builder-darwin-arm64.yml +++ b/app/electron-builder-darwin-arm64.yml @@ -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" diff --git a/app/electron-builder-linux-arm64.yml b/app/electron-builder-linux-arm64.yml index 943ba99f9..d6fa09711 100644 --- a/app/electron-builder-linux-arm64.yml +++ b/app/electron-builder-linux-arm64.yml @@ -63,4 +63,6 @@ extraResources: filter: "!**/{.DS_Store,custom.css}" - from: "src/assets/fonts" to: "appearance/fonts" - filter: "!**/{.DS_Store}" \ No newline at end of file + filter: "!**/{.DS_Store}" + - from: "pandoc/pandoc-linux-arm64.zip" + to: "pandoc.zip" \ No newline at end of file diff --git a/kernel/model/backlink.go b/kernel/model/backlink.go index 3f96a8db3..5e86a11d0 100644 --- a/kernel/model/backlink.go +++ b/kernel/model/backlink.go @@ -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 } diff --git a/kernel/model/conf.go b/kernel/model/conf.go index ae7ecb3a1..79f48fa23 100644 --- a/kernel/model/conf.go +++ b/kernel/model/conf.go @@ -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()