diff --git a/app/src/menus/commonMenuItem.ts b/app/src/menus/commonMenuItem.ts index 12c788263..09c0a6ea4 100644 --- a/app/src/menus/commonMenuItem.ts +++ b/app/src/menus/commonMenuItem.ts @@ -245,7 +245,9 @@ export const openFileAttr = (attrs: IObject, focusName = "bookmark", protyle?: I `, destroyCallback() { focusByRange(range); - hideElements(["select"], protyle); + if (protyle) { + hideElements(["select"], protyle); + } } }); dialog.element.setAttribute("data-key", Constants.DIALOG_ATTR); @@ -264,7 +266,7 @@ export const openFileAttr = (attrs: IObject, focusName = "bookmark", protyle?: I target.classList.add("item--focus"); dialog.element.querySelectorAll(".custom-attr").forEach((item: HTMLElement) => { if (item.dataset.type === target.dataset.type) { - if (item.dataset.type === "NodeAttributeView" && item.innerHTML === "") { + if (item.dataset.type === "NodeAttributeView" && item.innerHTML === "" && protyle) { renderAVAttribute(item, attrs.id, protyle); } item.classList.remove("fn__none"); diff --git a/app/src/protyle/render/chartRender.ts b/app/src/protyle/render/chartRender.ts index 3f0250c76..3e064bed2 100644 --- a/app/src/protyle/render/chartRender.ts +++ b/app/src/protyle/render/chartRender.ts @@ -32,16 +32,16 @@ export const chartRender = (element: Element, cdn = Constants.PROTYLE_CDN) => { } const renderElement = e.firstElementChild.nextElementSibling as HTMLElement; try { + window.echarts.dispose(renderElement); + renderElement.classList.remove("ft__error"); renderElement.style.height = e.style.height; const option = await looseJsonParse(Lute.UnEscapeHTMLStr(e.getAttribute("data-content"))); window.echarts.init(renderElement, window.siyuan.config.appearance.mode === 1 ? "dark" : undefined, {width}).setOption(option); e.setAttribute("data-render", "true"); - renderElement.classList.remove("ft__error"); if (!renderElement.textContent.endsWith(Constants.ZWSP)) { renderElement.firstElementChild.insertAdjacentText("beforeend", Constants.ZWSP); } } catch (error) { - window.echarts.dispose(renderElement); renderElement.classList.add("ft__error"); renderElement.innerHTML = `echarts render error:
${error}`; }