github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-17 09:30:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

🚨

Browse Source
This commit is contained in:
Vanessa 2023-07-25 20:40:28 +08:00
parent 1c2422cf6d
commit 77c64abd93
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/protyle/render/av/date.ts
View File

@ -3,7 +3,7 @@ import * as dayjs from "dayjs";
export const getDateHTML = (data: IAVTable, cellElements: HTMLElement[]) => { export const getDateHTML = (data: IAVTable, cellElements: HTMLElement[]) => {
let hasEndDate = true; let hasEndDate = true;
let cellValue:IAVCell let cellValue:IAVCell;
cellElements.forEach((cellElement) => { cellElements.forEach((cellElement) => {
data.rows.find(row => { data.rows.find(row => {
if (cellElement.parentElement.dataset.id === row.id) { if (cellElement.parentElement.dataset.id === row.id) {
@ -23,13 +23,13 @@ export const getDateHTML = (data: IAVTable, cellElements: HTMLElement[]) => {
if (!cellValue) { if (!cellValue) {
hasEndDate = false; hasEndDate = false;
} }
let value = "" let value = "";
if (cellValue?.value?.date?.content) { if (cellValue?.value?.date?.content) {
value = dayjs(cellValue.value.date.content).format("YYYY-MM-DDTHH:mm") value = dayjs(cellValue.value.date.content).format("YYYY-MM-DDTHH:mm");
} }
let value2 = "" let value2 = "";
if (cellValue?.value?.date?.content2) { if (cellValue?.value?.date?.content2) {
value2 = dayjs(cellValue.value.date.content2).format("YYYY-MM-DDTHH:mm") value2 = dayjs(cellValue.value.date.content2).format("YYYY-MM-DDTHH:mm");
} }
return `<div> return `<div>
<input type="datetime-local" value="${value}" class="b3-text-field fn__size200"><br> <input type="datetime-local" value="${value}" class="b3-text-field fn__size200"><br>
@ -64,7 +64,7 @@ export const bindDateEvent = (options: {
content: new Date(inputElements[0].value).getTime() content: new Date(inputElements[0].value).getTime()
} }
}); });
}) });
inputElements[1].addEventListener("change", () => { inputElements[1].addEventListener("change", () => {
setDateValue({ setDateValue({
cellElements: options.cellElements, cellElements: options.cellElements,
@ -74,13 +74,13 @@ export const bindDateEvent = (options: {
content2: new Date(inputElements[1].value).getTime() content2: new Date(inputElements[1].value).getTime()
} }
}); });
}) });
const checkElement = options.menuElement.querySelector(".b3-switch") as HTMLInputElement; const checkElement = options.menuElement.querySelector(".b3-switch") as HTMLInputElement;
checkElement.addEventListener("change", () => { checkElement.addEventListener("change", () => {
if (checkElement.checked) { if (checkElement.checked) {
inputElements[1].classList.remove("fn__none") inputElements[1].classList.remove("fn__none");
} else { } else {
inputElements[1].classList.add("fn__none") inputElements[1].classList.add("fn__none");
} }
setDateValue({ setDateValue({
cellElements: options.cellElements, cellElements: options.cellElements,
@ -115,7 +115,7 @@ export const setDateValue = (options: {
const cellUndoOperations: IOperation[] = []; const cellUndoOperations: IOperation[] = [];
options.cellElements.forEach(item => { options.cellElements.forEach(item => {
let cellData: IAVCell; let cellData: IAVCell;
let oldValue let oldValue;
const rowID = item.parentElement.dataset.id; const rowID = item.parentElement.dataset.id;
options.data.view.rows.find(row => { options.data.view.rows.find(row => {
if (row.id === rowID) { if (row.id === rowID) {
@ -151,4 +151,4 @@ export const setDateValue = (options: {
}); });
}); });
transaction(options.protyle, cellDoOperations, cellUndoOperations); transaction(options.protyle, cellDoOperations, cellUndoOperations);
} };

2
app/src/protyle/render/av/render.ts
View File

@ -85,7 +85,7 @@ style="width: ${column.width || "200px"}">${getCalcValue(column) || '<svg><use x
if (cell.value?.date.hasEndDate) { 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 += `<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>" 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 || "") + '"' : ""}