Просмотр исходного кода

:art: 行级元素支持嵌套和交叉 https://github.com/siyuan-note/siyuan/issues/2911

Liang Ding 2 лет назад
Родитель
Сommit
f48da71d33
1 измененных файлов с 4 добавлено и 2 удалено
  1. 4 2
      kernel/filesys/tree.go

+ 4 - 2
kernel/filesys/tree.go

@@ -103,9 +103,10 @@ func WriteTree(tree *parse.Tree) (err error) {
 		treenode.ReindexBlockTree(tree)
 		treenode.ReindexBlockTree(tree)
 	}
 	}
 
 
-	if "" == tree.Root.Spec {
+	if oldSpec := tree.Root.Spec; "" == oldSpec {
 		treenode.NestedInlines2FlattedSpans(tree)
 		treenode.NestedInlines2FlattedSpans(tree)
 		tree.Root.Spec = "1"
 		tree.Root.Spec = "1"
+		logging.LogInfof("migrated tree [%s] from spec [%s] to [%s]", tree.Root.ID, oldSpec, tree.Root.Spec)
 	}
 	}
 	renderer := render.NewJSONRenderer(tree, luteEngine.RenderOptions)
 	renderer := render.NewJSONRenderer(tree, luteEngine.RenderOptions)
 	output := renderer.Render()
 	output := renderer.Render()
@@ -185,10 +186,11 @@ func parseJSON2Tree(boxID, p string, jsonData []byte, luteEngine *lute.Lute) (re
 
 
 	ret.Box = boxID
 	ret.Box = boxID
 	ret.Path = p
 	ret.Path = p
-	if "" == ret.Root.Spec {
+	if oldSpec := ret.Root.Spec; "" == oldSpec {
 		treenode.NestedInlines2FlattedSpans(ret)
 		treenode.NestedInlines2FlattedSpans(ret)
 		ret.Root.Spec = "1"
 		ret.Root.Spec = "1"
 		needFix = true
 		needFix = true
+		logging.LogInfof("migrated tree [%s] from spec [%s] to [%s]", ret.Root.ID, oldSpec, ret.Root.Spec)
 	}
 	}
 	if needFix {
 	if needFix {
 		renderer := render.NewJSONRenderer(ret, luteEngine.RenderOptions)
 		renderer := render.NewJSONRenderer(ret, luteEngine.RenderOptions)