Vanessa 2025-09-07 11:01:11 +08:00
parent 0fce405a05
commit c1a4aa3128

View file

@ -83,6 +83,7 @@ export const setFilter = async (options: {
rectTarget = options.protyle.wysiwyg.element.querySelector(`[data-col-id="${options.target.dataset.colId}"]`).getBoundingClientRect(); rectTarget = options.protyle.wysiwyg.element.querySelector(`[data-col-id="${options.target.dataset.colId}"]`).getBoundingClientRect();
} }
const blockID = options.blockElement.getAttribute("data-node-id"); const blockID = options.blockElement.getAttribute("data-node-id");
let operationElement: HTMLSelectElement = undefined;
const menu = new Menu("set-filter-" + options.filter.column, () => { const menu = new Menu("set-filter-" + options.filter.column, () => {
const oldFilters = JSON.parse(JSON.stringify(options.data.view.filters)); const oldFilters = JSON.parse(JSON.stringify(options.data.view.filters));
if (!operationElement || !operationElement.value) { if (!operationElement || !operationElement.value) {
@ -211,6 +212,7 @@ export const setFilter = async (options: {
if (colData.type === "rollup") { if (colData.type === "rollup") {
if (!colData.rollup || !colData.rollup.relationKeyID || !colData.rollup.keyID) { if (!colData.rollup || !colData.rollup.relationKeyID || !colData.rollup.keyID) {
showMessage(window.siyuan.languages.plsChoose); showMessage(window.siyuan.languages.plsChoose);
document.querySelector(".av__panel")?.remove();
openMenuPanel({ openMenuPanel({
protyle: options.protyle, protyle: options.protyle,
blockElement: options.blockElement, blockElement: options.blockElement,
@ -530,8 +532,8 @@ export const setFilter = async (options: {
} }
} }
}); });
const operationElement = (menu.element.querySelector('.b3-select[data-type="operation"]') as HTMLSelectElement); operationElement = (menu.element.querySelector('.b3-select[data-type="operation"]') as HTMLSelectElement);
operationElement.addEventListener("change", () => { operationElement?.addEventListener("change", () => {
toggleEmpty(operationElement, operationElement.value, filterValue.type); toggleEmpty(operationElement, operationElement.value, filterValue.type);
}); });
const dateTypeElement = menu.element.querySelector('.b3-select[data-type="dateType"]') as HTMLSelectElement; const dateTypeElement = menu.element.querySelector('.b3-select[data-type="dateType"]') as HTMLSelectElement;