From 9a605e869212586c7ed0488d9502641048689eb6 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Tue, 16 Sep 2025 08:52:15 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=B1=87=E6=80=BB=E4=B8=BB=E9=94=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20emoji?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/protyle/render/av/cell.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/protyle/render/av/cell.ts b/app/src/protyle/render/av/cell.ts index 4bb1204b1..a4be23f36 100644 --- a/app/src/protyle/render/av/cell.ts +++ b/app/src/protyle/render/av/cell.ts @@ -994,7 +994,7 @@ export const renderCell = (cellValue: IAVCellValue, rowIndex = 0, showIcon = tru text += ""; } else if (cellValue.type === "rollup") { cellValue?.rollup?.contents?.forEach((item) => { - const rollupText = ["template", "select", "mSelect", "mAsset", "checkbox", "relation"].includes(item.type) ? renderCell(item, rowIndex, showIcon, type) : renderRollup(item); + const rollupText = ["template", "select", "mSelect", "mAsset", "checkbox", "relation"].includes(item.type) ? renderCell(item, rowIndex, showIcon, type) : renderRollup(item, showIcon); if (rollupText) { text += rollupText + ", "; } @@ -1028,7 +1028,7 @@ export const renderCell = (cellValue: IAVCellValue, rowIndex = 0, showIcon = tru return text; }; -const renderRollup = (cellValue: IAVCellValue) => { +const renderRollup = (cellValue: IAVCellValue, showIcon: boolean) => { let text = ""; if (["text"].includes(cellValue.type)) { text = cellValue ? (cellValue[cellValue.type as "text"].content || "") : ""; @@ -1046,7 +1046,7 @@ const renderRollup = (cellValue: IAVCellValue) => { if (cellValue?.isDetached) { text = `${Lute.EscapeHTMLStr(cellValue.block?.content || window.siyuan.languages.untitled)}`; } else { - text = `${Lute.EscapeHTMLStr(cellValue.block?.content || window.siyuan.languages.untitled)}`; + text = `${unicode2Emoji(cellValue.block.icon || window.siyuan.storage[Constants.LOCAL_IMAGES].file)}${Lute.EscapeHTMLStr(cellValue.block?.content || window.siyuan.languages.untitled)}`; } } else if (cellValue.type === "number") { text = cellValue?.number.formattedContent || cellValue?.number.content.toString() || "";