From 57a3188f4c79c7fb4bcfb657c035b7ba0de409e3 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sat, 4 Feb 2023 10:30:55 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E5=9D=97=E6=A0=91?= =?UTF-8?q?=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/block.go | 9 +++++---- kernel/treenode/blocktree.go | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/kernel/model/block.go b/kernel/model/block.go index b9b51f668..c48e11dcb 100644 --- a/kernel/model/block.go +++ b/kernel/model/block.go @@ -155,6 +155,9 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) { } } + refreshUpdated(defNode) + refreshUpdated(refNode) + refPivot := treenode.NewParagraph() refNode.InsertBefore(refPivot) @@ -215,13 +218,11 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) { } refPivot.Unlink() - treenode.IndexBlockTree(refTree) - if err = writeJSONQueue(refTree); nil != err { + if err = indexWriteJSONQueue(refTree); nil != err { return } if !sameTree { - treenode.IndexBlockTree(defTree) - if err = writeJSONQueue(defTree); nil != err { + if err = indexWriteJSONQueue(defTree); nil != err { return } } diff --git a/kernel/treenode/blocktree.go b/kernel/treenode/blocktree.go index bb5e2f1c9..cc8128e9a 100644 --- a/kernel/treenode/blocktree.go +++ b/kernel/treenode/blocktree.go @@ -270,7 +270,7 @@ func IndexBlockTree(tree *parse.Tree) { slice.m.Unlock() if nil != bt { - if bt.Updated != n.IALAttr("updated") { + if bt.Updated != n.IALAttr("updated") || bt.Path != tree.Path || bt.BoxID != tree.Box || bt.HPath != tree.HPath { children := ChildBlockNodes(n) // 需要考虑子块，因为一些操作（比如移动块）后需要同时更新子块 changedNodes = append(changedNodes, children...) }