Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-21 09:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

📝 https://github.com/siyuan-note/siyuan/issues/10081

Browse source
This commit is contained in:
Vanessa 2024-01-24 18:17:41 +08:00
parent e85f5364b9
commit f3466a04fd
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/assets/scss/component/_dialog.scss
View file

@ -97,4 +97,15 @@
opacity: 1; opacity: 1;
} }
} }
&__loading {
position: fixed;
top: 45vh;
width: 70vw;
left: 15vw;
color: var(--b3-theme-on-surface);
background: var(--b3-theme-background);
padding: 10px;
border-radius: var(--b3-border-radius-b);
}
} }

2
app/src/boot/globalEvent/keydown.ts
View file

@ -1048,7 +1048,7 @@ const panelTreeKeydown = (app: App, event: KeyboardEvent) => {
let switchDialog: Dialog; let switchDialog: Dialog;
export const windowKeyDown = (app: App, event: KeyboardEvent) => { export const windowKeyDown = (app: App, event: KeyboardEvent) => {
// https://github.com/siyuan-note/siyuan/issues/9848 忘记为什么要阻止了 .av__mask 的情况，测了下没问题就先移除 // https://github.com/siyuan-note/siyuan/issues/9848 忘记为什么要阻止了 .av__mask 的情况，测了下没问题就先移除
if (document.getElementById("errorLog") || event.isComposing) { if (document.getElementById("progress") || document.getElementById("errorLog") || event.isComposing) {
return; return;
} }
const target = event.target as HTMLElement; const target = event.target as HTMLElement;

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

@ -309,7 +309,7 @@ export const progressLoading = (data: IWebSocketData) => {
} }
if (data.code === 0) { if (data.code === 0) {
progressElement.innerHTML = `<div class="b3-dialog__scrim" style="opacity: 1"></div> progressElement.innerHTML = `<div class="b3-dialog__scrim" style="opacity: 1"></div>
<div style="position: fixed;top: 45vh;width: 70vw;left: 15vw;color:var(--b3-theme-on-surface);"> <div class="b3-dialog__loading">
<div style="text-align: right">${data.data.current}/${data.data.total}</div> <div style="text-align: right">${data.data.current}/${data.data.total}</div>
<div style="margin: 8px 0;height: 8px;border-radius: var(--b3-border-radius);overflow: hidden;background-color:#fff;"><div style="width: ${data.data.current / data.data.total * 100}%;transition: var(--b3-transition);background-color: var(--b3-theme-primary);height: 8px;"></div></div> <div style="margin: 8px 0;height: 8px;border-radius: var(--b3-border-radius);overflow: hidden;background-color:#fff;"><div style="width: ${data.data.current / data.data.total * 100}%;transition: var(--b3-transition);background-color: var(--b3-theme-primary);height: 8px;"></div></div>
<div>${data.msg}</div> <div>${data.msg}</div>
@ -319,7 +319,7 @@ export const progressLoading = (data: IWebSocketData) => {
progressElement.lastElementChild.lastElementChild.innerHTML = data.msg; progressElement.lastElementChild.lastElementChild.innerHTML = data.msg;
} else { } else {
progressElement.innerHTML = `<div class="b3-dialog__scrim" style="opacity: 1"></div> progressElement.innerHTML = `<div class="b3-dialog__scrim" style="opacity: 1"></div>
<div style="position: fixed;top: 45vh;width: 70vw;left: 15vw;color:var(--b3-theme-on-surface);"> <div class="b3-dialog__loading">
<div style="margin: 8px 0;height: 8px;border-radius: var(--b3-border-radius);overflow: hidden;background-color:#fff;"><div style="background-color: var(--b3-theme-primary);height: 8px;background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);animation: stripMove 450ms linear infinite;background-size: 50px 50px;"></div></div> <div style="margin: 8px 0;height: 8px;border-radius: var(--b3-border-radius);overflow: hidden;background-color:#fff;"><div style="background-color: var(--b3-theme-primary);height: 8px;background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);animation: stripMove 450ms linear infinite;background-size: 50px 50px;"></div></div>
<div>${data.msg}</div> <div>${data.msg}</div>
</div>`; </div>`;