From f85e1178c45458e86eaf6cf6b70e09ab6d10c634 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Tue, 26 Sep 2023 09:38:16 +0800 Subject: [PATCH] :art: rm nodeID --- app/src/protyle/render/av/col.ts | 10 ++-------- app/src/protyle/render/av/openMenuPanel.ts | 5 +---- app/src/protyle/render/av/render.ts | 1 - 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/app/src/protyle/render/av/col.ts b/app/src/protyle/render/av/col.ts index 6209633fd..8e56b93de 100644 --- a/app/src/protyle/render/av/col.ts +++ b/app/src/protyle/render/av/col.ts @@ -12,7 +12,6 @@ export const duplicateCol = (options: { protyle: IProtyle, type: TAVCol, avID: string, - nodeID: string, colId: string, newValue: string }) => { @@ -24,7 +23,7 @@ export const duplicateCol = (options: { options.newValue = `${options.newValue} (1)`; } if (["select", "mSelect"].includes(options.type)) { - fetchPost("/api/av/renderAttributeView", {id: options.avID, nodeID: options.nodeID}, (response) => { + fetchPost("/api/av/renderAttributeView", {id: options.avID}, (response) => { const data = response.data as IAV; let colOptions; data.view.columns.find((item) => { @@ -74,7 +73,7 @@ export const duplicateCol = (options: { }]); } addAttrViewColAnimation({ - blockElement: options.protyle.wysiwyg.element.querySelector(`[data-node-id="${options.nodeID}"]`), + blockElement: options.protyle.wysiwyg.element.querySelector(`[data-av-id="${options.avID}"]`), protyle: options.protyle, type: options.type, name: options.newValue, @@ -289,7 +288,6 @@ export const showColMenu = (protyle: IProtyle, blockElement: Element, cellElemen const type = cellElement.getAttribute("data-dtype") as TAVCol; const colId = cellElement.getAttribute("data-col-id"); const avID = blockElement.getAttribute("data-av-id"); - const nodeID = blockElement.getAttribute("data-node-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()) { @@ -339,7 +337,6 @@ export const showColMenu = (protyle: IProtyle, blockElement: Element, cellElemen click() { fetchPost("/api/av/renderAttributeView", { id: avID, - nodeID }, (response) => { transaction(protyle, [{ action: "setAttrViewSorts", @@ -362,7 +359,6 @@ export const showColMenu = (protyle: IProtyle, blockElement: Element, cellElemen click() { fetchPost("/api/av/renderAttributeView", { id: avID, - nodeID }, (response) => { transaction(protyle, [{ action: "setAttrViewSorts", @@ -386,7 +382,6 @@ export const showColMenu = (protyle: IProtyle, blockElement: Element, cellElemen click() { fetchPost("/api/av/renderAttributeView", { id: avID, - nodeID }, (response) => { const avData = response.data as IAV; let filter: IAVFilter; @@ -450,7 +445,6 @@ export const showColMenu = (protyle: IProtyle, blockElement: Element, cellElemen protyle, type, avID, - nodeID, colId, newValue: (window.siyuan.menus.menu.element.querySelector(".b3-text-field") as HTMLInputElement).value }); diff --git a/app/src/protyle/render/av/openMenuPanel.ts b/app/src/protyle/render/av/openMenuPanel.ts index aa8387dc6..30a311287 100644 --- a/app/src/protyle/render/av/openMenuPanel.ts +++ b/app/src/protyle/render/av/openMenuPanel.ts @@ -27,10 +27,8 @@ export const openMenuPanel = (options: { } window.siyuan.menus.menu.remove(); const avID = options.blockElement.getAttribute("data-av-id"); - const nodeID = options.blockElement.getAttribute("data-node-id"); fetchPost("/api/av/renderAttributeView", { id: avID, - nodeID }, (response) => { const data = response.data as IAV; let html; @@ -238,7 +236,7 @@ export const openMenuPanel = (options: { } else { targetElement.after(sourceElement); } - const replaceValue: IAVCellAssetValue[] = [] + const replaceValue: IAVCellAssetValue[] = []; Array.from(targetElement.parentElement.children).forEach((item: HTMLElement) => { if (item.dataset.content) { replaceValue.push({ @@ -628,7 +626,6 @@ export const openMenuPanel = (options: { type: colData.type, avID, colId, - nodeID, newValue: colData.name }); avPanelElement.remove(); diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts index e563f9fe3..8f9691d08 100644 --- a/app/src/protyle/render/av/render.ts +++ b/app/src/protyle/render/av/render.ts @@ -23,7 +23,6 @@ export const avRender = (element: Element, protyle: IProtyle, cb?: () => void) = const left = e.querySelector(".av__scroll")?.scrollLeft || 0; fetchPost("/api/av/renderAttributeView", { id: e.getAttribute("data-av-id"), - nodeID: e.getAttribute("data-node-id") }, (response) => { const data = response.data.view as IAVTable; // header