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

🎨 https://github.com/siyuan-note/siyuan/issues/5212 & reset zindex

Browse source
This commit is contained in:
Vanessa 2022-06-18 22:47:53 +08:00
parent c14fc344c6
commit 4226541e9e
9 changed files with 78 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/assets/scss/_menu.scss
View file

@ -4,7 +4,7 @@
box-shadow: var(--b3-dialog-shadow); box-shadow: var(--b3-dialog-shadow);
background-color: var(--b3-menu-background); background-color: var(--b3-menu-background);
padding: 4px 0; padding: 4px 0;
z-index: 306; z-index: 210;
&__item { &__item {
padding: 0 16px 0 8px; padding: 0 16px 0 8px;

2
app/src/assets/scss/_toolbar.scss
View file

@ -46,7 +46,7 @@
&-util { &-util {
@extend .b3-menu; @extend .b3-menu;
z-index: 303; z-index: 200;
} }
&-font { &-font {

24
app/src/assets/scss/base.scss
View file

@ -31,23 +31,31 @@
/* /*
// 需小于 .block__popover https://github.com/siyuan-note/siyuan/issues/3515 // 需小于 .block__popover https://github.com/siyuan-note/siyuan/issues/3515
ctrl+p 搜索: 199 ctrl+p 搜索: 199
// 需小于 .b3-dialog
.hint & .protyle-util: 200 // 需小于 .block__popover
.protyle-util: 200
// 需小于 .b3-dialog https://ld246.com/article/1637204682648 // 需小于 .b3-dialog https://ld246.com/article/1637204682648
.block__popover: 201 .block__popover: 201
// 需大于 .block__popover https://github.com/siyuan-note/siyuan/issues/3276
.protyle-util: 303 // 需大于 .block__popover
.b3-menu: 210
.side-panel: 220
// 需小于 #windowControls // 需小于 #windowControls
// 需大于 .protyle-util https://github.com/siyuan-note/siyuan/issues/5069 // 需大于 .protyle-util https://github.com/siyuan-note/siyuan/issues/5069
.b3-dialog: 305 .b3-dialog: 305
// 需大于 .block__popover
// 需大于 .b3-dialog https://github.com/siyuan-note/siyuan/issues/5107 // 历史中切换笔记本需临时大于 .b3-dialog https://github.com/siyuan-note/siyuan/issues/5107
.b3-menu: 306 .b3-menu: 310
// 需大于 .b3-dialog // 需大于 .b3-dialog
progressLoading: 400 progressLoading: 400
#windowControls: 502 #windowControls: 502
.b3-snackbar: 503 .b3-snackbar: 503
.side-panel: 600
*/ */
.inbox { .inbox {

2
app/src/assets/scss/mobile.scss
View file

@ -148,7 +148,7 @@
background-color: var(--b3-theme-surface); background-color: var(--b3-theme-surface);
height: 100%; height: 100%;
width: 80vw; width: 80vw;
z-index: 600; z-index: 220;
transition: var(--b3-transition); transition: var(--b3-transition);
&--left { &--left {

35
app/src/config/about.ts
View file

@ -11,6 +11,7 @@ import {exitSiYuan} from "../dialog/processSystem";
import {writeText} from "../protyle/util/compatibility"; import {writeText} from "../protyle/util/compatibility";
import {showMessage} from "../dialog/message"; import {showMessage} from "../dialog/message";
import {Dialog} from "../dialog"; import {Dialog} from "../dialog";
import {confirmDialog} from "../dialog/confirmDialog";
export const about = { export const about = {
element: undefined as Element, element: undefined as Element,
@ -89,16 +90,23 @@ export const about = {
<div class="b3-label__text ft__error">${window.siyuan.languages.dataRepoKeyTip2}</div> <div class="b3-label__text ft__error">${window.siyuan.languages.dataRepoKeyTip2}</div>
</div> </div>
<div class="fn__space"></div> <div class="fn__space"></div>
<div class="fn__size200 fn__flex-center"> <div class="fn__size200 fn__flex-center${window.siyuan.config.repo.key ? " fn__none" : ""}">
<button style="margin-bottom: 8px" class="b3-button b3-button--outline fn__size200${window.siyuan.config.repo.key ? " fn__none" : ""}" id="initKey"> <button class="b3-button b3-button--outline fn__size200" id="initKey">
<svg><use xlink:href="#iconLock"></use></svg>${window.siyuan.languages.genKey} <svg><use xlink:href="#iconLock"></use></svg>${window.siyuan.languages.genKey}
</button> </button>
<button class="b3-button b3-button--outline fn__size200${window.siyuan.config.repo.key ? " fn__none" : ""}" id="importKey"> <div class="fn__hr"></div>
<button class="b3-button b3-button--outline fn__size200" id="importKey">
<svg><use xlink:href="#iconDownload"></use></svg>${window.siyuan.languages.importKey} <svg><use xlink:href="#iconDownload"></use></svg>${window.siyuan.languages.importKey}
</button> </button>
<button class="b3-button b3-button--outline fn__size200${window.siyuan.config.repo.key ? "" : " fn__none"}" id="copyKey"> </div>
<div class="fn__size200 fn__flex-center${window.siyuan.config.repo.key ? "" : " fn__none"}">
<button class="b3-button b3-button--outline fn__size200" id="copyKey">
<svg><use xlink:href="#iconCopy"></use></svg>${window.siyuan.languages.copyKey} <svg><use xlink:href="#iconCopy"></use></svg>${window.siyuan.languages.copyKey}
</button> </button>
<div class="fn__hr"></div>
<button class="b3-button b3-button--outline fn__size200" id="removeKey">
<svg><use xlink:href="#iconTrashcan"></use></svg>${window.siyuan.languages.remove}
</button>
</div> </div>
</div> </div>
<div class="fn__flex b3-label"> <div class="fn__flex b3-label">
@ -224,9 +232,8 @@ export const about = {
btnsElement[1].addEventListener("click", () => { btnsElement[1].addEventListener("click", () => {
fetchPost("/api/repo/importRepoKey", {key: textAreaElement.value}, () => { fetchPost("/api/repo/importRepoKey", {key: textAreaElement.value}, () => {
window.siyuan.config.repo.key = textAreaElement.value; window.siyuan.config.repo.key = textAreaElement.value;
importKeyElement.classList.add("fn__none"); importKeyElement.parentElement.classList.add("fn__none");
importKeyElement.previousElementSibling.classList.add("fn__none"); importKeyElement.parentElement.nextElementSibling.classList.remove("fn__none");
importKeyElement.nextElementSibling.classList.remove("fn__none");
passwordDialog.destroy(); passwordDialog.destroy();
}); });
}); });
@ -234,15 +241,23 @@ export const about = {
about.element.querySelector("#initKey").addEventListener("click", () => { about.element.querySelector("#initKey").addEventListener("click", () => {
fetchPost("/api/repo/initRepoKey", {}, (response) => { fetchPost("/api/repo/initRepoKey", {}, (response) => {
window.siyuan.config.repo.key = response.data.key; window.siyuan.config.repo.key = response.data.key;
importKeyElement.classList.add("fn__none"); importKeyElement.parentElement.classList.add("fn__none");
importKeyElement.previousElementSibling.classList.add("fn__none"); importKeyElement.parentElement.nextElementSibling.classList.remove("fn__none");
importKeyElement.nextElementSibling.classList.remove("fn__none");
}); });
}); });
about.element.querySelector("#copyKey").addEventListener("click", () => { about.element.querySelector("#copyKey").addEventListener("click", () => {
showMessage(window.siyuan.languages.copied); showMessage(window.siyuan.languages.copied);
writeText(window.siyuan.config.repo.key); writeText(window.siyuan.config.repo.key);
}); });
about.element.querySelector("#removeKey").addEventListener("click", () => {
confirmDialog(window.siyuan.languages.remove, "", () => {
fetchPost("/api/repo/resetRepo", {}, () => {
window.siyuan.config.repo.key = "";
importKeyElement.parentElement.classList.remove("fn__none");
importKeyElement.parentElement.nextElementSibling.classList.add("fn__none");
});
});
});
const networkServeElement = about.element.querySelector("#networkServe") as HTMLInputElement; const networkServeElement = about.element.querySelector("#networkServe") as HTMLInputElement;
networkServeElement.addEventListener("change", () => { networkServeElement.addEventListener("change", () => {
fetchPost("/api/system/setNetworkServe", {networkServe: networkServeElement.checked}, () => { fetchPost("/api/system/setNetworkServe", {networkServe: networkServeElement.checked}, () => {

1
app/src/menus/Menu.ts
View file

@ -48,6 +48,7 @@ export class Menu {
public remove() { public remove() {
this.element.innerHTML = ""; this.element.innerHTML = "";
this.element.classList.add("fn__none"); this.element.classList.add("fn__none");
this.element.style.zIndex = "";
} }
public append(element?: HTMLElement) { public append(element?: HTMLElement) {

46
app/src/mobile/util/menu.ts
View file

@ -208,15 +208,24 @@ ${accountHTML}
<div class="b3-label"> <div class="b3-label">
${window.siyuan.languages.dataRepoKey} ${window.siyuan.languages.dataRepoKey}
<div class="fn__hr"></div> <div class="fn__hr"></div>
<button style="margin-bottom: 8px" class="b3-button b3-button--outline fn__block${window.siyuan.config.repo.key ? " fn__none" : ""}" id="initKey"> <div class="${window.siyuan.config.repo.key ? "fn__none" : ""}">
<svg><use xlink:href="#iconLock"></use></svg>${window.siyuan.languages.genKey} <button class="b3-button b3-button--outline fn__block" id="initKey">
</button> <svg><use xlink:href="#iconLock"></use></svg>${window.siyuan.languages.genKey}
<button class="b3-button b3-button--outline fn__block${window.siyuan.config.repo.key ? " fn__none" : ""}" id="importKey"> </button>
<svg><use xlink:href="#iconDownload"></use></svg>${window.siyuan.languages.importKey} <div class="fn__hr"></div>
</button> <button class="b3-button b3-button--outline fn__block" id="importKey">
<button class="b3-button b3-button--outline fn__block${window.siyuan.config.repo.key ? "" : " fn__none"}" id="copyKey"> <svg><use xlink:href="#iconDownload"></use></svg>${window.siyuan.languages.importKey}
<svg><use xlink:href="#iconCopy"></use></svg>${window.siyuan.languages.copyKey} </button>
</button> </div>
<div class="${window.siyuan.config.repo.key ? "" : "fn__none"}">
<button class="b3-button b3-button--outline fn__block" id="copyKey">
<svg><use xlink:href="#iconCopy"></use></svg>${window.siyuan.languages.copyKey}
</button>
<div class="fn__hr"></div>
<button class="b3-button b3-button--outline fn__block" id="removeKey">
<svg><use xlink:href="#iconTrashcan"></use></svg>${window.siyuan.languages.remove}
</button>
</div>
<div class="b3-label__text">${window.siyuan.languages.dataRepoKeyTip1}</div> <div class="b3-label__text">${window.siyuan.languages.dataRepoKeyTip1}</div>
<div class="b3-label__text ft__error">${window.siyuan.languages.dataRepoKeyTip2}</div> <div class="b3-label__text ft__error">${window.siyuan.languages.dataRepoKeyTip2}</div>
</div> </div>
@ -299,9 +308,8 @@ ${accountHTML}
btnsElement[1].addEventListener("click", () => { btnsElement[1].addEventListener("click", () => {
fetchPost("/api/repo/importRepoKey", {key: textAreaElement.value}, () => { fetchPost("/api/repo/importRepoKey", {key: textAreaElement.value}, () => {
window.siyuan.config.repo.key = textAreaElement.value; window.siyuan.config.repo.key = textAreaElement.value;
importKeyElement.classList.add("fn__none"); importKeyElement.parentElement.classList.add("fn__none");
importKeyElement.previousElementSibling.classList.add("fn__none"); importKeyElement.parentElement.nextElementSibling.classList.remove("fn__none");
importKeyElement.nextElementSibling.classList.remove("fn__none");
passwordDialog.destroy(); passwordDialog.destroy();
}); });
}); });
@ -309,15 +317,23 @@ ${accountHTML}
modelMainElement.querySelector("#initKey").addEventListener("click", () => { modelMainElement.querySelector("#initKey").addEventListener("click", () => {
fetchPost("/api/repo/initRepoKey", {}, (response) => { fetchPost("/api/repo/initRepoKey", {}, (response) => {
window.siyuan.config.repo.key = response.data.key; window.siyuan.config.repo.key = response.data.key;
importKeyElement.classList.add("fn__none"); importKeyElement.parentElement.classList.add("fn__none");
importKeyElement.previousElementSibling.classList.add("fn__none"); importKeyElement.parentElement.nextElementSibling.classList.remove("fn__none");
importKeyElement.nextElementSibling.classList.remove("fn__none");
}); });
}); });
modelMainElement.querySelector("#copyKey").addEventListener("click", () => { modelMainElement.querySelector("#copyKey").addEventListener("click", () => {
showMessage(window.siyuan.languages.copied); showMessage(window.siyuan.languages.copied);
writeText(window.siyuan.config.repo.key); writeText(window.siyuan.config.repo.key);
}); });
modelMainElement.querySelector("#removeKey").addEventListener("click", () => {
confirmDialog(window.siyuan.languages.remove, "", () => {
fetchPost("/api/repo/resetRepo", {}, () => {
window.siyuan.config.repo.key = "";
importKeyElement.parentElement.classList.remove("fn__none");
importKeyElement.parentElement.nextElementSibling.classList.add("fn__none");
});
});
});
modelMainElement.querySelector("#token").addEventListener("click", () => { modelMainElement.querySelector("#token").addEventListener("click", () => {
showMessage(window.siyuan.languages.copied); showMessage(window.siyuan.languages.copied);
writeText(window.siyuan.config.api.token); writeText(window.siyuan.config.api.token);

2
app/src/protyle/hint/index.ts
View file

@ -42,7 +42,7 @@ export class Hint {
this.element = document.createElement("div"); this.element = document.createElement("div");
this.element.setAttribute("data-close", "false"); this.element.setAttribute("data-close", "false");
// height 402 根据 .emojis max-height+8 得来 // height 402 根据 .emojis max-height+8 得来
this.element.setAttribute("style", `overflow:auto;z-index:200;max-height:402px;width:${Math.max(protyle.element.clientWidth / 2, 320)}px;box-sizing: border-box;`); this.element.setAttribute("style", `overflow:auto;max-height:402px;width:${Math.max(protyle.element.clientWidth / 2, 320)}px;box-sizing: border-box;`);
this.element.className = "b3-menu b3-list b3-list--background fn__none"; this.element.className = "b3-menu b3-list b3-list--background fn__none";
this.element.addEventListener("click", (event) => { this.element.addEventListener("click", (event) => {
const eventTarget = event.target as HTMLElement; const eventTarget = event.target as HTMLElement;

1
app/src/util/history.ts
View file

@ -308,6 +308,7 @@ export const openHistory = () => {
} }
}); });
window.siyuan.menus.menu.popup({x: event.clientX, y: event.clientY}); window.siyuan.menus.menu.popup({x: event.clientX, y: event.clientY});
window.siyuan.menus.menu.element.style.zIndex = "310";
break; break;
} else if (target.classList.contains("b3-list-item__action")) { } else if (target.classList.contains("b3-list-item__action")) {
confirmDialog("⚠️ " + window.siyuan.languages.rollback, `${window.siyuan.languages.rollbackConfirm.replace("${date}", target.parentElement.textContent.trim())}`, () => { confirmDialog("⚠️ " + window.siyuan.languages.rollback, `${window.siyuan.languages.rollbackConfirm.replace("${date}", target.parentElement.textContent.trim())}`, () => {