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

kernel/model/block.go

@@ -179,6 +179,9 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) {
 			li.SetIALAttr("id", newID)
 			li.SetIALAttr("updated", newID[:14])
 			li.AppendChild(defNode)
+			for i := len(defNodeChildren) - 1; -1 < i; i-- {
+				defNode.InsertAfter(defNodeChildren[i])
+			}
 			refPivot.InsertAfter(li)
 		} else {
 			defNode.InsertAfter(refNode)

kernel/model/file.go

@@ -431,6 +431,8 @@ func BlocksWordCount(ids []string) (ret *util.BlockStatResult) {
 }
 
 func StatTree(id string) (ret *util.BlockStatResult) {
+	WaitForWritingFiles()
+
 	tree, _ := loadTreeByBlockID(id)
 	if nil == tree {
 		return