From 2f59dc4c4d9ed2988c13c89c8c808848fc7db999 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Tue, 11 Jul 2023 23:52:25 +0800 Subject: [PATCH] :sparkles: https://github.com/siyuan-note/siyuan/issues/8664 --- app/src/protyle/render/av/col.ts | 13 ++++++++---- app/src/protyle/render/av/openMenuPanel.ts | 24 ++++++++++++++-------- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/app/src/protyle/render/av/col.ts b/app/src/protyle/render/av/col.ts index ee737c842..6bed834b3 100644 --- a/app/src/protyle/render/av/col.ts +++ b/app/src/protyle/render/av/col.ts @@ -66,6 +66,7 @@ export const showColMenu = (protyle: IProtyle, blockElement: HTMLElement, cellEl const type = cellElement.getAttribute("data-dtype") as TAVCol; const colId = cellElement.getAttribute("data-col-id"); const avId = blockElement.getAttribute("data-av-id"); + const viewId = blockElement.querySelector(".item--focus").getAttribute("data-id"); const menu = new Menu("av-header-cell", () => { const newValue = (window.siyuan.menus.menu.element.querySelector(".b3-text-field") as HTMLInputElement).value; if (newValue === cellElement.textContent.trim()) { @@ -193,12 +194,14 @@ export const showColMenu = (protyle: IProtyle, blockElement: HTMLElement, cellEl transaction(protyle, [{ action: "setAttrViewColHidden", id: colId, - parentID: avId, + avID: avId, + viewID: viewId, data: true }], [{ action: "setAttrViewColHidden", id: colId, - parentID: avId, + avID: avId, + viewID: viewId, data: false }]); } @@ -239,12 +242,14 @@ export const showColMenu = (protyle: IProtyle, blockElement: HTMLElement, cellEl transaction(protyle, [{ action: "setAttrViewColWrap", id: colId, - parentID: avId, + avID: avId, + viewID: viewId, data: inputElement.checked }], [{ action: "setAttrViewColWrap", id: colId, - parentID: avId, + avID: avId, + viewID: viewId, data: !inputElement.checked }]); }); diff --git a/app/src/protyle/render/av/openMenuPanel.ts b/app/src/protyle/render/av/openMenuPanel.ts index d5df269f6..afed25de1 100644 --- a/app/src/protyle/render/av/openMenuPanel.ts +++ b/app/src/protyle/render/av/openMenuPanel.ts @@ -404,13 +404,15 @@ export const openMenuPanel = (protyle: IProtyle, doOperations.push({ action: "setAttrViewColHidden", id: item.id, - parentID: avId, + avID: avId, + viewID: data.viewID, data: false }); undoOperations.push({ action: "setAttrViewColHidden", id: item.id, - parentID: avId, + avID: avId, + viewID: data.viewID, data: true }); item.hidden = false; @@ -431,13 +433,15 @@ export const openMenuPanel = (protyle: IProtyle, doOperations.push({ action: "setAttrViewColHidden", id: item.id, - parentID: avId, + avID: avId, + viewID: data.viewID, data: true }); undoOperations.push({ action: "setAttrViewColHidden", id: item.id, - parentID: avId, + avID: avId, + viewID: data.viewID, data: false }); item.hidden = true; @@ -455,12 +459,14 @@ export const openMenuPanel = (protyle: IProtyle, transaction(protyle, [{ action: "setAttrViewColHidden", id: colId, - parentID: avId, + avID: avId, + viewID: data.viewID, data: true }], [{ action: "setAttrViewColHidden", id: colId, - parentID: avId, + avID: avId, + viewID: data.viewID, data: false }]); data.view.columns.find((item: IAVColumn) => item.id === colId).hidden = true; @@ -473,12 +479,14 @@ export const openMenuPanel = (protyle: IProtyle, transaction(protyle, [{ action: "setAttrViewColHidden", id: colId, - parentID: avId, + avID: avId, + viewID: data.viewID, data: false }], [{ action: "setAttrViewColHidden", id: colId, - parentID: avId, + avID: avId, + viewID: data.viewID, data: true }]); data.view.columns.find((item: IAVColumn) => item.id === colId).hidden = false;