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

🎨 https://github.com/siyuan-note/siyuan/issues/10519

Browse source
This commit is contained in:
Vanessa 2024-03-06 22:20:46 +08:00
parent 2da549fac0
commit 39408525a4
3 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -131,7 +131,7 @@ export const setFilter = async (options: {
let isSame = false;
options.data.view.filters.find((filter, index) => {
if (filter.column === options.filter.column) {
if (filter.column === options.filter.column && filter.value.type === options.filter.value.type) {
if (filter.type && filter.type === "checkbox") {
hasMatch = true;
delete filter.type;
@ -205,7 +205,7 @@ export const setFilter = async (options: {
}
});
options.data.view.filters.find(item => {
if (item.column === colData.id && item.type) {
if (item.column === colData.id && item.type === "rollup") {
item.operator = getDefaultOperatorByType(filterType);
item.value = genCellValue(filterType, "");
delete item.type;
@ -594,7 +594,7 @@ export const getFiltersHTML = (data: IAVTable) => {
} else if (filter.operator === "!=") {
filterValue = ` ${window.siyuan.languages.filterOperatorIsNot} ${selectContent}`;
}
} else if (item.type === "number" && filter.value.number) {
} else if (item.type === "number" && filter.value.number && filter.value.number.isNotEmpty) {
if (["=", "!=", ">", "<"].includes(filter.operator)) {
filterValue = ` ${filter.operator} ${filter.value.number.content}`;
} else if (">=" === filter.operator) {
@ -617,7 +617,7 @@ export const getFiltersHTML = (data: IAVTable) => {
filterValue = ` ${window.siyuan.languages.filterOperatorEndsWith} ${content}`;
}
}
filterHTML += `<span data-type="setFilter" class="b3-chip b3-chip--primary${filterValue ? " b3-chip--primary" : ""}">
filterHTML += `<span data-type="setFilter" class="b3-chip${filterValue ? " b3-chip--primary" : ""}">
${item.icon ? unicode2Emoji(item.icon, "icon", true) : `<svg class="icon"><use xlink:href="#${getColIconByType(item.type)}"></use></svg>`}
<span class="fn__ellipsis">${item.name}${filterValue}</span>
</span>`;
@ -630,7 +630,7 @@ export const getFiltersHTML = (data: IAVTable) => {
data.filters.forEach((item: IAVFilter) => {
const filterHTML = genFilterItem(item);
if (filterHTML) {
html += `<button class="b3-menu__item" draggable="true" data-id="${item.column}">
html += `<button class="b3-menu__item" draggable="true" data-id="${item.column}" data-filter-type="${item.value.type}">
<svg class="b3-menu__icon fn__grab"><use xlink:href="#iconDrag"></use></svg>
<div class="fn__flex-1">${filterHTML}</div>
<svg class="b3-menu__action" data-type="removeFilter"><use xlink:href="#iconTrashcan"></use></svg>

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

@ -572,7 +572,7 @@ export const openMenuPanel = (options: {
window.siyuan.menus.menu.remove();
const oldFilters = Object.assign([], data.view.filters);
data.view.filters.find((item: IAVFilter, index: number) => {
if (item.column === target.parentElement.dataset.id) {
if (item.column === target.parentElement.dataset.id && item.value.type === target.parentElement.dataset.filterType) {
data.view.filters.splice(index, 1);
return true;
}
@ -595,7 +595,7 @@ export const openMenuPanel = (options: {
break;
} else if (type === "setFilter") {
data.view.filters.find((item: IAVFilter) => {
if (item.column === target.parentElement.parentElement.dataset.id) {
if (item.column === target.parentElement.parentElement.dataset.id && item.value.type === target.parentElement.parentElement.dataset.filterType) {
setFilter({
filter: item,
protyle: options.protyle,

14
app/src/protyle/render/av/render.ts
View file

@ -74,7 +74,16 @@ export const avRender = (element: Element, protyle: IProtyle, cb?: () => void, v
let pinMaxIndex = -1;
let indexWidth = 0;
const eWidth = e.clientWidth;
let hasFilter = false;
data.columns.forEach((item, index) => {
if (!hasFilter) {
data.filters.find(filterItem => {
if (filterItem.value.type === item.type && item.id === filterItem.column) {
hasFilter = true
return true
}
})
}
if (!item.hidden) {
if (item.pin) {
pinIndex = index;
@ -160,6 +169,7 @@ ${cell.color ? `color:${cell.color};` : ""}">${renderCell(cell.value)}</div>`;
viewData = item;
}
});
e.firstElementChild.outerHTML = `<div class="av__container" style="--av-background:${e.style.backgroundColor || "var(--b3-theme-background)"}">
<div class="av__header">
<div class="fn__flex av__views">
@ -178,7 +188,7 @@ ${cell.color ? `color:${cell.color};` : ""}">${renderCell(cell.value)}</div>`;
<small>${response.data.views.length}</small>
</span>
<div class="fn__space"></div>
<span data-type="av-filter" class="block__icon${data.filters.length > 0 ? " block__icon--active" : ""}">
<span data-type="av-filter" class="block__icon${hasFilter ? " block__icon--active" : ""}">
<svg><use xlink:href="#iconFilter"></use></svg>
</span>
<div class="fn__space"></div>
@ -302,7 +312,7 @@ export const refreshAV = (protyle: IProtyle, operation: IOperation) => {
} else {
Array.from(protyle.wysiwyg.element.querySelectorAll(`[data-av-id="${operation.avID}"]`)).forEach((item: HTMLElement) => {
item.removeAttribute("data-render");
const updateRow = item.querySelector('.av__row[data-need-update="true"]');
const updateRow = item.querySelector('.av__row[data-need-update="true"]');
avRender(item, protyle, () => {
const attrElement = document.querySelector(`.b3-dialog--open[data-key="${Constants.DIALOG_ATTR}"] div[data-av-id="${operation.avID}"]`) as HTMLElement;
if (attrElement) {