浏览代码

:art: fix https://github.com/siyuan-note/siyuan/issues/12463

Vanessa 9 月之前
父节点
当前提交
8ae79ed363
共有 1 个文件被更改,包括 15 次插入7 次删除
  1. 15 7
      app/src/protyle/render/av/cell.ts

+ 15 - 7
app/src/protyle/render/av/cell.ts

@@ -170,8 +170,16 @@ export const genCellValue = (colType: TAVCol, value: string | any) => {
                 }
                 }
             };
             };
         } else if (colType === "date") {
         } 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 = {
                 cellValue = {
                     type: colType,
                     type: colType,
                     date: {
                     date: {
@@ -188,13 +196,13 @@ export const genCellValue = (colType: TAVCol, value: string | any) => {
                 cellValue = {
                 cellValue = {
                     type: colType,
                     type: colType,
                     date: {
                     date: {
-                        content: dateObj.valueOf(),
+                        content: dateObj1.valueOf(),
                         isNotEmpty: true,
                         isNotEmpty: true,
-                        content2: 0,
+                        content2: dateObj2.valueOf() || 0,
+                        isNotEmpty2: !isNaN(dateObj2.valueOf()),
+                        hasEndDate: !isNaN(dateObj2.valueOf()),
+                        isNotTime: dateObj1.hour() === 0,
                         formattedContent: "",
                         formattedContent: "",
-                        isNotEmpty2: false,
-                        hasEndDate: false,
-                        isNotTime: dateObj.hour() === 0,
                     }
                     }
                 };
                 };
             }
             }