mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-09-22 08:30:42 +02:00
This commit is contained in:
parent
39e2b7adf6
commit
7d9c120a86
1 changed files with 8 additions and 4 deletions
|
@ -650,12 +650,16 @@ export const getFiltersHTML = (data: IAV) => {
|
||||||
${filter.relativeDate2.direction ? filter.relativeDate2.count : ""}
|
${filter.relativeDate2.direction ? filter.relativeDate2.count : ""}
|
||||||
${window.siyuan.languages[["day", "week", "month", "year"][filter.relativeDate2.unit]]}`;
|
${window.siyuan.languages[["day", "week", "month", "year"][filter.relativeDate2.unit]]}`;
|
||||||
}
|
}
|
||||||
} else if (filterValue && filterValue[filterValue.type as "date"]?.content) {
|
} else if (filterValue) {
|
||||||
|
if (filterValue[filterValue.type as "date"]?.content) {
|
||||||
dateValue = dayjs(filterValue[filterValue.type as "date"].content).format("YYYY-MM-DD");
|
dateValue = dayjs(filterValue[filterValue.type as "date"].content).format("YYYY-MM-DD");
|
||||||
|
}
|
||||||
|
if (filterValue && filterValue[filterValue.type as "date"]?.content2) {
|
||||||
dateValue2 = dayjs(filterValue[filterValue.type as "date"].content2).format("YYYY-MM-DD");
|
dateValue2 = dayjs(filterValue[filterValue.type as "date"].content2).format("YYYY-MM-DD");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (dateValue) {
|
if (dateValue) {
|
||||||
if (filter.operator === "Is between") {
|
if (filter.operator === "Is between" && dateValue2) {
|
||||||
filterText = ` ${window.siyuan.languages.filterOperatorIsBetween} ${dateValue} ${dateValue2}`;
|
filterText = ` ${window.siyuan.languages.filterOperatorIsBetween} ${dateValue} ${dateValue2}`;
|
||||||
} else if ("=" === filter.operator) {
|
} else if ("=" === filter.operator) {
|
||||||
filterText = `: ${dateValue}`;
|
filterText = `: ${dateValue}`;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue