From abfddf76a5f3cc6309ccef8279a948013f998fa7 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 10 Mar 2024 23:00:45 +0800 Subject: [PATCH] :art: Clean code --- kernel/av/av.go | 2 ++ kernel/model/attribute_view.go | 6 +++--- kernel/model/file.go | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kernel/av/av.go b/kernel/av/av.go index 222d5b143..8cb77e8f8 100644 --- a/kernel/av/av.go +++ b/kernel/av/av.go @@ -654,4 +654,6 @@ var ( const ( NodeAttrNameAvs = "custom-avs" // 用于标记块所属的属性视图,逗号分隔 av id NodeAttrView = "custom-sy-av-view" // 用于标记块所属的属性视图视图 view id Database block support specified view https://github.com/siyuan-note/siyuan/issues/10443 + + NodeAttrViewNames = "av-names" // 用于临时标记块所属的属性视图名称,空格分隔 ) diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index 522ef6c8d..af9d2e727 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -1720,7 +1720,7 @@ func setAttributeViewName(operation *Operation) (err error) { for _, node := range nodes { avNames := getAvNames(node.IALAttr(av.NodeAttrNameAvs)) oldAttrs := parse.IAL2Map(node.KramdownIAL) - node.SetIALAttr("av-names", avNames) + node.SetIALAttr(av.NodeAttrViewNames, avNames) pushBroadcastAttrTransactions(oldAttrs, node) } return @@ -2087,7 +2087,7 @@ func addAttributeViewBlock(avID, blockID, previousBlockID, addingBlockID string, avNames := getAvNames(attrs[av.NodeAttrNameAvs]) if "" != avNames { - attrs["av-names"] = avNames + attrs[av.NodeAttrViewNames] = avNames } if nil != tx { @@ -2207,7 +2207,7 @@ func removeNodeAvID(node *ast.Node, avID string, tx *Transaction, tree *parse.Tr attrs[av.NodeAttrNameAvs] = strings.Join(avIDs, ",") node.SetIALAttr(av.NodeAttrNameAvs, strings.Join(avIDs, ",")) avNames := getAvNames(node.IALAttr(av.NodeAttrNameAvs)) - attrs["av-names"] = avNames + attrs[av.NodeAttrViewNames] = avNames } } diff --git a/kernel/model/file.go b/kernel/model/file.go index 55a35751b..4826ecb7b 100644 --- a/kernel/model/file.go +++ b/kernel/model/file.go @@ -736,7 +736,7 @@ func GetDoc(startID, endID, id string, index int, query string, queryTypes map[s // 填充属性视图角标 Display the database title on the block superscript https://github.com/siyuan-note/siyuan/issues/10545 avNames := getAvNames(n.IALAttr(av.NodeAttrNameAvs)) if "" != avNames { - n.SetIALAttr("av-names", avNames) + n.SetIALAttr(av.NodeAttrViewNames, avNames) } }