github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-04 07:39:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vanessa 2022-06-27 10:33:29 +08:00
parent eaa1e5834f
commit e3ca2c42f1
2 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/layout/util.ts
View File

@ -412,10 +412,10 @@ export const resizeTabs = () => {
setTimeout(() => { setTimeout(() => {
// .layout .fn__flex-shrink {transition: width .3s ease;} 时需要再次计算 padding // .layout .fn__flex-shrink {transition: width .3s ease;} 时需要再次计算 padding
setPadding(item.editor.protyle); setPadding(item.editor.protyle);
if (echarts) { if (typeof echarts !== "undefined") {
(item.editor.protyle.wysiwyg.element.querySelectorAll('[data-subtype="echarts"], [data-subtype="mindmap"]').forEach((chartItem: HTMLElement) => { item.editor.protyle.wysiwyg.element.querySelectorAll('[data-subtype="echarts"], [data-subtype="mindmap"]').forEach((chartItem: HTMLElement) => {
echarts.getInstanceById(chartItem.firstElementChild.nextElementSibling.getAttribute("_echarts_instance_")).resize(); echarts.getInstanceById(chartItem.firstElementChild.nextElementSibling.getAttribute("_echarts_instance_")).resize();
})) });
} }
}, 200); }, 200);
} }

43
app/src/util/onGetConfig.ts
View File

@ -172,8 +172,8 @@ const initStatus = () => {
</div> </div>
<div class="status__msg"></div> <div class="status__msg"></div>
<div class="fn__flex-1"></div> <div class="fn__flex-1"></div>
<div id="barSync" class="toolbar__item b3-tooltips b3-tooltips__nw" aria-label="${window.siyuan.config.sync.stat || (window.siyuan.languages.syncNow + " F9")}"> <div id="barFeedback" class="toolbar__item b3-tooltips b3-tooltips__nw" aria-label="${window.siyuan.languages.feedback}">
<svg><use xlink:href="#iconRefresh"></use></svg> <svg><use xlink:href="#iconHeart"></use></svg>
</div> </div>
<div id="barLock" class="toolbar__item b3-tooltips b3-tooltips__nw" aria-label="${window.siyuan.languages.lockScreen} ${updateHotkeyTip(window.siyuan.config.keymap.general.lockScreen.custom)}"> <div id="barLock" class="toolbar__item b3-tooltips b3-tooltips__nw" aria-label="${window.siyuan.languages.lockScreen} ${updateHotkeyTip(window.siyuan.config.keymap.general.lockScreen.custom)}">
<svg><use xlink:href="#iconLock"></use></svg> <svg><use xlink:href="#iconLock"></use></svg>
@ -224,17 +224,6 @@ const initStatus = () => {
target.querySelector(".b3-menu").classList.add("fn__none"); target.querySelector(".b3-menu").classList.add("fn__none");
event.stopPropagation(); event.stopPropagation();
break; break;
} else if (target.id === "barSync") {
if (needSubscribe() || target.firstElementChild.classList.contains("fn__rotate")) {
return;
}
if (!window.siyuan.config.sync.enabled) {
showMessage(window.siyuan.languages._kernel[124]);
return;
}
fetchPost("/api/sync/performSync", {});
event.stopPropagation();
break;
} else if (target.classList.contains("b3-menu__item")) { } else if (target.classList.contains("b3-menu__item")) {
const type = target.getAttribute("data-type") as TDockType; const type = target.getAttribute("data-type") as TDockType;
getDockByType(type).toggleModel(type); getDockByType(type).toggleModel(type);
@ -266,10 +255,21 @@ const initStatus = () => {
/// #endif /// #endif
event.stopPropagation(); event.stopPropagation();
break; break;
} else if (target.id === "barFeedback") {
if ("zh_CN" === window.siyuan.config.lang) {
window.open("https://ld246.com/article/1649901726096");
} else {
window.open("https://github.com/siyuan-note/siyuan/issues");
}
event.stopPropagation();
break;
} }
target = target.parentElement; target = target.parentElement;
} }
}); });
// if (window.siyuan.config.appearance.hideStatusBar) {
// document.getElementById("status").classList.add("fn__none");
// }
}; };
const initBar = () => { const initBar = () => {
@ -299,8 +299,8 @@ const initBar = () => {
<use xlink:href="#iconSettings"></use> <use xlink:href="#iconSettings"></use>
</svg> </svg>
</div> </div>
<div id="barFeedback" class="toolbar__item b3-tooltips b3-tooltips__se" aria-label="${window.siyuan.languages.feedback}"> <div id="barSync" class="toolbar__item b3-tooltips b3-tooltips__se" aria-label="${window.siyuan.config.sync.stat || (window.siyuan.languages.syncNow + " F9")}">
<svg><use xlink:href="#iconHeart"></use></svg> <svg><use xlink:href="#iconRefresh"></use></svg>
</div> </div>
<button id="barBack" data-menu="true" class="toolbar__item toolbar__item--disabled b3-tooltips b3-tooltips__se" aria-label="${window.siyuan.languages.goBack} ${updateHotkeyTip(window.siyuan.config.keymap.general.goBack.custom)}"> <button id="barBack" data-menu="true" class="toolbar__item toolbar__item--disabled b3-tooltips b3-tooltips__se" aria-label="${window.siyuan.languages.goBack} ${updateHotkeyTip(window.siyuan.config.keymap.general.goBack.custom)}">
<svg> <svg>
@ -321,12 +321,15 @@ const initBar = () => {
goBack(); goBack();
event.stopPropagation(); event.stopPropagation();
break; break;
} else if (target.id === "barFeedback") { } else if (target.id === "barSync") {
if ("zh_CN" === window.siyuan.config.lang) { if (needSubscribe() || target.firstElementChild.classList.contains("fn__rotate")) {
window.open("https://ld246.com/article/1649901726096"); return;
} else {
window.open("https://github.com/siyuan-note/siyuan/issues");
} }
if (!window.siyuan.config.sync.enabled) {
showMessage(window.siyuan.languages._kernel[124]);
return;
}
fetchPost("/api/sync/performSync", {});
event.stopPropagation(); event.stopPropagation();
break; break;
} else if (target.id === "barForward") { } else if (target.id === "barForward") {