From f123a9a2101d256a503d9afb483a28f7ca48f5b9 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 13 Jul 2023 10:34:51 +0800 Subject: [PATCH] :recycle: Refactor av data structure --- kernel/av/table.go | 4 ++++ kernel/model/attribute_view.go | 15 ++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/kernel/av/table.go b/kernel/av/table.go index 4622ec5e4..6b760f683 100644 --- a/kernel/av/table.go +++ b/kernel/av/table.go @@ -251,6 +251,10 @@ type TableColumn struct { Hidden bool `json:"hidden"` // 是否隐藏 Width string `json:"width"` // 列宽度 Calc *ColumnCalc `json:"calc"` // 计算 + + // 以下是某些列类型的特有属性 + + Options []*KeySelectOption `json:"options,omitempty"` // 选项列表 } type TableRow struct { diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index f1af776ce..64ddac1a4 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -85,13 +85,14 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a } ret.Columns = append(ret.Columns, &av.TableColumn{ - ID: key.ID, - Name: key.Name, - Type: key.Type, - Icon: key.Icon, - Wrap: col.Wrap, - Hidden: col.Hidden, - Width: col.Width, + ID: key.ID, + Name: key.Name, + Type: key.Type, + Icon: key.Icon, + Wrap: col.Wrap, + Hidden: col.Hidden, + Width: col.Width, + Options: key.Options, }) }