diff --git a/app/src/protyle/render/av/date.ts b/app/src/protyle/render/av/date.ts index a36ef6c3d..5ba718f3a 100644 --- a/app/src/protyle/render/av/date.ts +++ b/app/src/protyle/render/av/date.ts @@ -63,6 +63,7 @@ export const bindDateEvent = (options: { data: options.data, protyle: options.protyle, value: { + isNotEmpty: inputElements[0].value !== "", content: new Date(inputElements[0].value).getTime() } }); @@ -73,6 +74,7 @@ export const bindDateEvent = (options: { data: options.data, protyle: options.protyle, value: { + isNotEmpty2: inputElements[1].value !== "", content2: new Date(inputElements[1].value).getTime() } }); @@ -99,11 +101,7 @@ export const setDateValue = (options: { cellElements: HTMLElement[], data: IAV protyle: IProtyle, - value: { - content?: number, - content2?: number, - hasEndDate?: boolean - } + value: IAVCellDateValue }) => { let cellIndex = 0; Array.from(options.cellElements[0].parentElement.querySelectorAll(".av__cell")).find((item: HTMLElement, index) => { diff --git a/app/src/protyle/render/av/filter.ts b/app/src/protyle/render/av/filter.ts index 3cd93d858..cf662665a 100644 --- a/app/src/protyle/render/av/filter.ts +++ b/app/src/protyle/render/av/filter.ts @@ -11,7 +11,7 @@ export const getDefaultOperatorByType = (type: TAVCol) => { if (type === "number" || type === "select") { return "="; } - if (type === "text" || type === "mSelect" || type === "url") { + if (["text", "mSelect", "url", "block"].includes(type)) { return "Contains"; } }; @@ -133,6 +133,7 @@ export const setFilter = (options: { } }); switch (colData.type) { + case "block": case "text": case "url": selectHTML = ` @@ -208,7 +209,7 @@ export const setFilter = (options: { } }); }); - } else if (colData.type === "text" || colData.type === "url") { + } else if (["text", "url", "block"].includes(colData.type)) { menu.addItem({ iconHTML: "", label: `` diff --git a/app/src/protyle/render/av/openMenuPanel.ts b/app/src/protyle/render/av/openMenuPanel.ts index c80d39084..4107ed64e 100644 --- a/app/src/protyle/render/av/openMenuPanel.ts +++ b/app/src/protyle/render/av/openMenuPanel.ts @@ -621,8 +621,10 @@ export const openMenuPanel = (options: { data, protyle: options.protyle, value: { - content: 0, - content2: 0, + isNotEmpty2: false, + isNotEmpty: false, + content: null, + content2: null, hasEndDate: false } }); diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts index c14f1062f..fda908a49 100644 --- a/app/src/types/index.d.ts +++ b/app/src/types/index.d.ts @@ -937,8 +937,8 @@ interface IAVCellValue { interface IAVCellDateValue { content?: number, - isNotEmpty: boolean + isNotEmpty?: boolean content2?: number, - isNotEmpty2: boolean + isNotEmpty2?: boolean hasEndDate?: boolean }