0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 https://github.com/siyuan-note/siyuan/issues/10038 加强筛选

Browse source
This commit is contained in:
Vanessa 2024-01-01 14:37:50 +08:00
parent d0dd7395b4
commit 9988706de3
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,9 +9,10 @@ import * as dayjs from "dayjs";
import {unicode2Emoji} from "../../../emoji";
import {openMenuPanel} from "./openMenuPanel";
import {fetchSyncPost} from "../../../util/fetch";
import {showMessage} from "../../../dialog/message";
export const getDefaultOperatorByType = (type: TAVCol) => {
if (["select", "number"].includes(type)) {
if (["select", "number", "date", "created", "updated"].includes(type)) {
return "=";
}
if (["checkbox"].includes(type)) {
@ -65,7 +66,11 @@ export const setFilter = async (options: {
}
const menu = new Menu("set-filter-" + options.filter.column, () => {
const oldFilters = JSON.parse(JSON.stringify(options.data.view.filters));
const operator = (window.siyuan.menus.menu.element.querySelector(".b3-select") as HTMLSelectElement).value as TAVFilterOperator;
const selectElement = window.siyuan.menus.menu.element.querySelector(".b3-select") as HTMLSelectElement
if (!selectElement) {
return;
}
const operator = selectElement.value as TAVFilterOperator;
let hasMatch = false;
let cellValue: IAVCellValue;
if (textElements.length > 0) {
@ -73,9 +78,10 @@ export const setFilter = async (options: {
cellValue = genCellValue(filterType, {
isNotEmpty2: textElements[1].value !== "",
isNotEmpty: textElements[0].value !== "",
content: new Date(textElements[0].value + " 00:00").getTime(),
content2: new Date(textElements[1].value + " 00:00").getTime(),
hasEndDate: operator === "Is between"
content: textElements[0].value ? new Date(textElements[0].value + " 00:00").getTime() : null,
content2: textElements[1].value ? new Date(textElements[1].value + " 00:00").getTime() : null,
hasEndDate: operator === "Is between",
isNotTime: true,
});
} else {
cellValue = genCellValue(filterType, textElements[0].value);
@ -94,9 +100,6 @@ export const setFilter = async (options: {
});
}
});
if (mSelect.length === 0) {
mSelect.push({color: "", content: ""});
}
cellValue = genCellValue(filterType, mSelect);
} else {
cellValue = genCellValue(filterType, undefined);
@ -149,7 +152,8 @@ export const setFilter = async (options: {
});
let filterType = colData.type;
if (filterType === "rollup") {
if (!colData.rollup.relationKeyID || !colData.rollup.keyID) {
if (!colData.rollup || !colData.rollup.relationKeyID || !colData.rollup.keyID) {
showMessage(window.siyuan.languages.plsChoose);
openMenuPanel({
protyle: options.protyle,
blockElement: options.blockElement,