Merge remote-tracking branch 'origin/dev' into dev

app/appearance/langs/ar_SA.json

@@ -1,6 +1,5 @@
 {
   "cardAspectRatio": "نسبة العرض إلى الارتفاع للبطاقة",
-  "addCard": "إضافة بطاقة",
   "cardPreview1": "معاينة البطاقة",
   "contentImage": "صورة المحتوى",
   "cardSize": "حجم البطاقة",

app/appearance/langs/de_DE.json

@@ -1,6 +1,5 @@
 {
   "cardAspectRatio": "Seitenverhältnis der Karte",
-  "addCard": "Karte hinzufügen",
   "cardPreview1": "Kartenansicht",
   "contentImage": "Inhaltsbild",
   "cardSize": "Kartengröße",

app/appearance/langs/en_US.json

@@ -1,6 +1,5 @@
 {
   "cardAspectRatio": "Card aspect ratio",
-  "addCard": "Add card",
   "cardPreview1": "Card preview",
   "contentImage": "Content image",
   "cardSize": "Card size",

app/appearance/langs/es_ES.json

@@ -1,6 +1,5 @@
 {
   "cardAspectRatio": "Proporción de la tarjeta",
-  "addCard": "Agregar tarjeta",
   "cardPreview1": "Vista previa de la tarjeta",
   "contentImage": "Imagen del contenido",
   "cardSize": "Tamaño de la tarjeta",

app/appearance/langs/fr_FR.json

@@ -1,6 +1,5 @@
 {
   "cardAspectRatio": "Proportions de la carte",
-  "addCard": "Ajouter une carte",
   "cardPreview1": "Aperçu de la carte",
   "contentImage": "Image du contenu",
   "cardSize": "Taille de la carte",

app/appearance/langs/he_IL.json

@@ -1,6 +1,5 @@
 {
   "cardAspectRatio": "יחס גובה-רוחב של כרטיס",
-  "addCard": "הוסף כרטיס",
   "cardPreview1": "תצוגה מקדימה של כרטיס",
   "contentImage": "תמונת תוכן",
   "cardSize": "גודל כרטיס",

app/appearance/langs/it_IT.json

@@ -1,6 +1,5 @@
 {
   "cardAspectRatio": "Proporzioni della carta",
-  "addCard": "Aggiungi carta",
   "cardPreview1": "Anteprima della carta",
   "contentImage": "Immagine del contenuto",
   "cardSize": "Dimensione della carta",

app/appearance/langs/ja_JP.json

@@ -1,6 +1,5 @@
 {
   "cardAspectRatio": "カードのアスペクト比",
-  "addCard": "カードを追加",
   "cardPreview1": "カードプレビュー",
   "contentImage": "コンテンツ画像",
   "cardSize": "カードサイズ",

app/appearance/langs/pl_PL.json

@@ -1,6 +1,5 @@
 {
   "cardAspectRatio": "Proporcje karty",
-  "addCard": "Dodaj kartę",
   "cardPreview1": "Podgląd karty",
   "contentImage": "Obraz treści",
   "cardSize": "Rozmiar karty",

app/appearance/langs/pt_BR.json

@@ -1,6 +1,5 @@
 {
   "cardAspectRatio": "Proporção da carta",
-  "addCard": "Adicionar cartão",
   "cardPreview1": "Pré-visualização do cartão",
   "contentImage": "Imagem do conteúdo",
   "cardSize": "Tamanho do cartão",

app/appearance/langs/ru_RU.json

@@ -1,6 +1,5 @@
 {
   "cardAspectRatio": "Соотношение сторон карточки",
-  "addCard": "Добавить карту",
   "cardPreview1": "Предпросмотр карты",
   "contentImage": "Изображение содержимого",
   "cardSize": "Размер карты",

app/appearance/langs/zh_CHT.json

@@ -1,6 +1,5 @@
 {
   "cardAspectRatio": "卡片寬高比",
-  "addCard": "添加卡片",
   "cardPreview1": "卡片預覽",
   "contentImage": "內容圖片",
   "cardSize": "卡片大小",

app/appearance/langs/zh_CN.json

@@ -1,6 +1,5 @@
 {
   "cardAspectRatio": "卡片宽高比",
-  "addCard": "添加卡片",
   "cardPreview1": "卡片预览",
   "contentImage": "内容图",
   "cardSize": "卡片大小",

app/src/protyle/render/av/gallery/render.ts

@@ -103,7 +103,7 @@ ${cell.color ? `color:${cell.color};` : ""}">${renderCell(cell.value, rowIndex,
     </div>
 </div>`;
         });
-        galleryHTML += `<div class="av__gallery-add" data-type="av-add-bottom"><svg class="svg"><use xlink:href="#iconAdd"></use></svg><span class="fn__space"></span>${window.siyuan.languages.addCard}</div>`;
+        galleryHTML += `<div class="av__gallery-add" data-type="av-add-bottom"><svg class="svg"><use xlink:href="#iconAdd"></use></svg><span class="fn__space"></span>${window.siyuan.languages.newRow}</div>`;
         let tabHTML = "";
         let viewData: IAVView;
         response.data.views.forEach((item: IAVView) => {

kernel/model/render.go

@@ -177,10 +177,10 @@ func fillBlockRefCount(nodes []*ast.Node) {
 func renderBlockDOMByNodes(nodes []*ast.Node, luteEngine *lute.Lute) string {
 	tree := &parse.Tree{Root: &ast.Node{Type: ast.NodeDocument}, Context: &parse.Context{ParseOption: luteEngine.ParseOptions}}
 	blockRenderer := render.NewProtyleRenderer(tree, luteEngine.RenderOptions)
-	for _, n := range nodes {
-		ast.Walk(n, func(node *ast.Node, entering bool) ast.WalkStatus {
-			rendererFunc := blockRenderer.RendererFuncs[node.Type]
-			return rendererFunc(node, entering)
+	for _, node := range nodes {
+		ast.Walk(node, func(n *ast.Node, entering bool) ast.WalkStatus {
+			rendererFunc := blockRenderer.RendererFuncs[n.Type]
+			return rendererFunc(n, entering)
 		})
 	}
 	h := strings.TrimSpace(blockRenderer.Writer.String())

kernel/sql/av_gallery.go

@@ -187,14 +187,15 @@ func fillAttributeViewGalleryCardCover(attrView *av.AttributeView, view *av.View
 		})
 
 		if "" == galleryCard.CoverURL {
-			if ast.NodeDocument == node.Type {
+			isDoc := ast.NodeDocument == node.Type
+			if isDoc {
 				node = node.FirstChild
 			}
 
 			buf := bytes.Buffer{}
 			for c := node; nil != c; c = c.Next {
 				buf.WriteString(renderBlockDOMByNode(c, luteEngine))
-				if 1024*4 < buf.Len() {
+				if !isDoc || 1024*4 < buf.Len() {
 					break
 				}
 			}
@@ -220,9 +221,15 @@ func renderBlockDOMByNode(node *ast.Node, luteEngine *lute.Lute) string {
 	tree := &parse.Tree{Root: &ast.Node{Type: ast.NodeDocument}, Context: &parse.Context{ParseOption: luteEngine.ParseOptions}}
 	blockRenderer := render.NewProtyleRenderer(tree, luteEngine.RenderOptions)
 	blockRenderer.Options.ProtyleContenteditable = false
-	ast.Walk(node, func(node *ast.Node, entering bool) ast.WalkStatus {
-		rendererFunc := blockRenderer.RendererFuncs[node.Type]
-		return rendererFunc(node, entering)
+	ast.Walk(node, func(n *ast.Node, entering bool) ast.WalkStatus {
+		if entering {
+			// 内容图中不需要渲染数据库角标 https://github.com/siyuan-note/siyuan/issues/15057
+			ial := parse.IAL2Map(n.KramdownIAL)
+			delete(ial, av.NodeAttrNameAvs)
+			n.KramdownIAL = parse.Map2IAL(ial)
+		}
+		rendererFunc := blockRenderer.RendererFuncs[n.Type]
+		return rendererFunc(n, entering)
 	})
 	h := strings.TrimSpace(blockRenderer.Writer.String())
 	if strings.HasPrefix(h, "<li") {