From 3007b9e67fc1ba5a386150052f880ff077b76fc0 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Wed, 15 Nov 2023 08:53:42 +0800 Subject: [PATCH] :art: add pin icon` --- app/src/assets/scss/business/_av.scss | 10 +++++----- app/src/protyle/render/av/render.ts | 19 +++++-------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss index 23ac57c3f..2d5ac225f 100644 --- a/app/src/assets/scss/business/_av.scss +++ b/app/src/assets/scss/business/_av.scss @@ -254,6 +254,11 @@ opacity: 1; background-color: var(--b3-theme-background-light) !important; } + + .b3-chip { + margin: 1px 2px; + padding: 2px 6px; + } } &__cellheader { @@ -276,11 +281,6 @@ &__celltext { overflow: hidden; - .b3-chip { - margin: 1px 2px; - padding: 2px 6px; - } - &--url { text-decoration: underline var(--b3-border-color); } diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts index 0569f1128..763470b93 100644 --- a/app/src/protyle/render/av/render.ts +++ b/app/src/protyle/render/av/render.ts @@ -86,6 +86,7 @@ ${column.wrap ? "" : "white-space: nowrap;"}">
${column.icon ? unicode2Emoji(column.icon, "av__cellicon", true) : ``} ${column.name} + ${column.pin ? '
' : ""}
`; @@ -140,16 +141,11 @@ style="width: ${column.width || "200px"}">${getCalcValue(column) || '${window.siyuan.languages.openBy}`; } } else if (cell.valueType === "number") { - text = `${cell.value?.number.formattedContent || ""}`; + text = `${cell.value?.number.formattedContent || ""}`; } else if (cell.valueType === "mSelect" || cell.valueType === "select") { cell.value?.mSelect?.forEach((item) => { text += `${item.content}`; }); - if (!text) { - text = ''; - } else { - text = `${text}`; - } } else if (cell.valueType === "date") { text = ''; const dataValue = cell.value ? cell.value.date : null; @@ -175,14 +171,10 @@ style="width: ${column.width || "200px"}">${getCalcValue(column) || '${item.name}`; } }); - if (!text) { - text = ''; - } } - if (["text", "template", "url", "email", "phone", "number", "date", "created", "updated"].includes(cell.valueType)) { - if (cell.value && cell.value[cell.valueType as "url"].content) { - text += ``; - } + if (["text", "template", "url", "email", "phone", "number", "date", "created", "updated"].includes(cell.valueType) && + cell.value && cell.value[cell.valueType as "url"].content) { + text += ``; } tableHTML += `
${text}
`; if (pinIndex === index) {