From 870c238ed6bec31130dc59ce865cc8f0f9aa00a8 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 13 Jul 2023 10:44:47 +0800 Subject: [PATCH] :recycle: Refactor av data structure --- kernel/av/av.go | 7 ++++--- kernel/model/attribute_view.go | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kernel/av/av.go b/kernel/av/av.go index 71f0bf542..932be2578 100644 --- a/kernel/av/av.go +++ b/kernel/av/av.go @@ -82,9 +82,10 @@ type KeySelectOption struct { } type Value struct { - ID string `json:"id"` - KeyID string `json:"keyID"` - BlockID string `json:"blockID"` + ID string `json:"id"` + KeyID string `json:"keyID"` + BlockID string `json:"blockID"` + Type KeyType `json:"type"` Block *ValueBlock `json:"block,omitempty"` Text *ValueText `json:"text,omitempty"` diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index 64ddac1a4..3a03b5c61 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -694,12 +694,13 @@ func updateAttributeViewCell(operation *Operation, tx *Transaction) (err error) for _, value := range keyValues.Values { if operation.ID == value.ID { val = value + val.Type = keyValues.Key.Type break } } if nil == val { - val = &av.Value{ID: operation.ID, KeyID: keyValues.Key.ID, BlockID: operation.RowID} + val = &av.Value{ID: operation.ID, KeyID: keyValues.Key.ID, BlockID: operation.RowID, Type: keyValues.Key.Type} keyValues.Values = append(keyValues.Values, val) } break