From 914f6314c095a71115c98e48f1a4136e31825417 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Tue, 10 Dec 2024 23:11:21 +0800 Subject: [PATCH 1/3] :bug: Editor not automatically refreshed after rolling back document https://github.com/siyuan-note/siyuan/issues/13419 --- kernel/util/path.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/util/path.go b/kernel/util/path.go index 0669d05d1..a9617da84 100644 --- a/kernel/util/path.go +++ b/kernel/util/path.go @@ -38,6 +38,9 @@ var ( ) func GetTreeID(treePath string) string { + if strings.Contains(treePath, "\\") { + return strings.TrimSuffix(filepath.Base(treePath), ".sy") + } return strings.TrimSuffix(path.Base(treePath), ".sy") } From 7e21eb12e65453e65c0ffc25ecdf355fd20d9bce Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Tue, 10 Dec 2024 23:35:51 +0800 Subject: [PATCH 2/3] :bug: Unable to use `Query Syntax` to search https://github.com/siyuan-note/siyuan/issues/13422 --- kernel/model/search.go | 1 - 1 file changed, 1 deletion(-) diff --git a/kernel/model/search.go b/kernel/model/search.go index a18864e10..521800df7 100644 --- a/kernel/model/search.go +++ b/kernel/model/search.go @@ -1412,7 +1412,6 @@ func fullTextSearchCountByRegexp(exp, boxFilter, pathFilter, typeFilter, ignoreF } func fullTextSearchByFTS(query, boxFilter, pathFilter, typeFilter, ignoreFilter, orderBy string, beforeLen, page, pageSize int) (ret []*Block, matchedBlockCount, matchedRootCount int) { - query = stringQuery(query) table := "blocks_fts" // 大小写敏感 if !Conf.Search.CaseSensitive { table = "blocks_fts_case_insensitive" From d562fdb68d2adfb5f2e5dac6cdd73547e2e78004 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 11 Dec 2024 00:11:12 +0800 Subject: [PATCH 3/3] :bug: Paste code block missing line break https://github.com/siyuan-note/siyuan/issues/13416 --- kernel/model/import.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/model/import.go b/kernel/model/import.go index 4d69a3a1a..1745c6d0d 100644 --- a/kernel/model/import.go +++ b/kernel/model/import.go @@ -67,7 +67,7 @@ func HTML2Markdown(htmlStr string, luteEngine *lute.Lute) (markdown string, with } func HTML2Tree(htmlStr string, luteEngine *lute.Lute) (tree *parse.Tree, withMath bool) { - htmlStr = util.RemoveInvalid(htmlStr) + htmlStr = gulu.Str.RemovePUA(htmlStr) assetDirPath := filepath.Join(util.DataDir, "assets") tree = luteEngine.HTML2Tree(htmlStr) ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {