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

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

Browse source
This commit is contained in:
Vanessa 2024-04-18 23:09:53 +08:00
parent 3d22d2d610
commit ac227fe375
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/src/protyle/render/av/rollup.ts
View file

@ -20,7 +20,6 @@ const updateCol = (options: {
return;
}
options.target.querySelector(".b3-menu__accelerator").textContent = itemElement.querySelector(".b3-list-item__text").textContent;
const colData = options.data.view.columns.find((item) => {
if (item.id === options.colId) {
if (!item.rollup) {
@ -29,14 +28,32 @@ const updateCol = (options: {
return true;
}
});
const oldColValue = Object.assign({}, colData.rollup);
if (options.isRelation) {
colData.rollup.relationKeyID = itemElement.dataset.colId;
options.target.nextElementSibling.setAttribute("data-av-id", itemElement.dataset.targetAvId);
if (itemElement.dataset.colId === colData.rollup?.relationKeyID) {
return;
}
colData.rollup = {
relationKeyID: itemElement.dataset.colId
}
const goSearchRollupTargetElement = options.target.nextElementSibling as HTMLElement
goSearchRollupTargetElement.querySelector(".b3-menu__accelerator").textContent = "";
goSearchRollupTargetElement.setAttribute("data-av-id", itemElement.dataset.targetAvId);
const goSearchRollupCalcElement = goSearchRollupTargetElement.nextElementSibling as HTMLElement;
goSearchRollupCalcElement.removeAttribute("data-col-type")
goSearchRollupCalcElement.removeAttribute("data-calc")
goSearchRollupCalcElement.querySelector(".b3-menu__accelerator").textContent = window.siyuan.languages.original;
} else {
if (itemElement.dataset.colId === colData.rollup?.keyID) {
return;
}
colData.rollup.keyID = itemElement.dataset.colId;
options.target.nextElementSibling.setAttribute("data-col-type", itemElement.dataset.colType);
delete colData.rollup.calc;
const goSearchRollupCalcElement = options.target.nextElementSibling as HTMLElement;
goSearchRollupCalcElement.removeAttribute("data-calc")
goSearchRollupCalcElement.setAttribute("data-col-type", itemElement.dataset.colType);
goSearchRollupCalcElement.querySelector(".b3-menu__accelerator").textContent = window.siyuan.languages.original;
}
const oldColValue = JSON.parse(JSON.stringify(colData.rollup));
transaction(options.protyle, [{
action: "updateAttrViewColRollup",
id: options.colId,