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/8694

Browse source
This commit is contained in:
Vanessa 2023-07-10 19:15:22 +08:00
parent b33ef1389d
commit 8cf28fcd24
1 changed files with 35 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -73,14 +73,48 @@ export const openMenuPanel = (protyle: IProtyle,
return; return;
} }
let type = "columns"; let type = "columns";
const isTop = targetElement.classList.contains("dragover__top");
if (targetElement.querySelector('[data-type="removeSort"]')) { if (targetElement.querySelector('[data-type="removeSort"]')) {
type = "sorts"; type = "sorts";
} else if (targetElement.querySelector('[data-type="removeFilter"]')) { } else if (targetElement.querySelector('[data-type="removeFilter"]')) {
type = "filters"; type = "filters";
} else if (targetElement.querySelector('[data-type="setSelectCol"]')) {
const changeData = data.columns.find((column) => column.id === options.cellElement.dataset.colId).options;
const oldData = Object.assign([], changeData);
let targetOption: { name: string, color: string };
changeData.find((option, index: number) => {
if (option.name === sourceElement.dataset.name) {
targetOption = changeData.splice(index, 1)[0];
return true;
}
});
changeData.find((option, index: number) => {
if (option.name === targetElement.dataset.name) {
if (isTop) {
changeData.splice(index, 0, targetOption);
} else {
changeData.splice(index + 1, 0, targetOption);
}
return true;
}
});
transaction(protyle, [{
action: "updateAttrViewColOptions",
id: options.cellElement.dataset.colId,
parentID: data.id,
data: changeData,
}], [{
action: "updateAttrViewColOptions",
id: options.cellElement.dataset.colId,
parentID: data.id,
data: oldData,
}]);
menuElement.innerHTML = getSelectHTML(data, options);
bindSelectEvent(protyle, data, menuElement, options);
return;
} }
const sourceId = sourceElement.dataset.id; const sourceId = sourceElement.dataset.id;
const targetId = targetElement.dataset.id; const targetId = targetElement.dataset.id;
const isTop = targetElement.classList.contains("dragover__top");
if (type !== "columns") { if (type !== "columns") {
const changeData = (type === "sorts" ? data.sorts : data.filters) as IAVFilter[]; const changeData = (type === "sorts" ? data.sorts : data.filters) as IAVFilter[];
const oldData = Object.assign([], changeData); const oldData = Object.assign([], changeData);