Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-22 09:30:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 fix https://github.com/siyuan-note/siyuan/issues/10932

Browse source
This commit is contained in:
Vanessa 2024-04-14 12:13:15 +08:00
parent 9f237766f8
commit 02415b8e90
3 changed files with 91 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

132
app/src/protyle/render/av/filter.ts
View file

@ -10,6 +10,7 @@ import {unicode2Emoji} from "../../../emoji";
import {openMenuPanel} from "./openMenuPanel"; import {openMenuPanel} from "./openMenuPanel";
import {fetchSyncPost} from "../../../util/fetch"; import {fetchSyncPost} from "../../../util/fetch";
import {showMessage} from "../../../dialog/message"; import {showMessage} from "../../../dialog/message";
import {upDownHint} from "../../../util/upDownHint";
export const getDefaultOperatorByType = (type: TAVCol) => { export const getDefaultOperatorByType = (type: TAVCol) => {
if (["select", "number", "date", "created", "updated"].includes(type)) { if (["select", "number", "date", "created", "updated"].includes(type)) {
@ -54,6 +55,20 @@ const toggleEmpty = (element: HTMLElement, operator: string, type: TAVCol) => {
} }
}; };
const filterSelect = (key: string) => {
window.siyuan.menus.menu.element.querySelectorAll(".b3-menu__item").forEach((item) => {
const nameElement = item.querySelector(".b3-chip.b3-chip--middle") as HTMLElement
if (nameElement) {
const itemName = nameElement.dataset.name.toLowerCase()
if (!key || (key.indexOf(itemName) > -1 || itemName.indexOf(key) > -1)) {
item.classList.remove("fn__none");
} else {
item.classList.add("fn__none");
}
}
})
}
export const setFilter = async (options: { export const setFilter = async (options: {
filter: IAVFilter, filter: IAVFilter,
protyle: IProtyle, protyle: IProtyle,
@ -81,38 +96,7 @@ export const setFilter = async (options: {
}; };
let hasMatch = false; let hasMatch = false;
let newValue; let newValue;
if (textElements.length > 0) { if (filterValue.type === "select" || filterValue.type === "mSelect") {
if (["date", "updated", "created"].includes(filterValue.type)) {
const typeElement = menu.element.querySelector('.b3-select[data-type="dateType"]') as HTMLSelectElement;
const directElements = menu.element.querySelectorAll('.b3-select[data-type="dataDirection"]') as NodeListOf<HTMLSelectElement>;
if (typeElement.value === "custom") {
newFilter.relativeDate = {
count: parseInt((directElements[0].parentElement.querySelector(".b3-text-field") as HTMLInputElement).value || "1"),
unit: parseInt((directElements[0].parentElement.lastElementChild as HTMLSelectElement).value),
direction: parseInt(directElements[0].value)
};
newFilter.relativeDate2 = {
count: parseInt((directElements[1].parentElement.querySelector(".b3-text-field") as HTMLInputElement).value || "1"),
unit: parseInt((directElements[1].parentElement.lastElementChild as HTMLSelectElement).value),
direction: parseInt(directElements[1].value)
};
newValue = {type: filterValue.type};
} else {
newValue = genCellValue(filterValue.type, {
isNotEmpty2: textElements[2].value !== "",
isNotEmpty: textElements[0].value !== "",
content: textElements[0].value ? new Date(textElements[0].value + " 00:00").getTime() : null,
content2: textElements[2].value ? new Date(textElements[2].value + " 00:00").getTime() : null,
hasEndDate: newFilter.operator === "Is between",
isNotTime: true,
});
newFilter.relativeDate = null;
newFilter.relativeDate2 = null;
}
} else {
newValue = genCellValue(filterValue.type, textElements[0].value);
}
} else if (filterValue.type === "select" || filterValue.type === "mSelect") {
const mSelect: { const mSelect: {
color: string, color: string,
content: string content: string
@ -127,6 +111,35 @@ export const setFilter = async (options: {
} }
}); });
newValue = genCellValue(filterValue.type, mSelect); newValue = genCellValue(filterValue.type, mSelect);
} else if (["date", "updated", "created"].includes(filterValue.type)) {
const typeElement = menu.element.querySelector('.b3-select[data-type="dateType"]') as HTMLSelectElement;
const directElements = menu.element.querySelectorAll('.b3-select[data-type="dataDirection"]') as NodeListOf<HTMLSelectElement>;
if (typeElement.value === "custom") {
newFilter.relativeDate = {
count: parseInt((directElements[0].parentElement.querySelector(".b3-text-field") as HTMLInputElement).value || "1"),
unit: parseInt((directElements[0].parentElement.lastElementChild as HTMLSelectElement).value),
direction: parseInt(directElements[0].value)
};
newFilter.relativeDate2 = {
count: parseInt((directElements[1].parentElement.querySelector(".b3-text-field") as HTMLInputElement).value || "1"),
unit: parseInt((directElements[1].parentElement.lastElementChild as HTMLSelectElement).value),
direction: parseInt(directElements[1].value)
};
newValue = {type: filterValue.type};
} else {
newValue = genCellValue(filterValue.type, {
isNotEmpty2: textElements[2].value !== "",
isNotEmpty: textElements[0].value !== "",
content: textElements[0].value ? new Date(textElements[0].value + " 00:00").getTime() : null,
content2: textElements[2].value ? new Date(textElements[2].value + " 00:00").getTime() : null,
hasEndDate: newFilter.operator === "Is between",
isNotTime: true,
});
newFilter.relativeDate = null;
newFilter.relativeDate2 = null;
}
} else if (["text", "url", "block", "email", "phone", "template", "relation", "number"].includes(filterValue.type)) {
newValue = genCellValue(filterValue.type, textElements[0].value);
} else if (filterValue.type === "checkbox") { } else if (filterValue.type === "checkbox") {
newValue = genCellValue(filterValue.type, { newValue = genCellValue(filterValue.type, {
checked: newFilter.operator === "Is true" checked: newFilter.operator === "Is true"
@ -313,6 +326,37 @@ export const setFilter = async (options: {
label: `<select style="margin: 4px 0" class="b3-select fn__size200">${selectHTML}</select>` label: `<select style="margin: 4px 0" class="b3-select fn__size200">${selectHTML}</select>`
}); });
if (filterValue.type === "select" || filterValue.type === "mSelect") { if (filterValue.type === "select" || filterValue.type === "mSelect") {
if (colData.options?.length > 0) {
menu.addItem({
iconHTML: "",
type: "readonly",
label: `<input class="b3-text-field fn__block" style="margin: 4px 0" placeholder="${window.siyuan.languages.search}">`,
bind(element) {
const selectSearchElement = element.querySelector("input")
selectSearchElement.addEventListener("keydown", (event: KeyboardEvent) => {
if (event.isComposing) {
return;
}
let currentElement = upDownHint(menu.element.querySelector(".b3-menu__items"), event, "b3-menu__item--current", element.nextElementSibling);
if (event.key === "Enter") {
if (!currentElement) {
currentElement = menu.element.querySelector(".b3-menu__item--current");
}
currentElement.dispatchEvent(new CustomEvent("click"));
}
})
selectSearchElement.addEventListener("input", (event: InputEvent) => {
if (event.isComposing) {
return;
}
filterSelect(selectSearchElement.value.toLowerCase());
})
selectSearchElement.addEventListener("compositionend", () => {
filterSelect(selectSearchElement.value.toLowerCase());
})
}
})
}
colData.options?.forEach((option) => { colData.options?.forEach((option) => {
let icon = "iconUncheck"; let icon = "iconUncheck";
filterValue?.mSelect?.find((optionItem: IAVCellSelectValue) => { filterValue?.mSelect?.find((optionItem: IAVCellSelectValue) => {
@ -483,18 +527,20 @@ export const setFilter = async (options: {
}); });
const textElements: NodeListOf<HTMLInputElement> = menu.element.querySelectorAll(".b3-text-field"); const textElements: NodeListOf<HTMLInputElement> = menu.element.querySelectorAll(".b3-text-field");
textElements.forEach(item => { if (filterValue.type !== "select" && filterValue.type !== "mSelect") {
item.addEventListener("keydown", (event: KeyboardEvent) => { textElements.forEach(item => {
if (event.isComposing) { item.addEventListener("keydown", (event: KeyboardEvent) => {
event.preventDefault(); if (event.isComposing) {
return; event.preventDefault();
} return;
if (event.key === "Enter") { }
menu.close(); if (event.key === "Enter") {
event.preventDefault(); menu.close();
} event.preventDefault();
}
});
}); });
}); }
toggleEmpty(selectElement, selectElement.value, filterValue.type); toggleEmpty(selectElement, selectElement.value, filterValue.type);
menu.open({x: rectTarget.left, y: rectTarget.bottom}); menu.open({x: rectTarget.left, y: rectTarget.bottom});
if (textElements.length > 0) { if (textElements.length > 0) {

1
app/src/protyle/render/av/openMenuPanel.ts
View file

@ -583,6 +583,7 @@ export const openMenuPanel = (options: {
data.view.filters = []; data.view.filters = [];
menuElement.innerHTML = getFiltersHTML(data.view); menuElement.innerHTML = getFiltersHTML(data.view);
setPosition(menuElement, tabRect.right - menuElement.clientWidth, tabRect.bottom, tabRect.height); setPosition(menuElement, tabRect.right - menuElement.clientWidth, tabRect.bottom, tabRect.height);
window.siyuan.menus.menu.remove();
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
break; break;

5
app/src/protyle/render/av/select.ts
View file

@ -405,10 +405,7 @@ export const bindSelectEvent = (protyle: IProtyle, data: IAV, menuElement: HTMLE
} }
listElement.innerHTML = filterSelectHTML(inputElement.value, colData.options); listElement.innerHTML = filterSelectHTML(inputElement.value, colData.options);
}); });
inputElement.addEventListener("compositionend", (event: InputEvent) => { inputElement.addEventListener("compositionend", () => {
if (event.isComposing) {
return;
}
listElement.innerHTML = filterSelectHTML(inputElement.value, colData.options); listElement.innerHTML = filterSelectHTML(inputElement.value, colData.options);
}); });
inputElement.addEventListener("keydown", (event: KeyboardEvent) => { inputElement.addEventListener("keydown", (event: KeyboardEvent) => {