diff --git a/kernel/av/av.go b/kernel/av/av.go
index 207e9ac04..6a291ffb6 100644
--- a/kernel/av/av.go
+++ b/kernel/av/av.go
@@ -564,9 +564,9 @@ func (av *AttributeView) GetCurrentView(viewID string) (ret *View, err error) {
 	return
 }
 
-func (av *AttributeView) ExistBlock(blockID string) bool {
+func (av *AttributeView) ExistItem(itemID string) bool {
 	for _, blockVal := range av.GetBlockKeyValues().Values {
-		if blockVal.BlockID == blockID {
+		if blockVal.BlockID == itemID {
 			return true
 		}
 	}
@@ -582,11 +582,11 @@ func (av *AttributeView) ExistBoundBlock(nodeID string) bool {
 	return false
 }
 
-func (av *AttributeView) GetValue(keyID, blockID string) (ret *Value) {
+func (av *AttributeView) GetValue(keyID, itemID string) (ret *Value) {
 	for _, kv := range av.KeyValues {
 		if kv.Key.ID == keyID {
 			for _, v := range kv.Values {
-				if v.BlockID == blockID {
+				if v.BlockID == itemID {
 					ret = v
 					return
 				}
diff --git a/kernel/av/filter.go b/kernel/av/filter.go
index 207795059..9f190787f 100644
--- a/kernel/av/filter.go
+++ b/kernel/av/filter.go
@@ -185,7 +185,7 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, rowID st
 		for _, blockID := range relVal.Relation.BlockIDs {
 			destVal := destAv.GetValue(key.Rollup.KeyID, blockID)
 			if nil == destVal {
-				if destAv.ExistBlock(blockID) { // 数据库中存在项目但是字段值不存在是数据未初始化，这里补一个默认值
+				if destAv.ExistItem(blockID) { // 数据库中存在项目但是字段值不存在是数据未初始化，这里补一个默认值
 					destVal = GetAttributeViewDefaultValue(ast.NewNodeID(), key.Rollup.KeyID, blockID, destKey.Type)
 				}
 				if nil == destVal {
diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
index 9242708f1..becf6b2dd 100644
--- a/kernel/model/attribute_view.go
+++ b/kernel/model/attribute_view.go
@@ -1378,7 +1378,7 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
 						for _, bID := range relVal.Relation.BlockIDs {
 							destVal := destAv.GetValue(kv.Key.Rollup.KeyID, bID)
 							if nil == destVal {
-								if destAv.ExistBlock(bID) { // 数据库中存在项目但是字段值不存在是数据未初始化，这里补一个默认值
+								if destAv.ExistItem(bID) { // 数据库中存在项目但是字段值不存在是数据未初始化，这里补一个默认值
 									destVal = av.GetAttributeViewDefaultValue(ast.NewNodeID(), kv.Key.Rollup.KeyID, bID, destKey.Type)
 								}
 								if nil == destVal {
@@ -2542,20 +2542,20 @@ func (tx *Transaction) getAttrViewBoundNodes(attrView *av.AttributeView) (trees
 		}
 
 		var tree *parse.Tree
-		tree = trees[blockKeyValue.BlockID]
+		tree = trees[blockKeyValue.Block.ID]
 		if nil == tree {
 			if nil == tx {
-				tree, _ = LoadTreeByBlockID(blockKeyValue.BlockID)
+				tree, _ = LoadTreeByBlockID(blockKeyValue.Block.ID)
 			} else {
-				tree, _ = tx.loadTree(blockKeyValue.BlockID)
+				tree, _ = tx.loadTree(blockKeyValue.Block.ID)
 			}
 		}
 		if nil == tree {
 			continue
 		}
-		trees[blockKeyValue.BlockID] = tree
+		trees[blockKeyValue.Block.ID] = tree
 
-		node := treenode.GetNodeInTree(tree, blockKeyValue.BlockID)
+		node := treenode.GetNodeInTree(tree, blockKeyValue.Block.ID)
 		if nil == node {
 			continue
 		}
diff --git a/kernel/sql/av.go b/kernel/sql/av.go
index 209c0e839..ab1e14fcc 100644
--- a/kernel/sql/av.go
+++ b/kernel/sql/av.go
@@ -385,7 +385,7 @@ func fillAttributeViewAutoGeneratedValues(attrView *av.AttributeView, collection
 					}
 
 					if nil == destVal {
-						if destAv.ExistBlock(blockID) { // 数据库中存在项目但是字段值不存在是数据未初始化，这里补一个默认值
+						if destAv.ExistItem(blockID) { // 数据库中存在项目但是字段值不存在是数据未初始化，这里补一个默认值
 							destVal = av.GetAttributeViewDefaultValue(ast.NewNodeID(), rollupKey.Rollup.KeyID, blockID, destKey.Type)
 						}
 						if nil == destVal {
diff --git a/kernel/sql/av_gallery.go b/kernel/sql/av_gallery.go
index 2fe8d977b..258ffa961 100644
--- a/kernel/sql/av_gallery.go
+++ b/kernel/sql/av_gallery.go
@@ -136,11 +136,11 @@ func fillAttributeViewGalleryCardCover(attrView *av.AttributeView, view *av.View
 			break
 		}
 
-		tree := trees[blockValue.BlockID]
+		tree := trees[blockValue.Block.ID]
 		if nil == tree {
 			break
 		}
-		node := treenode.GetNodeInTree(tree, blockValue.BlockID)
+		node := treenode.GetNodeInTree(tree, blockValue.Block.ID)
 		if nil == node {
 			break
 		}
@@ -199,11 +199,11 @@ func fillAttributeViewGalleryCardCover(attrView *av.AttributeView, view *av.View
 			break
 		}
 
-		tree := trees[blockValue.BlockID]
+		tree := trees[blockValue.Block.ID]
 		if nil == tree {
 			break
 		}
-		node := treenode.GetNodeInTree(tree, blockValue.BlockID)
+		node := treenode.GetNodeInTree(tree, blockValue.Block.ID)
 		if nil == node {
 			break
 		}