From 7d740bcc88cb40f8e967ea41d5a22b56401411fd Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 8 Sep 2024 21:59:13 +0800 Subject: [PATCH 1/3] :art: Improve list item convert to doc https://github.com/siyuan-note/siyuan/issues/12411 --- kernel/model/heading.go | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/model/heading.go b/kernel/model/heading.go index fd33c12db..53102b358 100644 --- a/kernel/model/heading.go +++ b/kernel/model/heading.go @@ -54,6 +54,7 @@ func (tx *Transaction) doFoldHeading(operation *Operation) (ret *TxErr) { return ast.WalkContinue } + n.SetIALAttr("fold", "1") n.SetIALAttr("heading-fold", "1") return ast.WalkContinue }) From 283ca7da41dba8be2c8b1fd98102952df666275a Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 8 Sep 2024 22:58:30 +0800 Subject: [PATCH 2/3] :art: Improve export to Liandi https://github.com/siyuan-note/siyuan/issues/12338 --- kernel/model/export.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/model/export.go b/kernel/model/export.go index d5c3f0d62..a94e4f2fa 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -1866,6 +1866,11 @@ func exportMarkdownContent0(tree *parse.Tree, cloudAssetsBase string, assetsDest if util.IsAssetLinkDest([]byte(href)) { n.TextMarkAHref = strings.ReplaceAll(href, " ", "_") } + } else if ast.NodeIFrame == n.Type || ast.NodeAudio == n.Type || ast.NodeVideo == n.Type { + dest := treenode.GetNodeSrcTokens(n) + if util.IsAssetLinkDest([]byte(dest)) { + setAssetsLinkDest(n, dest, strings.ReplaceAll(dest, " ", "_")) + } } return ast.WalkContinue }) From 4e0aa60ebffcbcf21a9e6b0dc648bf31931b280f Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 8 Sep 2024 23:51:26 +0800 Subject: [PATCH 3/3] :art: The interface will no longer be refreshed after find-replace https://github.com/siyuan-note/siyuan/issues/11844 --- kernel/model/search.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/kernel/model/search.go b/kernel/model/search.go index ed0687691..acd44ff8d 100644 --- a/kernel/model/search.go +++ b/kernel/model/search.go @@ -519,6 +519,8 @@ func FindReplace(keyword, replacement string, replaceTypes map[string]bool, ids } indexHistoryDir(filepath.Base(historyDir), util.NewLute()) + luteEngine := util.NewLute() + var reloadTreeIDs []string for i, id := range ids { bt := treenode.GetBlockTree(id) if nil == bt { @@ -535,6 +537,8 @@ func FindReplace(keyword, replacement string, replaceTypes map[string]bool, ids continue } + reloadTreeIDs = append(reloadTreeIDs, tree.ID) + if ast.NodeDocument == node.Type { if !replaceTypes["docTitle"] { continue @@ -555,7 +559,6 @@ func FindReplace(keyword, replacement string, replaceTypes map[string]bool, ids } } } else { - luteEngine := util.NewLute() var unlinks []*ast.Node ast.Walk(node, func(n *ast.Node, entering bool) ast.WalkStatus { if !entering { @@ -789,9 +792,13 @@ func FindReplace(keyword, replacement string, replaceTypes map[string]bool, ids } WaitForWritingFiles() - if 0 < len(ids) { - task.AppendAsyncTaskWithDelay(task.ReloadUI, 500*time.Millisecond, util.ReloadUI) + + reloadTreeIDs = gulu.Str.RemoveDuplicatedElem(reloadTreeIDs) + for _, id := range reloadTreeIDs { + util.PushProtyleReload(id) } + + util.PushClearProgress() return }