diff --git a/kernel/av/layout_kanban.go b/kernel/av/layout_kanban.go index c50302a77..3614a63e3 100644 --- a/kernel/av/layout_kanban.go +++ b/kernel/av/layout_kanban.go @@ -58,15 +58,16 @@ type ViewKanbanField struct { type Kanban struct { *BaseInstance - CoverFrom CoverFrom `json:"coverFrom"` // 封面来源 - CoverFromAssetKeyID string `json:"coverFromAssetKeyID,omitempty"` // 资源字段 ID,CoverFrom 为 CoverFromAssetField 时有效 - CardAspectRatio CardAspectRatio `json:"cardAspectRatio"` // 卡片宽高比 - CardSize CardSize `json:"cardSize"` // 卡片大小 - FitImage bool `json:"fitImage"` // 是否适应封面图片大小 - DisplayFieldName bool `json:"displayFieldName"` // 是否显示字段名称 - Fields []*KanbanField `json:"fields"` // 卡片字段 - Cards []*KanbanCard `json:"cards"` // 卡片 - CardCount int `json:"rowCount"` // 总卡片数 + CoverFrom CoverFrom `json:"coverFrom"` // 封面来源 + CoverFromAssetKeyID string `json:"coverFromAssetKeyID,omitempty"` // 资源字段 ID,CoverFrom 为 CoverFromAssetField 时有效 + CardAspectRatio CardAspectRatio `json:"cardAspectRatio"` // 卡片宽高比 + CardSize CardSize `json:"cardSize"` // 卡片大小 + FitImage bool `json:"fitImage"` // 是否适应封面图片大小 + DisplayFieldName bool `json:"displayFieldName"` // 是否显示字段名称 + FillColBackgroundColor bool `json:"fillColBackgroundColor"` // 是否填充列背景颜色 + Fields []*KanbanField `json:"fields"` // 卡片字段 + Cards []*KanbanCard `json:"cards"` // 卡片 + CardCount int `json:"rowCount"` // 总卡片数 } // KanbanCard 描述了看板实例卡片的结构。 diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index 240dd1214..1dd1716ca 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -2788,6 +2788,7 @@ func (tx *Transaction) doDuplicateAttrViewView(operation *Operation) (ret *TxErr view.Kanban.CardSize = masterView.Kanban.CardSize view.Kanban.FitImage = masterView.Kanban.FitImage view.Kanban.DisplayFieldName = masterView.Kanban.DisplayFieldName + view.Kanban.FillColBackgroundColor = masterView.Kanban.FillColBackgroundColor view.Kanban.ShowIcon = masterView.Kanban.ShowIcon view.Kanban.WrapField = masterView.Kanban.WrapField } diff --git a/kernel/sql/av.go b/kernel/sql/av.go index 2f39a1717..8ca65ce78 100644 --- a/kernel/sql/av.go +++ b/kernel/sql/av.go @@ -64,6 +64,7 @@ func RenderGroupView(attrView *av.AttributeView, view, groupView *av.View, query groupView.Kanban.CardSize = view.Kanban.CardSize groupView.Kanban.FitImage = view.Kanban.FitImage groupView.Kanban.DisplayFieldName = view.Kanban.DisplayFieldName + groupView.Kanban.FillColBackgroundColor = view.Kanban.FillColBackgroundColor } if nil != err { logging.LogErrorf("copy view fields [%s] to group [%s] failed: %s", view.ID, groupView.ID, err) diff --git a/kernel/sql/av_kanban.go b/kernel/sql/av_kanban.go index 808b8c202..d82dcd46f 100644 --- a/kernel/sql/av_kanban.go +++ b/kernel/sql/av_kanban.go @@ -20,15 +20,16 @@ func RenderAttributeViewKanban(attrView *av.AttributeView, view *av.View, query } ret = &av.Kanban{ - BaseInstance: av.NewViewBaseInstance(view), - CoverFrom: view.Kanban.CoverFrom, - CoverFromAssetKeyID: view.Kanban.CoverFromAssetKeyID, - CardAspectRatio: view.Kanban.CardAspectRatio, - CardSize: view.Kanban.CardSize, - FitImage: view.Kanban.FitImage, - DisplayFieldName: view.Kanban.DisplayFieldName, - Fields: []*av.KanbanField{}, - Cards: []*av.KanbanCard{}, + BaseInstance: av.NewViewBaseInstance(view), + CoverFrom: view.Kanban.CoverFrom, + CoverFromAssetKeyID: view.Kanban.CoverFromAssetKeyID, + CardAspectRatio: view.Kanban.CardAspectRatio, + CardSize: view.Kanban.CardSize, + FitImage: view.Kanban.FitImage, + DisplayFieldName: view.Kanban.DisplayFieldName, + FillColBackgroundColor: view.Kanban.FillColBackgroundColor, + Fields: []*av.KanbanField{}, + Cards: []*av.KanbanCard{}, } // 组装字段