diff --git a/app/appearance/langs/ar_SA.json b/app/appearance/langs/ar_SA.json index b41ce5460..1b8a8e28a 100644 --- a/app/appearance/langs/ar_SA.json +++ b/app/appearance/langs/ar_SA.json @@ -1,4 +1,5 @@ { + "cardAspectRatio": "نسبة العرض إلى الارتفاع للبطاقة", "addCard": "إضافة بطاقة", "cardPreview1": "معاينة البطاقة", "contentImage": "صورة المحتوى", diff --git a/app/appearance/langs/de_DE.json b/app/appearance/langs/de_DE.json index c792eaf2b..9e948ea4e 100644 --- a/app/appearance/langs/de_DE.json +++ b/app/appearance/langs/de_DE.json @@ -1,4 +1,5 @@ { + "cardAspectRatio": "Seitenverhältnis der Karte", "addCard": "Karte hinzufügen", "cardPreview1": "Kartenansicht", "contentImage": "Inhaltsbild", diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index d3d299356..373c835a6 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,4 +1,5 @@ { + "cardAspectRatio": "Card aspect ratio", "addCard": "Add card", "cardPreview1": "Card preview", "contentImage": "Content image", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index cf83c6a22..f67b59b9f 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,4 +1,5 @@ { + "cardAspectRatio": "Proporción de la tarjeta", "addCard": "Agregar tarjeta", "cardPreview1": "Vista previa de la tarjeta", "contentImage": "Imagen del contenido", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 9af73d620..7d80809df 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,4 +1,5 @@ { + "cardAspectRatio": "Proportions de la carte", "addCard": "Ajouter une carte", "cardPreview1": "Aperçu de la carte", "contentImage": "Image du contenu", diff --git a/app/appearance/langs/he_IL.json b/app/appearance/langs/he_IL.json index b21a603d3..67e4356ee 100644 --- a/app/appearance/langs/he_IL.json +++ b/app/appearance/langs/he_IL.json @@ -1,4 +1,5 @@ { + "cardAspectRatio": "יחס גובה-רוחב של כרטיס", "addCard": "הוסף כרטיס", "cardPreview1": "תצוגה מקדימה של כרטיס", "contentImage": "תמונת תוכן", diff --git a/app/appearance/langs/it_IT.json b/app/appearance/langs/it_IT.json index d1d68005f..1efd84c37 100644 --- a/app/appearance/langs/it_IT.json +++ b/app/appearance/langs/it_IT.json @@ -1,4 +1,5 @@ { + "cardAspectRatio": "Proporzioni della carta", "addCard": "Aggiungi carta", "cardPreview1": "Anteprima della carta", "contentImage": "Immagine del contenuto", diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json index da5c3cd06..ede452bb5 100644 --- a/app/appearance/langs/ja_JP.json +++ b/app/appearance/langs/ja_JP.json @@ -1,4 +1,5 @@ { + "cardAspectRatio": "カードのアスペクト比", "addCard": "カードを追加", "cardPreview1": "カードプレビュー", "contentImage": "コンテンツ画像", diff --git a/app/appearance/langs/pl_PL.json b/app/appearance/langs/pl_PL.json index 273b0ba64..6700859bf 100644 --- a/app/appearance/langs/pl_PL.json +++ b/app/appearance/langs/pl_PL.json @@ -1,4 +1,5 @@ { + "cardAspectRatio": "Proporcje karty", "addCard": "Dodaj kartę", "cardPreview1": "Podgląd karty", "contentImage": "Obraz treści", diff --git a/app/appearance/langs/pt_BR.json b/app/appearance/langs/pt_BR.json index 3fa64728f..e0deeacf6 100644 --- a/app/appearance/langs/pt_BR.json +++ b/app/appearance/langs/pt_BR.json @@ -1,4 +1,5 @@ { + "cardAspectRatio": "Proporção da carta", "addCard": "Adicionar cartão", "cardPreview1": "Pré-visualização do cartão", "contentImage": "Imagem do conteúdo", diff --git a/app/appearance/langs/ru_RU.json b/app/appearance/langs/ru_RU.json index 1bec9ee5f..586fdac25 100644 --- a/app/appearance/langs/ru_RU.json +++ b/app/appearance/langs/ru_RU.json @@ -1,4 +1,5 @@ { + "cardAspectRatio": "Соотношение сторон карточки", "addCard": "Добавить карту", "cardPreview1": "Предпросмотр карты", "contentImage": "Изображение содержимого", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 4d34af900..b4c9c5ac2 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,4 +1,5 @@ { + "cardAspectRatio": "卡片寬高比", "addCard": "添加卡片", "cardPreview1": "卡片預覽", "contentImage": "內容圖片", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index f82cd8d45..a93f4f4f0 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,4 +1,5 @@ { + "cardAspectRatio": "卡片宽高比", "addCard": "添加卡片", "cardPreview1": "卡片预览", "contentImage": "内容图", diff --git a/kernel/av/layout_gallery.go b/kernel/av/layout_gallery.go index 1e1e2bf08..20c0c4c5b 100644 --- a/kernel/av/layout_gallery.go +++ b/kernel/av/layout_gallery.go @@ -24,12 +24,13 @@ import ( type LayoutGallery struct { *BaseLayout - CoverFrom CoverFrom `json:"coverFrom"` // 封面来源,0:无,1:内容图,2:资源字段 - CoverFromAssetKeyID string `json:"coverFromAssetKeyID,omitempty"` // 资源字段 ID,CoverFrom 为 2 时有效 - CardSize CardSize `json:"cardSize"` // 卡片大小,0:小卡片,1:中卡片,2:大卡片 - FitImage bool `json:"fitImage"` // 是否适应封面图片大小 - ShowIcon bool `json:"showIcon"` // 是否显示字段图标 - WrapField bool `json:"wrapField"` // 是否换行字段内容 + CoverFrom CoverFrom `json:"coverFrom"` // 封面来源,0:无,1:内容图,2:资源字段 + CoverFromAssetKeyID string `json:"coverFromAssetKeyID,omitempty"` // 资源字段 ID,CoverFrom 为 2 时有效 + CardAspectRatio CardAspectRatio `json:"cardAspectRatio"` // 卡片宽高比 + 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,用于自定义排序 @@ -48,12 +49,25 @@ func NewLayoutGallery() *LayoutGallery { Sorts: []*ViewSort{}, PageSize: GalleryViewDefaultPageSize, }, - CoverFrom: CoverFromContentImage, - CardSize: CardSizeMedium, - ShowIcon: true, + CoverFrom: CoverFromContentImage, + CardAspectRatio: CardAspectRatio16_9, + CardSize: CardSizeMedium, + ShowIcon: true, } } +type CardAspectRatio int + +const ( + CardAspectRatio16_9 CardAspectRatio = iota // 16:9 + CardAspectRatio9_16 // 9:16 + CardAspectRatio4_3 // 4:3 + CardAspectRatio3_4 // 3:4 + CardAspectRatio3_2 // 3:2 + CardAspectRatio2_3 // 2:3 + CardAspectRatio1_1 // 1:1 +) + type CardSize int const (