This commit is contained in:
parent
49479b6f64
commit
8ae79ed363
1 changed files with 15 additions and 7 deletions
|
@ -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,
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue