From 656a13ec890967b740c0349a8fc66870c1c7dc35 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Fri, 28 Jul 2023 12:06:52 +0800 Subject: [PATCH] :recycle: Update av --- kernel/model/attribute_view.go | 12 ++++++------ kernel/model/transaction.go | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index b24c889dc..40fe32d96 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -372,13 +372,13 @@ func addAttributeViewBlock(blockID string, operation *Operation, tree *parse.Tre attrs := parse.IAL2Map(node.KramdownIAL) attrs[NodeAttrNamePrefixAvKey+operation.AvID+"-"+blockValues.Key.ID] = "" // 将列作为属性添加到块中 - if "" == attrs[NodeAttrNameAVs] { - attrs[NodeAttrNameAVs] = operation.AvID + if "" == attrs[NodeAttrNameAvs] { + attrs[NodeAttrNameAvs] = operation.AvID } else { - avIDs := strings.Split(attrs[NodeAttrNameAVs], ",") + avIDs := strings.Split(attrs[NodeAttrNameAvs], ",") avIDs = append(avIDs, operation.AvID) avIDs = gulu.Str.RemoveDuplicatedElem(avIDs) - attrs[NodeAttrNameAVs] = strings.Join(avIDs, ",") + attrs[NodeAttrNameAvs] = strings.Join(avIDs, ",") } if err = setNodeAttrsWithTx(tx, node, tree, attrs); nil != err { @@ -946,6 +946,6 @@ func updateAttributeViewColumnOption(operation *Operation) (err error) { } const ( - NodeAttrNameAVs = "custom-avs" - NodeAttrNamePrefixAvKey = "custom-av-key-" + NodeAttrNameAvs = "custom-avs" // 用于标记块所属的属性视图,逗号分隔 av id + NodeAttrNamePrefixAvKey = "custom-av-key-" // 用于标记列 ) diff --git a/kernel/model/transaction.go b/kernel/model/transaction.go index 9512e20fa..50d106975 100644 --- a/kernel/model/transaction.go +++ b/kernel/model/transaction.go @@ -728,7 +728,7 @@ func (tx *Transaction) doDelete(operation *Operation) (ret *TxErr) { } func syncDelete2AttributeView(node *ast.Node) { - avs := node.IALAttr(NodeAttrNameAVs) + avs := node.IALAttr(NodeAttrNameAvs) if "" == avs { return } @@ -1240,7 +1240,7 @@ func refreshDynamicRefTexts(updatedDefNodes map[string]*ast.Node, updatedTrees m // 2. 更新属性视图主键内容 for _, updatedDefNode := range updatedDefNodes { - avs := updatedDefNode.IALAttr(NodeAttrNameAVs) + avs := updatedDefNode.IALAttr(NodeAttrNameAvs) if "" == avs { continue }