From d84baabc332f05173237da32077847dc870fc045 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 23 May 2024 10:30:33 +0800
Subject: [PATCH 1/2] :art: Export the binding block docs when exporting the
 doc where the database is located
 https://github.com/siyuan-note/siyuan/issues/11486
 https://github.com/siyuan-note/siyuan/issues/11486

---
 kernel/model/export.go | 56 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/kernel/model/export.go b/kernel/model/export.go
index d5635a942..00a008fd7 100644
--- a/kernel/model/export.go
+++ b/kernel/model/export.go
@@ -2527,9 +2527,65 @@ type refAsFootnotes struct {
 func exportRefTrees(tree *parse.Tree) (ret map[string]*parse.Tree) {
 	ret = map[string]*parse.Tree{}
 	exportRefTrees0(tree, &ret)
+
+	attrViewDefTrees := map[string]*parse.Tree{}
+	exportAttributeViewRefTrees0(tree, &attrViewDefTrees)
+	for _, t := range attrViewDefTrees {
+		if nil == ret[t.ID] {
+			ret[t.ID] = t
+		}
+	}
 	return
 }
 
+func exportAttributeViewRefTrees0(tree *parse.Tree, retTrees *map[string]*parse.Tree) {
+	// 导出数据库所在文档时一并导出绑定块所在文档
+	// Export the binding block docs when exporting the doc where the database is located https://github.com/siyuan-note/siyuan/issues/11486
+
+	if nil != (*retTrees)[tree.ID] {
+		return
+	}
+	(*retTrees)[tree.ID] = tree
+
+	ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {
+		if !entering {
+			return ast.WalkContinue
+		}
+
+		if ast.NodeAttributeView == n.Type {
+			avID := n.AttributeViewID
+			if "" == avID {
+				return ast.WalkContinue
+			}
+
+			attrView, _ := av.ParseAttributeView(avID)
+			if nil == attrView {
+				return ast.WalkContinue
+			}
+
+			blockKeyValues := attrView.GetBlockKeyValues()
+			if nil == blockKeyValues {
+				return ast.WalkContinue
+			}
+
+			for _, val := range blockKeyValues.Values {
+				defBlock := treenode.GetBlockTree(val.BlockID)
+				if nil == defBlock {
+					continue
+				}
+
+				defTree, _ := LoadTreeByBlockID(defBlock.RootID)
+				if nil == defTree {
+					continue
+				}
+
+				exportAttributeViewRefTrees0(defTree, retTrees)
+			}
+		}
+		return ast.WalkContinue
+	})
+}
+
 func exportRefTrees0(tree *parse.Tree, retTrees *map[string]*parse.Tree) {
 	if nil != (*retTrees)[tree.ID] {
 		return

From 8901bd3abc0d60114567c588f8a6bd9e6d9d6638 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 23 May 2024 10:58:14 +0800
Subject: [PATCH 2/2] :art: Export the binding block docs when exporting the
 doc where the database is located
 https://github.com/siyuan-note/siyuan/issues/11486
 https://github.com/siyuan-note/siyuan/issues/11486

---
 kernel/model/export.go | 88 +++++++++++++++---------------------------
 1 file changed, 32 insertions(+), 56 deletions(-)

diff --git a/kernel/model/export.go b/kernel/model/export.go
index 00a008fd7..43aefb0b5 100644
--- a/kernel/model/export.go
+++ b/kernel/model/export.go
@@ -2527,65 +2527,9 @@ type refAsFootnotes struct {
 func exportRefTrees(tree *parse.Tree) (ret map[string]*parse.Tree) {
 	ret = map[string]*parse.Tree{}
 	exportRefTrees0(tree, &ret)
-
-	attrViewDefTrees := map[string]*parse.Tree{}
-	exportAttributeViewRefTrees0(tree, &attrViewDefTrees)
-	for _, t := range attrViewDefTrees {
-		if nil == ret[t.ID] {
-			ret[t.ID] = t
-		}
-	}
 	return
 }
 
-func exportAttributeViewRefTrees0(tree *parse.Tree, retTrees *map[string]*parse.Tree) {
-	// 导出数据库所在文档时一并导出绑定块所在文档
-	// Export the binding block docs when exporting the doc where the database is located https://github.com/siyuan-note/siyuan/issues/11486
-
-	if nil != (*retTrees)[tree.ID] {
-		return
-	}
-	(*retTrees)[tree.ID] = tree
-
-	ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {
-		if !entering {
-			return ast.WalkContinue
-		}
-
-		if ast.NodeAttributeView == n.Type {
-			avID := n.AttributeViewID
-			if "" == avID {
-				return ast.WalkContinue
-			}
-
-			attrView, _ := av.ParseAttributeView(avID)
-			if nil == attrView {
-				return ast.WalkContinue
-			}
-
-			blockKeyValues := attrView.GetBlockKeyValues()
-			if nil == blockKeyValues {
-				return ast.WalkContinue
-			}
-
-			for _, val := range blockKeyValues.Values {
-				defBlock := treenode.GetBlockTree(val.BlockID)
-				if nil == defBlock {
-					continue
-				}
-
-				defTree, _ := LoadTreeByBlockID(defBlock.RootID)
-				if nil == defTree {
-					continue
-				}
-
-				exportAttributeViewRefTrees0(defTree, retTrees)
-			}
-		}
-		return ast.WalkContinue
-	})
-}
-
 func exportRefTrees0(tree *parse.Tree, retTrees *map[string]*parse.Tree) {
 	if nil != (*retTrees)[tree.ID] {
 		return
@@ -2612,6 +2556,38 @@ func exportRefTrees0(tree *parse.Tree, retTrees *map[string]*parse.Tree) {
 			}
 
 			exportRefTrees0(defTree, retTrees)
+		} else if ast.NodeAttributeView == n.Type {
+			// 导出数据库所在文档时一并导出绑定块所在文档
+			// Export the binding block docs when exporting the doc where the database is located https://github.com/siyuan-note/siyuan/issues/11486
+
+			avID := n.AttributeViewID
+			if "" == avID {
+				return ast.WalkContinue
+			}
+
+			attrView, _ := av.ParseAttributeView(avID)
+			if nil == attrView {
+				return ast.WalkContinue
+			}
+
+			blockKeyValues := attrView.GetBlockKeyValues()
+			if nil == blockKeyValues {
+				return ast.WalkContinue
+			}
+
+			for _, val := range blockKeyValues.Values {
+				defBlock := treenode.GetBlockTree(val.BlockID)
+				if nil == defBlock {
+					continue
+				}
+
+				defTree, _ := LoadTreeByBlockID(defBlock.RootID)
+				if nil == defTree {
+					continue
+				}
+
+				exportRefTrees0(defTree, retTrees)
+			}
 		}
 		return ast.WalkContinue
 	})