From 8ae79ed363044af13fdeaed81ffcbe966721d648 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Sat, 14 Sep 2024 11:40:00 +0800 Subject: [PATCH] :art: fix https://github.com/siyuan-note/siyuan/issues/12463 --- app/src/protyle/render/av/cell.ts | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/app/src/protyle/render/av/cell.ts b/app/src/protyle/render/av/cell.ts index 733aa2766..c6b0f1733 100644 --- a/app/src/protyle/render/av/cell.ts +++ b/app/src/protyle/render/av/cell.ts @@ -170,8 +170,16 @@ export const genCellValue = (colType: TAVCol, value: string | any) => { } }; } else if (colType === "date") { - const dateObj = dayjs(value); - if (isNaN(dateObj.valueOf())) { + let values = value.split("→"); + if (values.length !== 2) { + values = value.split("-"); + if (values.length !== 2) { + values = value.split("~"); + } + } + const dateObj1 = dayjs(values[0]); + const dateObj2 = dayjs(values[1] || ""); + if (isNaN(dateObj1.valueOf())) { cellValue = { type: colType, date: { @@ -188,13 +196,13 @@ export const genCellValue = (colType: TAVCol, value: string | any) => { cellValue = { type: colType, date: { - content: dateObj.valueOf(), + content: dateObj1.valueOf(), isNotEmpty: true, - content2: 0, + content2: dateObj2.valueOf() || 0, + isNotEmpty2: !isNaN(dateObj2.valueOf()), + hasEndDate: !isNaN(dateObj2.valueOf()), + isNotTime: dateObj1.hour() === 0, formattedContent: "", - isNotEmpty2: false, - hasEndDate: false, - isNotTime: dateObj.hour() === 0, } }; }