From 9ab20332428a575c3efcb0e4c078f44ed066f84d Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sun, 8 Jun 2025 17:24:24 +0800
Subject: [PATCH] :recycle: Refactor av

---
 kernel/av/layout.go         |  9 +++++++++
 kernel/av/layout_gallery.go |  9 ---------
 kernel/av/layout_table.go   |  9 ---------
 kernel/sql/av_gallery.go    | 24 ++++++++++++------------
 kernel/sql/av_table.go      | 32 ++++++++++++++++----------------
 5 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/kernel/av/layout.go b/kernel/av/layout.go
index abdddbe2c..db867d501 100644
--- a/kernel/av/layout.go
+++ b/kernel/av/layout.go
@@ -52,4 +52,13 @@ type BaseInstanceField struct {
 	Icon   string  `json:"icon"`   // 字段图标
 	Hidden bool    `json:"hidden"` // 是否隐藏
 	Desc   string  `json:"desc"`   // 字段描述
+
+	// 以下是某些字段类型的特有属性
+
+	Options      []*SelectOption `json:"options,omitempty"`  // 选项列表
+	NumberFormat NumberFormat    `json:"numberFormat"`       // 数字字段格式化
+	Template     string          `json:"template"`           // 模板字段内容
+	Relation     *Relation       `json:"relation,omitempty"` // 关联字段
+	Rollup       *Rollup         `json:"rollup,omitempty"`   // 汇总字段
+	Date         *Date           `json:"date,omitempty"`     // 日期设置
 }
diff --git a/kernel/av/layout_gallery.go b/kernel/av/layout_gallery.go
index aa88d9e98..957f4f415 100644
--- a/kernel/av/layout_gallery.go
+++ b/kernel/av/layout_gallery.go
@@ -56,15 +56,6 @@ type GalleryCard struct {
 // GalleryField 描述了画廊实例卡片字段的结构。
 type GalleryField struct {
 	*BaseInstanceField
-
-	// 以下是某些字段类型的特有属性
-
-	Options      []*SelectOption `json:"options,omitempty"`  // 选项字段表
-	NumberFormat NumberFormat    `json:"numberFormat"`       // 数字字段格式化
-	Template     string          `json:"template"`           // 模板字段内容
-	Relation     *Relation       `json:"relation,omitempty"` // 关联字段
-	Rollup       *Rollup         `json:"rollup,omitempty"`   // 汇总字段
-	Date         *Date           `json:"date,omitempty"`     // 日期设置
 }
 
 // GalleryFieldValue 描述了画廊实例字段值的结构。
diff --git a/kernel/av/layout_table.go b/kernel/av/layout_table.go
index 9ef64fdcf..9c9bc811e 100644
--- a/kernel/av/layout_table.go
+++ b/kernel/av/layout_table.go
@@ -57,15 +57,6 @@ type TableColumn struct {
 	Pin   bool        `json:"pin"`   // 是否固定
 	Width string      `json:"width"` // 列宽度
 	Calc  *ColumnCalc `json:"calc"`  // 计算
-
-	// 以下是某些列类型的特有属性
-
-	Options      []*SelectOption `json:"options,omitempty"`  // 选项列表
-	NumberFormat NumberFormat    `json:"numberFormat"`       // 数字列格式化
-	Template     string          `json:"template"`           // 模板列内容
-	Relation     *Relation       `json:"relation,omitempty"` // 关联列
-	Rollup       *Rollup         `json:"rollup,omitempty"`   // 汇总列
-	Date         *Date           `json:"date,omitempty"`     // 日期设置
 }
 
 // TableRow 描述了表格实例行的结构。
diff --git a/kernel/sql/av_gallery.go b/kernel/sql/av_gallery.go
index 1fabda245..5b079bed3 100644
--- a/kernel/sql/av_gallery.go
+++ b/kernel/sql/av_gallery.go
@@ -38,19 +38,19 @@ func RenderAttributeViewGallery(attrView *av.AttributeView, view *av.View, query
 
 		ret.Fields = append(ret.Fields, &av.GalleryField{
 			BaseInstanceField: &av.BaseInstanceField{
-				ID:     key.ID,
-				Name:   key.Name,
-				Type:   key.Type,
-				Icon:   key.Icon,
-				Hidden: field.Hidden,
-				Desc:   key.Desc,
+				ID:           key.ID,
+				Name:         key.Name,
+				Type:         key.Type,
+				Icon:         key.Icon,
+				Hidden:       field.Hidden,
+				Desc:         key.Desc,
+				Options:      key.Options,
+				NumberFormat: key.NumberFormat,
+				Template:     key.Template,
+				Relation:     key.Relation,
+				Rollup:       key.Rollup,
+				Date:         key.Date,
 			},
-			Options:      key.Options,
-			NumberFormat: key.NumberFormat,
-			Template:     key.Template,
-			Relation:     key.Relation,
-			Rollup:       key.Rollup,
-			Date:         key.Date,
 		})
 	}
 
diff --git a/kernel/sql/av_table.go b/kernel/sql/av_table.go
index 5d7f0d09a..f1b1bf971 100644
--- a/kernel/sql/av_table.go
+++ b/kernel/sql/av_table.go
@@ -52,23 +52,23 @@ func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s
 
 		ret.Columns = append(ret.Columns, &av.TableColumn{
 			BaseInstanceField: &av.BaseInstanceField{
-				ID:     key.ID,
-				Name:   key.Name,
-				Type:   key.Type,
-				Icon:   key.Icon,
-				Hidden: col.Hidden,
-				Desc:   key.Desc,
+				ID:           key.ID,
+				Name:         key.Name,
+				Type:         key.Type,
+				Icon:         key.Icon,
+				Hidden:       col.Hidden,
+				Desc:         key.Desc,
+				Options:      key.Options,
+				NumberFormat: key.NumberFormat,
+				Template:     key.Template,
+				Relation:     key.Relation,
+				Rollup:       key.Rollup,
+				Date:         key.Date,
 			},
-			Options:      key.Options,
-			NumberFormat: key.NumberFormat,
-			Template:     key.Template,
-			Relation:     key.Relation,
-			Rollup:       key.Rollup,
-			Date:         key.Date,
-			Wrap:         col.Wrap,
-			Width:        col.Width,
-			Pin:          col.Pin,
-			Calc:         col.Calc,
+			Wrap:  col.Wrap,
+			Width: col.Width,
+			Pin:   col.Pin,
+			Calc:  col.Calc,
 		})
 	}