Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-19 16:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

✨ fix https://github.com/siyuan-note/siyuan/issues/8692

Browse source
This commit is contained in:
Vanessa 2023-07-22 22:56:15 +08:00
parent 04d0d563de
commit e8c1659336
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/protyle/render/av/render.ts
View file

@ -2,6 +2,7 @@ import {fetchPost} from "../../../util/fetch";
import {getColIconByType, showColMenu} from "./col"; import {getColIconByType, showColMenu} from "./col";
import {Constants} from "../../../constants"; import {Constants} from "../../../constants";
import {getCalcValue} from "./cell"; import {getCalcValue} from "./cell";
import * as dayjs from "dayjs";
export const avRender = (element: Element, cb?: () => void) => { export const avRender = (element: Element, cb?: () => void) => {
let avElements: Element[] = []; let avElements: Element[] = [];
@ -37,7 +38,6 @@ ${column.wrap ? "" : "white-space: nowrap;"}">
</div> </div>
<div class="av__widthdrag"></div> <div class="av__widthdrag"></div>
</div>`; </div>`;
calcHTML += `<div class="av__calc${calcHTML ? "" : " av__calc--show"}${column.calc && column.calc.operator !== "" ? " av__calc--ashow" : ""}" data-col-id="${column.id}" data-dtype="${column.type}" data-operator="${column.calc?.operator || ""}" calcHTML += `<div class="av__calc${calcHTML ? "" : " av__calc--show"}${column.calc && column.calc.operator !== "" ? " av__calc--ashow" : ""}" data-col-id="${column.id}" data-dtype="${column.type}" data-operator="${column.calc?.operator || ""}"
style="width: ${column.width || "200px"}">${getCalcValue(column) || '<svg><use xlink:href="#iconDown"></use></svg>' + window.siyuan.languages.calc}</div>`; style="width: ${column.width || "200px"}">${getCalcValue(column) || '<svg><use xlink:href="#iconDown"></use></svg>' + window.siyuan.languages.calc}</div>`;
}); });
@ -78,7 +78,14 @@ style="width: ${column.width || "200px"}">${getCalcValue(column) || '<svg><use x
text = `<span class="av__celltext">${text}</span>`; text = `<span class="av__celltext">${text}</span>`;
} }
} else if (cell.valueType === "date") { } else if (cell.valueType === "date") {
text = `<span class="av__celltext">${cell.value?.date.content || ""}</span>`; text = '<span class="av__celltext">';
if (cell.value?.date.content) {
text += dayjs(cell.value.date.content).format("YYYY-MM-DD HH:mm");
}
if (cell.value?.date.hasEndDate) {
text += `<svg style="margin-left: 5px"><use xlink:href="#iconForward"></use></svg>${dayjs(cell.value.date.content2).format("YYYY-MM-DD HH:mm")}</span>`;
}
text += "</span>"
} }
tableHTML += `<div class="av__cell" data-id="${cell.id}" data-col-id="${data.columns[index].id}" tableHTML += `<div class="av__cell" data-id="${cell.id}" data-col-id="${data.columns[index].id}"
${cell.valueType === "block" ? 'data-block-id="' + (cell.value.block.id || "") + '"' : ""} ${cell.valueType === "block" ? 'data-block-id="' + (cell.value.block.id || "") + '"' : ""}