diff --git a/kernel/av/layout_gallery.go b/kernel/av/layout_gallery.go index 762441614..959b58ddf 100644 --- a/kernel/av/layout_gallery.go +++ b/kernel/av/layout_gallery.go @@ -24,10 +24,10 @@ type LayoutGallery struct { CoverFrom CoverFrom `json:"coverFrom"` // 封面来源,0:无,1:内容图,2:资源字段 CoverFromAssetKeyID string `json:"coverFromAssetKeyId,omitempty"` // 资源字段 ID,CoverFrom 为 2 时有效 - CardSize CardSize `json:"cardSize"` // 卡片大小 - FitImage bool `json:"fitImage"` // 是否适应图片大小 - ShowIcon bool `json:"showIcon"` // 是否显示图标 - WrapField bool `json:"wrapField"` // 是否换行字段 + CardSize CardSize `json:"cardSize"` // 卡片大小,0:小卡片,1:中卡片,2:大卡片 + FitImage bool `json:"fitImage"` // 是否适应封面图片大小 + ShowIcon bool `json:"showIcon"` // 是否显示字段图标 + WrapField bool `json:"wrapField"` // 是否换行字段内容 CardFields []*ViewGalleryCardField `json:"fields"` // 画廊卡片字段 CardIDs []string `json:"cardIds"` // 卡片 ID,用于自定义排序 diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index bc8765a19..6f62a2dae 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -44,6 +44,186 @@ import ( "github.com/xrash/smetrics" ) +func (tx *Transaction) doSetAttrViewWrapField(operation *Operation) (ret *TxErr) { + err := setAttrViewWrapField(operation) + if err != nil { + return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} + } + return +} + +func setAttrViewWrapField(operation *Operation) (err error) { + attrView, err := av.ParseAttributeView(operation.AvID) + if err != nil { + return + } + + view, err := getAttrViewViewByBlockID(attrView, operation.BlockID) + if err != nil { + return + } + + switch view.LayoutType { + case av.LayoutTypeTable: + return + case av.LayoutTypeGallery: + view.Gallery.WrapField = operation.Data.(bool) + } + + err = av.SaveAttributeView(attrView) + return +} + +func (tx *Transaction) doSetAttrViewShowIcon(operation *Operation) (ret *TxErr) { + err := setAttrViewShowIcon(operation) + if err != nil { + return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} + } + return +} + +func setAttrViewShowIcon(operation *Operation) (err error) { + attrView, err := av.ParseAttributeView(operation.AvID) + if err != nil { + return + } + + view, err := getAttrViewViewByBlockID(attrView, operation.BlockID) + if err != nil { + return + } + + switch view.LayoutType { + case av.LayoutTypeTable: + return + case av.LayoutTypeGallery: + view.Gallery.ShowIcon = operation.Data.(bool) + } + + err = av.SaveAttributeView(attrView) + return +} + +func (tx *Transaction) doSetAttrViewFitImage(operation *Operation) (ret *TxErr) { + err := setAttrViewFitImage(operation) + if err != nil { + return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} + } + return +} + +func setAttrViewFitImage(operation *Operation) (err error) { + attrView, err := av.ParseAttributeView(operation.AvID) + if err != nil { + return + } + + view, err := getAttrViewViewByBlockID(attrView, operation.BlockID) + if err != nil { + return + } + + switch view.LayoutType { + case av.LayoutTypeTable: + return + case av.LayoutTypeGallery: + view.Gallery.FitImage = operation.Data.(bool) + } + + err = av.SaveAttributeView(attrView) + return +} + +func (tx *Transaction) doSetAttrViewCardSize(operation *Operation) (ret *TxErr) { + err := setAttrViewCardSize(operation) + if err != nil { + return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} + } + return +} + +func setAttrViewCardSize(operation *Operation) (err error) { + attrView, err := av.ParseAttributeView(operation.AvID) + if err != nil { + return + } + + view, err := getAttrViewViewByBlockID(attrView, operation.BlockID) + if err != nil { + return + } + + switch view.LayoutType { + case av.LayoutTypeTable: + return + case av.LayoutTypeGallery: + view.Gallery.CardSize = av.CardSize(operation.Data.(float64)) + } + + err = av.SaveAttributeView(attrView) + return +} + +func (tx *Transaction) doSetAttrViewCoverFromAssetKeyID(operation *Operation) (ret *TxErr) { + err := setAttrViewCoverFromAssetKeyID(operation) + if err != nil { + return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} + } + return +} + +func setAttrViewCoverFromAssetKeyID(operation *Operation) (err error) { + attrView, err := av.ParseAttributeView(operation.AvID) + if err != nil { + return + } + + view, err := getAttrViewViewByBlockID(attrView, operation.BlockID) + if err != nil { + return + } + + switch view.LayoutType { + case av.LayoutTypeTable: + return + case av.LayoutTypeGallery: + view.Gallery.CoverFromAssetKeyID = operation.KeyID + } + + err = av.SaveAttributeView(attrView) + return +} + +func (tx *Transaction) doSetAttrViewCoverFrom(operation *Operation) (ret *TxErr) { + err := setAttrViewCoverFrom(operation) + if err != nil { + return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} + } + return +} + +func setAttrViewCoverFrom(operation *Operation) (err error) { + attrView, err := av.ParseAttributeView(operation.AvID) + if err != nil { + return + } + + view, err := getAttrViewViewByBlockID(attrView, operation.BlockID) + if err != nil { + return + } + + switch view.LayoutType { + case av.LayoutTypeTable: + return + case av.LayoutTypeGallery: + view.Gallery.CoverFrom = av.CoverFrom(operation.Data.(float64)) + } + + err = av.SaveAttributeView(attrView) + return +} + func AppendAttributeViewDetachedBlocksWithValues(avID string, blocksValues [][]*av.Value) (err error) { attrView, err := av.ParseAttributeView(avID) if err != nil { diff --git a/kernel/model/transaction.go b/kernel/model/transaction.go index c911617e3..4ee57bc01 100644 --- a/kernel/model/transaction.go +++ b/kernel/model/transaction.go @@ -278,6 +278,18 @@ func performTx(tx *Transaction) (ret *TxErr) { ret = tx.doUnbindAttrViewBlock(op) case "duplicateAttrViewKey": ret = tx.doDuplicateAttrViewKey(op) + case "setAttrViewCoverFrom": + ret = tx.doSetAttrViewCoverFrom(op) + case "setAttrViewCoverFromAssetKeyID": + ret = tx.doSetAttrViewCoverFromAssetKeyID(op) + case "setAttrViewCardSize": + ret = tx.doSetAttrViewCardSize(op) + case "setAttrViewFitImage": + ret = tx.doSetAttrViewFitImage(op) + case "setAttrViewShowIcon": + ret = tx.doSetAttrViewShowIcon(op) + case "setAttrViewWrapField": + ret = tx.doSetAttrViewWrapField(op) } if nil != ret {