Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-03-07 05:10:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2025-03-05 09:19:09 +08:00
commit 482ca8ba00
14 changed files with 32 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/src/dialog/processSystem.ts
View file

@ -253,20 +253,19 @@ export const kernelError = () => {
if (document.querySelector("#errorLog")) {
return;
}
let iosReStart = "";
let title = `💔 ${window.siyuan.languages.kernelFault0} <small>v${Constants.SIYUAN_VERSION}</small>`;
let body = `<div>${window.siyuan.languages.kernelFault1}</div><div class="fn__hr"></div><div>${window.siyuan.languages.kernelFault2}</div>`;
if (isInIOS()) {
iosReStart = `<div class="fn__hr"></div><div class="fn__flex"><div class="fn__flex-1"></div><button class="b3-button">${window.siyuan.languages.retry}</button></div>`;
title = `🍵 ${window.siyuan.languages.pleaseWait} <small>v${Constants.SIYUAN_VERSION}</small>`;
body = `<div>${window.siyuan.languages.reconnectPrompt}</div><div class="fn__hr"></div><div class="fn__flex"><div class="fn__flex-1"></div><button class="b3-button">${window.siyuan.languages.retry}</button></div>`;
}
const dialog = new Dialog({
disableClose: true,
title: `💔 ${window.siyuan.languages.kernelFault0} <small>v${Constants.SIYUAN_VERSION}</small>`,
title: title,
width: isMobile() ? "92vw" : "520px",
content: `<div class="b3-dialog__content">
<div class="ft__breakword">
<div>${window.siyuan.languages.kernelFault1}</div>
<div class="fn__hr"></div>
<div>${window.siyuan.languages.kernelFault2}</div>
${iosReStart}
${body}
</div>
</div>`
});

2
app/src/types/index.d.ts vendored
View file

@ -186,6 +186,7 @@ interface Window {
JSAndroid: {
returnDesktop(): void
openExternal(url: string): void
exportByDefault(url: string): void
changeStatusBarColor(color: string, mode: number): void
writeClipboard(text: string): void
writeHTMLClipboard(text: string, html: string): void
@ -196,6 +197,7 @@ interface Window {
}
JSHarmony: {
openExternal(url: string): void
exportByDefault(url: string): void
changeStatusBarColor(color: string, mode: number): void
writeClipboard(text: string): void
writeHTMLClipboard(text: string, html: string): void