mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-12-19 16:10:12 +01:00
This commit is contained in:
Vanessa
parent
73bcce1485
commit
e62e36fbc0
4 changed files with 64 additions and 115 deletions
|
|
@ -17,7 +17,7 @@ export const setFilter = (options: {
|
|||
const oldFilters = JSON.parse(JSON.stringify(options.data.filters));
|
||||
let hasMatch = false;
|
||||
|
||||
let cellValue;
|
||||
let cellValue: IAVCellValue;
|
||||
if (colType === "number") {
|
||||
if (textElement.value) {
|
||||
cellValue = {
|
||||
|
|
@ -46,7 +46,7 @@ export const setFilter = (options: {
|
|||
}
|
||||
};
|
||||
}
|
||||
const newFilter = {
|
||||
const newFilter: IAVFilter = {
|
||||
column: options.filter.column,
|
||||
value: cellValue,
|
||||
operator: (window.siyuan.menus.menu.element.querySelector(".b3-select") as HTMLSelectElement).value as TAVFilterOperator
|
||||
|
|
@ -156,7 +156,8 @@ export const setFilter = (options: {
|
|||
textElement.parentElement.parentElement.classList.remove("fn__none");
|
||||
}
|
||||
});
|
||||
const textElement = (window.siyuan.menus.menu.element.querySelector(".b3-text-field") as HTMLInputElement);
|
||||
const textElement = window.siyuan.menus.menu.element.querySelector(".b3-text-field") as HTMLInputElement;
|
||||
if (textElement) {
|
||||
textElement.addEventListener("keydown", (event) => {
|
||||
if (event.isComposing) {
|
||||
event.preventDefault();
|
||||
|
|
@ -172,6 +173,7 @@ export const setFilter = (options: {
|
|||
} else {
|
||||
textElement.parentElement.parentElement.classList.remove("fn__none");
|
||||
}
|
||||
}
|
||||
menu.open({x: rectTarget.left, y: rectTarget.bottom});
|
||||
textElement.select();
|
||||
};
|
||||
|
|
|
|||
|
|
@ -54,23 +54,20 @@ ${column.wrap ? "" : "white-space: nowrap;"}">
|
|||
if (data.columns[index].hidden) {
|
||||
return;
|
||||
}
|
||||
let text = "";
|
||||
let text = '';
|
||||
if (cell.valueType === "text") {
|
||||
text = `<span class="av__celltext">${cell.value?.text.content || ""}</span>`;
|
||||
} else if (cell.valueType === "block") {
|
||||
text = `<span class="av__celltext">${cell.value?.block.content || ""}</span>`;
|
||||
} else if (cell.valueType === "number") {
|
||||
text = `<span class="av__celltext">${cell.value?.number.content || ""}</span>`;
|
||||
} else if (cell.valueType === "select") {
|
||||
if (cell.value?.select.content) {
|
||||
text = `<span class="av__celltext"><span class="b3-chip b3-chip--middle" style="background-color:var(--b3-font-background${cell.value.select.color});color:var(--b3-font-color${cell.value.select.color})">${cell.value.select.content}</span></span>`;
|
||||
} else {
|
||||
text = "<span class=\"av__celltext\"></span>";
|
||||
}
|
||||
} else if (cell.valueType === "mSelect") {
|
||||
} else if (cell.valueType === "mSelect" || cell.valueType === "select") {
|
||||
cell.value?.mSelect.forEach((item: { content: string, color: string }) => {
|
||||
text += `<span class="av__celltext"><span class="b3-chip b3-chip--middle" style="background-color:var(--b3-font-background${item.color});color:var(--b3-font-color${item.color})">${item.content}</span></span>`;
|
||||
});
|
||||
if (!text) {
|
||||
text = '<span class="av__celltext"></span>'
|
||||
}
|
||||
} else if (cell.valueType === "date") {
|
||||
text = `<span class="av__celltext">${cell.value?.date.content || ""}</span>`;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,22 +74,13 @@ export const removeSelectCell = (protyle: IProtyle, data: IAV, options: {
|
|||
return true;
|
||||
}
|
||||
});
|
||||
let oldValue;
|
||||
if (colData.type !== "select") {
|
||||
oldValue = Object.assign([], cellData.value.mSelect);
|
||||
const oldValue = Object.assign([], cellData.value.mSelect);
|
||||
cellData.value.mSelect?.find((item: { content: string }, index: number) => {
|
||||
if (item.content === target.dataset.content) {
|
||||
cellData.value.mSelect.splice(index, 1);
|
||||
return true;
|
||||
}
|
||||
});
|
||||
} else {
|
||||
oldValue = Object.assign({}, cellData.value.select);
|
||||
cellData.value.select = {
|
||||
color: "",
|
||||
content: ""
|
||||
};
|
||||
}
|
||||
target.remove();
|
||||
|
||||
transaction(protyle, [{
|
||||
|
|
@ -156,16 +147,12 @@ export const setSelectCol = (protyle: IProtyle, data: IAV, options: {
|
|||
if (row.id === options.cellElement.parentElement.dataset.id) {
|
||||
row.cells.find(cell => {
|
||||
if (cell.id === options.cellElement.dataset.id) {
|
||||
if (cell.valueType === "select") {
|
||||
cell.value.select.content = inputElement.value;
|
||||
} else {
|
||||
cell.value.mSelect.find((item) => {
|
||||
if (item.content === name) {
|
||||
item.content = inputElement.value;
|
||||
return true;
|
||||
}
|
||||
});
|
||||
}
|
||||
return true;
|
||||
}
|
||||
});
|
||||
|
|
@ -217,19 +204,12 @@ export const setSelectCol = (protyle: IProtyle, data: IAV, options: {
|
|||
if (row.id === options.cellElement.parentElement.dataset.id) {
|
||||
row.cells.find(cell => {
|
||||
if (cell.id === options.cellElement.dataset.id) {
|
||||
if (cell.valueType === "select") {
|
||||
cell.value.select = {
|
||||
color: "",
|
||||
content: ""
|
||||
};
|
||||
} else {
|
||||
cell.value.mSelect.find((item, index) => {
|
||||
if (item.content === newName) {
|
||||
cell.value.mSelect.splice(index, 1);
|
||||
return true;
|
||||
}
|
||||
});
|
||||
}
|
||||
return true;
|
||||
}
|
||||
});
|
||||
|
|
@ -291,12 +271,6 @@ export const setSelectCol = (protyle: IProtyle, data: IAV, options: {
|
|||
if (row.id === options.cellElement.parentElement.dataset.id) {
|
||||
row.cells.find(cell => {
|
||||
if (cell.id === options.cellElement.dataset.id) {
|
||||
if (cell.valueType === "select") {
|
||||
cell.value.select = {
|
||||
content: inputElement.value,
|
||||
color: (index + 1).toString()
|
||||
}
|
||||
} else {
|
||||
cell.value.mSelect.find((item) => {
|
||||
if (item.content === name) {
|
||||
item.content = inputElement.value;
|
||||
|
|
@ -304,7 +278,6 @@ export const setSelectCol = (protyle: IProtyle, data: IAV, options: {
|
|||
return true;
|
||||
}
|
||||
});
|
||||
}
|
||||
return true;
|
||||
}
|
||||
});
|
||||
|
|
@ -402,23 +375,12 @@ export const addSelectColAndCell = (protyle: IProtyle, data: IAV, options: {
|
|||
}
|
||||
});
|
||||
|
||||
let oldValue;
|
||||
if (colData.type !== "select") {
|
||||
oldValue = Object.assign([], cellData.value.mSelect);
|
||||
const oldValue = Object.assign([], cellData.value.mSelect);
|
||||
cellData.value.mSelect?.push({
|
||||
color: currentElement.dataset.color,
|
||||
content: currentElement.dataset.name
|
||||
});
|
||||
} else {
|
||||
if (!cellData.value) {
|
||||
cellData.value = {select: {}};
|
||||
}
|
||||
oldValue = Object.assign({}, cellData.value.select);
|
||||
cellData.value.select = {
|
||||
color: currentElement.dataset.color,
|
||||
content: currentElement.dataset.name
|
||||
};
|
||||
}
|
||||
|
||||
if (currentElement.querySelector(".b3-menu__accelerator")) {
|
||||
colData.options.push({
|
||||
color: currentElement.dataset.color,
|
||||
|
|
@ -476,13 +438,9 @@ export const getSelectHTML = (data: IAV, options: { cellElement: HTMLElement })
|
|||
if (options.cellElement.parentElement.dataset.id === row.id) {
|
||||
row.cells.find(cell => {
|
||||
if (cell.id === cellId && cell.value) {
|
||||
if (colData.type === "mSelect") {
|
||||
cell.value.mSelect?.forEach((item: { content: string, color: string }) => {
|
||||
selectedHTML += `<div class="b3-chip b3-chip--middle" data-content="${item.content}" style="background-color:var(--b3-font-background${item.color});color:var(--b3-font-color${item.color})">${item.content}<svg class="b3-chip__close" data-type="removeSelectCell"><use xlink:href="#iconCloseRound"></use></svg></div>`;
|
||||
});
|
||||
} else if (cell.value.select.content) {
|
||||
selectedHTML += `<div class="b3-chip b3-chip--middle" data-content="${cell.value.select.content}" style="background-color:var(--b3-font-background${cell.value.select.color});color:var(--b3-font-color${cell.value.select.color})">${cell.value.select.content}<svg class="b3-chip__close" data-type="removeSelectCell"><use xlink:href="#iconCloseRound"></use></svg></div>`;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
});
|
||||
|
|
|
|||
22
app/src/types/index.d.ts
vendored
22
app/src/types/index.d.ts
vendored
|
|
@ -855,11 +855,7 @@ interface IAV {
|
|||
interface IAVFilter {
|
||||
column: string,
|
||||
operator: TAVFilterOperator,
|
||||
value: {
|
||||
[key in TAVCol]?: IAVCellValue
|
||||
} & {
|
||||
mSelect?: { content: string, color: string }[]
|
||||
},
|
||||
value: IAVCellValue
|
||||
}
|
||||
|
||||
interface IAVSort {
|
||||
|
|
@ -891,18 +887,14 @@ interface IAVCell {
|
|||
id: string,
|
||||
color: string,
|
||||
bgColor: string,
|
||||
value: {
|
||||
[key in TAVCol]?: IAVCellValue
|
||||
} & {
|
||||
mSelect?: { content: string, color: string }[]
|
||||
},
|
||||
value: IAVCellValue,
|
||||
valueType: TAVCol,
|
||||
}
|
||||
|
||||
interface IAVCellValue {
|
||||
content?: any
|
||||
content2?: string // 用于日期
|
||||
color?: string
|
||||
id?: string
|
||||
isNotEmpty?: boolean
|
||||
text?: { content: string },
|
||||
number?: { content?: number, isNotEmpty: boolean },
|
||||
mSelect?: { content: string, color: string }[]
|
||||
block?: { content: string, id: string }
|
||||
date?: { content: string, content2?: string }
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue