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

📱 fix https://github.com/siyuan-note/siyuan/issues/8060

Browse source
This commit is contained in:
Vanessa 2023-04-20 10:05:24 +08:00
parent d697660c41
commit d1835146ca
25 changed files with 59 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/ai/actions.ts
View file

@ -41,7 +41,7 @@ export const AIActions = (elements: Element[], protyle: IProtyle) => {
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: isMobile() ? "80vw" : "520px", width: isMobile() ? "92vw" : "520px",
}); });
const inputElement = dialog.element.querySelector("input") as HTMLInputElement; const inputElement = dialog.element.querySelector("input") as HTMLInputElement;
const btnsElement = dialog.element.querySelectorAll(".b3-button"); const btnsElement = dialog.element.querySelectorAll(".b3-button");
@ -77,7 +77,7 @@ export const AIActions = (elements: Element[], protyle: IProtyle) => {
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: isMobile() ? "80vw" : "520px", width: isMobile() ? "92vw" : "520px",
}); });
const inputElement = dialog.element.querySelector("input"); const inputElement = dialog.element.querySelector("input");
const btnsElement = dialog.element.querySelectorAll(".b3-button"); const btnsElement = dialog.element.querySelectorAll(".b3-button");

2
app/src/ai/chat.ts
View file

@ -11,7 +11,7 @@ export const AIChat = (protyle: IProtyle, element: Element) => {
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: isMobile() ? "80vw" : "520px", width: isMobile() ? "92vw" : "520px",
}); });
const inputElement = dialog.element.querySelector("input") as HTMLInputElement; const inputElement = dialog.element.querySelector("input") as HTMLInputElement;
const btnsElement = dialog.element.querySelectorAll(".b3-button"); const btnsElement = dialog.element.querySelectorAll(".b3-button");

1
app/src/assets/scss/component/_button.scss
View file

@ -18,6 +18,7 @@
height: 16px; height: 16px;
width: 16px; width: 16px;
margin-right: 4px; margin-right: 4px;
flex-shrink: 0;
} }
&:hover, &:hover,

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

@ -77,12 +77,13 @@
&__close { &__close {
position: absolute; position: absolute;
cursor: pointer; cursor: pointer;
top: 10px; top: -2px;
right: -32px; right: -36px;
height: 18px; height: 18px;
width: 18px; width: 18px;
opacity: .68; opacity: .68;
color: var(--b3-theme-on-surface); color: var(--b3-theme-on-surface);
padding: 8px;
&:hover { &:hover {
opacity: 1; opacity: 1;

2
app/src/boot/openChangelog.ts
View file

@ -10,7 +10,7 @@ export const openChangelog = () => {
} }
const dialog = new Dialog({ const dialog = new Dialog({
title: `✨ ${window.siyuan.languages.whatsNewInSiYuan}`, title: `✨ ${window.siyuan.languages.whatsNewInSiYuan}`,
width: isMobile() ? "90vw" : "768px", width: isMobile() ? "92vw" : "768px",
content: `<div style="overflow:auto;height: ${isMobile() ? "80" : "70"}vh;" class="b3-dialog__content b3-typography b3-typography--default">${response.data.html}</div>` content: `<div style="overflow:auto;height: ${isMobile() ? "80" : "70"}vh;" class="b3-dialog__content b3-typography b3-typography--default">${response.data.html}</div>`
}); });
highlightRender(dialog.element); highlightRender(dialog.element);

21
app/src/card/makeCard.ts
View file

@ -47,23 +47,20 @@ export const makeCard = (ids: string[]) => {
html += genCardItem(item); html += genCardItem(item);
}); });
const dialog = new Dialog({ const dialog = new Dialog({
width: isMobile() ? "90vw" : "50vw", width: isMobile() ? "92vw" : "50vw",
height: "70vh", height: "70vh",
title: `<div class="fn__flex"> title: window.siyuan.languages.riffCard,
<div class="fn__flex-1">${window.siyuan.languages.riffCard}</div>
<span data-type="viewall" class="b3-button b3-button--cancel b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.cardPreview}">
<svg><use xlink:href="#iconEye"></use></svg>
${window.siyuan.languages.all}
</span>
</div>`,
content: `<div class="b3-dialog__content fn__flex-column" style="box-sizing: border-box;height: 100%"> content: `<div class="b3-dialog__content fn__flex-column" style="box-sizing: border-box;height: 100%">
<div class="fn__flex"> <div class="fn__flex">
<input class="b3-text-field fn__flex-1"> <input class="b3-text-field fn__flex-1">
<span class="fn__space"></span> <span class="fn__space"></span>
<button data-type="create" class="b3-button b3-button--outline" style="width: 100px"> <span data-type="create" class="block__icon block__icon--show b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.createDeck}">
<svg><use xlink:href="#iconAdd"></use></svg> <svg><use xlink:href="#iconAdd"></use></svg>
${window.siyuan.languages.createDeck} </span>
</button> <span class="fn__space"></span>
<span data-type="viewall" class="block__icon block__icon--show b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.cardPreview}">
<svg><use xlink:href="#iconEye"></use></svg>
</span>
</div> </div>
<div class="fn__hr"></div> <div class="fn__hr"></div>
<ul class="b3-list b3-list--background fn__flex-1">${html}</ul> <ul class="b3-list b3-list--background fn__flex-1">${html}</ul>
@ -144,7 +141,7 @@ export const makeCard = (ids: string[]) => {
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: isMobile() ? "80vw" : "520px", width: isMobile() ? "92vw" : "520px",
}); });
const inputElement = renameDialog.element.querySelector("input") as HTMLInputElement; const inputElement = renameDialog.element.querySelector("input") as HTMLInputElement;
const btnsElement = renameDialog.element.querySelectorAll(".b3-button"); const btnsElement = renameDialog.element.querySelectorAll(".b3-button");

2
app/src/config/util/setAccessAuthCode.ts
View file

@ -13,7 +13,7 @@ export const setAccessAuthCode = () => {
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: isMobile() ? "80vw" : "520px", width: isMobile() ? "92vw" : "520px",
}); });
const inputElement = dialog.element.querySelector("input") as HTMLInputElement; const inputElement = dialog.element.querySelector("input") as HTMLInputElement;
const btnsElement = dialog.element.querySelectorAll(".b3-button"); const btnsElement = dialog.element.querySelectorAll(".b3-button");

2
app/src/dialog/confirmDialog.ts
View file

@ -11,7 +11,7 @@ export const confirmDialog = (title: string, text: string, confirm?: () => void,
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text" id="confirmDialogConfirmBtn">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text" id="confirmDialogConfirmBtn">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: isMobile() ? "80vw" : "520px", width: isMobile() ? "92vw" : "520px",
}); });
const btnsElement = dialog.element.querySelectorAll(".b3-button"); const btnsElement = dialog.element.querySelectorAll(".b3-button");
btnsElement[0].addEventListener("click", () => { btnsElement[0].addEventListener("click", () => {

3
app/src/dialog/index.ts
View file

@ -1,4 +1,5 @@
import {genUUID} from "../util/genID"; import {genUUID} from "../util/genID";
import {isMobile} from "../util/functions";
export class Dialog { export class Dialog {
private destroyCallback: () => void; private destroyCallback: () => void;
@ -25,7 +26,7 @@ export class Dialog {
this.element.innerHTML = `<div class="b3-dialog"> this.element.innerHTML = `<div class="b3-dialog">
<div class="b3-dialog__scrim"${options.transparent ? 'style="background-color:transparent"' : ""}></div> <div class="b3-dialog__scrim"${options.transparent ? 'style="background-color:transparent"' : ""}></div>
<div class="b3-dialog__container" style="width:${options.width || "auto"}"> <div class="b3-dialog__container" style="width:${options.width || "auto"}">
<svg class="b3-dialog__close${this.disableClose ? " fn__none" : ""}"><use xlink:href="#iconCloseRound"></use></svg> <svg ${(isMobile() && options.title) ? 'style="top:0;right:0;"' : ""} class="b3-dialog__close${this.disableClose ? " fn__none" : ""}"><use xlink:href="#iconCloseRound"></use></svg>
<div class="b3-dialog__header${options.title ? "" : " fn__none"}" onselectstart="return false;">${options.title || ""}</div> <div class="b3-dialog__header${options.title ? "" : " fn__none"}" onselectstart="return false;">${options.title || ""}</div>
<div style="height:${options.height || "auto"}">${options.content}</div> <div style="height:${options.height || "auto"}">${options.content}</div>
</div></div>`; </div></div>`;

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

@ -133,7 +133,7 @@ export const transactionError = () => {
<div class="fn__space"></div> <div class="fn__space"></div>
<button class="b3-button">${window.siyuan.languages.rebuildIndex}</button> <button class="b3-button">${window.siyuan.languages.rebuildIndex}</button>
</div>`, </div>`,
width: isMobile() ? "80vw" : "520px", width: isMobile() ? "92vw" : "520px",
}); });
const btnsElement = dialog.element.querySelectorAll(".b3-button"); const btnsElement = dialog.element.querySelectorAll(".b3-button");
btnsElement[0].addEventListener("click", () => { btnsElement[0].addEventListener("click", () => {
@ -224,7 +224,7 @@ export const bootSync = () => {
fetchPost("/api/sync/getBootSync", {}, response => { fetchPost("/api/sync/getBootSync", {}, response => {
if (response.code === 1) { if (response.code === 1) {
const dialog = new Dialog({ const dialog = new Dialog({
width: isMobile() ? "80vw" : "50vw", width: isMobile() ? "92vw" : "50vw",
title: "🌩️ " + window.siyuan.languages.bootSyncFailed, title: "🌩️ " + window.siyuan.languages.bootSyncFailed,
content: `<div class="b3-dialog__content">${response.msg}</div> content: `<div class="b3-dialog__content">${response.msg}</div>
<div class="b3-dialog__action"> <div class="b3-dialog__action">

4
app/src/editor/rename.ts
View file

@ -54,7 +54,7 @@ export const rename = (options: {
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: isMobile() ? "80vw" : "520px", width: isMobile() ? "92vw" : "520px",
destroyCallback() { destroyCallback() {
if (options.range) { if (options.range) {
focusByRange(options.range); focusByRange(options.range);
@ -111,7 +111,7 @@ export const renameAsset = (assetPath: string) => {
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: isMobile() ? "80vw" : "520px", width: isMobile() ? "92vw" : "520px",
}); });
const inputElement = dialog.element.querySelector("input") as HTMLInputElement; const inputElement = dialog.element.querySelector("input") as HTMLInputElement;
const btnsElement = dialog.element.querySelectorAll(".b3-button"); const btnsElement = dialog.element.querySelectorAll(".b3-button");

3
app/src/history/diff.ts
View file

@ -6,6 +6,7 @@ import {disabledProtyle, onGet} from "../protyle/util/onGet";
import {hasClosestByClassName} from "../protyle/util/hasClosest"; import {hasClosestByClassName} from "../protyle/util/hasClosest";
import {escapeHtml} from "../util/escape"; import {escapeHtml} from "../util/escape";
import * as dayjs from "dayjs"; import * as dayjs from "dayjs";
import {isMobile} from "../util/functions";
const genItem = (data: [], data2?: { title: string, fileID: string }[]) => { const genItem = (data: [], data2?: { title: string, fileID: string }[]) => {
if (!data || data.length === 0) { if (!data || data.length === 0) {
@ -154,7 +155,7 @@ export const showDiff = (data: { id: string, time: string }[]) => {
</div> </div>
</div> </div>
</div>`, </div>`,
width: "80vw", width: isMobile() ? "92vw" : "80vw",
height: "80vh", height: "80vh",
destroyCallback() { destroyCallback() {
leftEditor = undefined; leftEditor = undefined;

4
app/src/history/history.ts
View file

@ -520,7 +520,7 @@ export const openHistory = () => {
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: isMobile() ? "80vw" : "520px", width: isMobile() ? "92vw" : "520px",
}); });
const textareaElement = genRepoDialog.element.querySelector("textarea"); const textareaElement = genRepoDialog.element.querySelector("textarea");
textareaElement.focus(); textareaElement.focus();
@ -569,7 +569,7 @@ export const openHistory = () => {
<button class="b3-button b3-button--text">${window.siyuan.languages.tagSnapshot}</button><div class="fn__space"></div> <button class="b3-button b3-button--text">${window.siyuan.languages.tagSnapshot}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.tagSnapshotUpload}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.tagSnapshotUpload}</button>
</div>`, </div>`,
width: isMobile() ? "80vw" : "520px", width: isMobile() ? "92vw" : "520px",
}); });
const inputElement = genTagDialog.element.querySelector(".b3-text-field") as HTMLInputElement; const inputElement = genTagDialog.element.querySelector(".b3-text-field") as HTMLInputElement;
inputElement.select(); inputElement.select();

2
app/src/menus/block.ts
View file

@ -17,7 +17,7 @@ export const transferBlockRef = (id:string) => {
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: isMobile() ? "80vw" : "520px", width: isMobile() ? "92vw" : "520px",
}); });
const inputElement = renameDialog.element.querySelector("input") as HTMLInputElement; const inputElement = renameDialog.element.querySelector("input") as HTMLInputElement;
const btnsElement = renameDialog.element.querySelectorAll(".b3-button"); const btnsElement = renameDialog.element.querySelectorAll(".b3-button");

6
app/src/menus/commonMenuItem.ts
View file

@ -47,7 +47,7 @@ export const openWechatNotify = (nodeElement: Element) => {
reminderFormat = dayjs(reminder).format("YYYY-MM-DDTHH:mm"); reminderFormat = dayjs(reminder).format("YYYY-MM-DDTHH:mm");
} }
const dialog = new Dialog({ const dialog = new Dialog({
width: isMobile() ? "80vw" : "50vw", width: isMobile() ? "92vw" : "50vw",
title: window.siyuan.languages.wechatReminder, title: window.siyuan.languages.wechatReminder,
content: `<div class="b3-dialog__content custom-attr"> content: `<div class="b3-dialog__content custom-attr">
<div class="fn__flex"> <div class="fn__flex">
@ -112,7 +112,7 @@ export const openFileWechatNotify = (protyle: IProtyle) => {
reminderFormat = dayjs(reminder).format("YYYY-MM-DDTHH:mm"); reminderFormat = dayjs(reminder).format("YYYY-MM-DDTHH:mm");
} }
const dialog = new Dialog({ const dialog = new Dialog({
width: isMobile() ? "80vw" : "50vw", width: isMobile() ? "92vw" : "50vw",
title: window.siyuan.languages.wechatReminder, title: window.siyuan.languages.wechatReminder,
content: `<div class="b3-dialog__content custom-attr"> content: `<div class="b3-dialog__content custom-attr">
<div class="fn__flex"> <div class="fn__flex">
@ -183,7 +183,7 @@ const genAttr = (attrs: IObject, focusName = "bookmark", cb: (dialog: Dialog, rm
} }
}); });
const dialog = new Dialog({ const dialog = new Dialog({
width: isMobile() ? "94vw" : "50vw", width: isMobile() ? "92vw" : "50vw",
title: window.siyuan.languages.attr, title: window.siyuan.languages.attr,
content: `<div class="custom-attr" style="max-height: calc(100vh - 166px);overflow: auto;"> content: `<div class="custom-attr" style="max-height: calc(100vh - 166px);overflow: auto;">
<label class="b3-label b3-label--noborder"> <label class="b3-label b3-label--noborder">

8
app/src/mobile/settings/about.ts
View file

@ -156,7 +156,7 @@ export const initAbout = () => {
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: "80vw", width: "92vw",
}); });
const textAreaElement = passwordDialog.element.querySelector("textarea"); const textAreaElement = passwordDialog.element.querySelector("textarea");
textAreaElement.focus(); textAreaElement.focus();
@ -196,7 +196,7 @@ export const initAbout = () => {
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: "80vw", width: "92vw",
}); });
const inputElement = initDialog.element.querySelector(".b3-text-field") as HTMLInputElement; const inputElement = initDialog.element.querySelector(".b3-text-field") as HTMLInputElement;
inputElement.focus(); inputElement.focus();
@ -278,7 +278,7 @@ export const initAbout = () => {
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: "80vw", width: "92vw",
}); });
const btnsElement = openWorkspaceDialog.element.querySelectorAll(".b3-button"); const btnsElement = openWorkspaceDialog.element.querySelectorAll(".b3-button");
btnsElement[0].addEventListener("click", () => { btnsElement[0].addEventListener("click", () => {
@ -312,7 +312,7 @@ export const initAbout = () => {
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: "80vw", width: "92vw",
}); });
const inputElement = createWorkspaceDialog.element.querySelector("input"); const inputElement = createWorkspaceDialog.element.querySelector("input");
inputElement.focus(); inputElement.focus();

2
app/src/mobile/util/MobileBookmarks.ts
View file

@ -60,7 +60,7 @@ export class MobileBookmarks {
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: "80vw", width: "92vw",
}); });
const btnsElement = dialog.element.querySelectorAll(".b3-button"); const btnsElement = dialog.element.querySelectorAll(".b3-button");
btnsElement[0].addEventListener("click", () => { btnsElement[0].addEventListener("click", () => {

2
app/src/mobile/util/MobileTags.ts
View file

@ -45,7 +45,7 @@ export class MobileTags {
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: "80vw", width: "92vw",
}); });
const btnsElement = dialog.element.querySelectorAll(".b3-button"); const btnsElement = dialog.element.querySelectorAll(".b3-button");
btnsElement[0].addEventListener("click", () => { btnsElement[0].addEventListener("click", () => {

19
app/src/protyle/export/util.ts
View file

@ -27,27 +27,24 @@ export const afterExport = (exportPath: string, msgId: string) => {
export const exportImage = (id: string) => { export const exportImage = (id: string) => {
const exportDialog = new Dialog({ const exportDialog = new Dialog({
title: `<div class="fn__flex"> title: window.siyuan.languages.exportAsImage,
${window.siyuan.languages.exportAsImage}
<div class="fn__flex-1"></div>
<label class="fn__flex">
${window.siyuan.languages.exportPDF5}
<span class="fn__space"></span>
<input id="keepFold" class="b3-switch fn__flex-center" type="checkbox" ${window.siyuan.storage[Constants.LOCAL_EXPORTIMG].keepFold ? "checked" : ""}>
</label>
</div>
`,
content: `<div class="b3-dialog__content" style="max-height: 70vh;overflow: auto;${isMobile() ? "padding:8px;" : ""};background-color: var(--b3-theme-background)"> content: `<div class="b3-dialog__content" style="max-height: 70vh;overflow: auto;${isMobile() ? "padding:8px;" : ""};background-color: var(--b3-theme-background)">
<div style="${isMobile() ? "padding: 16px;margin: 16px 0" : "padding: 48px;margin: 8px 0 24px"};border: 1px solid var(--b3-border-color);border-radius: 10px;" class="export-img protyle-wysiwyg${window.siyuan.config.editor.displayBookmarkIcon ? " protyle-wysiwyg--attr" : ""}" id="preview"></div> <div style="${isMobile() ? "padding: 16px;margin: 16px 0" : "padding: 48px;margin: 8px 0 24px"};border: 1px solid var(--b3-border-color);border-radius: 10px;" class="export-img protyle-wysiwyg${window.siyuan.config.editor.displayBookmarkIcon ? " protyle-wysiwyg--attr" : ""}" id="preview"></div>
<div class="fn__hr--b"></div> <div class="fn__hr--b"></div>
<div class="fn__hr--b"></div> <div class="fn__hr--b"></div>
</div> </div>
<div class="b3-dialog__action"> <div class="b3-dialog__action">
<label class="fn__flex">
${window.siyuan.languages.exportPDF5}
<span class="fn__space"></span>
<input id="keepFold" class="b3-switch fn__flex-center" type="checkbox" ${window.siyuan.storage[Constants.LOCAL_EXPORTIMG].keepFold ? "checked" : ""}>
</label>
<span class="fn__flex-1"></span>
<button disabled class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button disabled class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button disabled class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button disabled class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div> </div>
<div class="fn__loading"><img height="128px" width="128px" src="stage/loading-pure.svg"></div>`, <div class="fn__loading"><img height="128px" width="128px" src="stage/loading-pure.svg"></div>`,
width: isMobile() ? "90vw" : "990px", width: isMobile() ? "92vw" : "990px",
}); });
const btnsElement = exportDialog.element.querySelectorAll(".b3-button"); const btnsElement = exportDialog.element.querySelectorAll(".b3-button");
btnsElement[0].addEventListener("click", () => { btnsElement[0].addEventListener("click", () => {

2
app/src/protyle/header/Background.ts
View file

@ -305,7 +305,7 @@ export class Background {
} else if (type === "link") { } else if (type === "link") {
const dialog = new Dialog({ const dialog = new Dialog({
title: window.siyuan.languages.link, title: window.siyuan.languages.link,
width: isMobile() ? "80vw" : "520px", width: isMobile() ? "92vw" : "520px",
content: `<div class="b3-dialog__content"> content: `<div class="b3-dialog__content">
<input class="b3-text-field fn__block"> <input class="b3-text-field fn__block">
</div> </div>

4
app/src/search/menu.ts
View file

@ -123,7 +123,7 @@ export const filterMenu = (config: ISearchOption, cb: () => void) => {
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: isMobile() ? "90vw" : "520px", width: isMobile() ? "92vw" : "520px",
}); });
const btnsElement = filterDialog.element.querySelectorAll(".b3-button"); const btnsElement = filterDialog.element.querySelectorAll(".b3-button");
btnsElement[0].addEventListener("click", () => { btnsElement[0].addEventListener("click", () => {
@ -313,7 +313,7 @@ export const moreMenu = async (config: ISearchOption,
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: isMobile() ? "80vw" : "520px", width: isMobile() ? "92vw" : "520px",
}); });
const btnsElement = saveDialog.element.querySelectorAll(".b3-button"); const btnsElement = saveDialog.element.querySelectorAll(".b3-button");
saveDialog.bindInput(saveDialog.element.querySelector("input"), () => { saveDialog.bindInput(saveDialog.element.querySelector("input"), () => {

8
app/src/sync/syncGuide.ts
View file

@ -18,7 +18,7 @@ export const addCloudName = (cloudPanelElement: Element) => {
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: isMobile() ? "80vw" : "520px", width: isMobile() ? "92vw" : "520px",
}); });
const inputElement = dialog.element.querySelector("input") as HTMLInputElement; const inputElement = dialog.element.querySelector("input") as HTMLInputElement;
const btnsElement = dialog.element.querySelectorAll(".b3-button"); const btnsElement = dialog.element.querySelectorAll(".b3-button");
@ -191,7 +191,7 @@ const syncNow = () => {
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: isMobile() ? "80vw" : "520px", width: isMobile() ? "92vw" : "520px",
}); });
const btnsElement = manualDialog.element.querySelectorAll(".b3-button"); const btnsElement = manualDialog.element.querySelectorAll(".b3-button");
btnsElement[0].addEventListener("click", () => { btnsElement[0].addEventListener("click", () => {
@ -229,7 +229,7 @@ const setSync = (key?: string, dialog?: Dialog) => {
dialog = new Dialog({ dialog = new Dialog({
title: window.siyuan.languages.cloudSyncDir, title: window.siyuan.languages.cloudSyncDir,
content: listHTML, content: listHTML,
width: isMobile() ? "80vw" : "520px", width: isMobile() ? "92vw" : "520px",
}); });
} }
const contentElement = dialog.element.querySelector(".b3-dialog__content").lastElementChild; const contentElement = dialog.element.querySelector(".b3-dialog__content").lastElementChild;
@ -279,7 +279,7 @@ const setKey = () => {
<div class="b3-dialog__action"> <div class="b3-dialog__action">
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button>
</div>`, </div>`,
width: isMobile() ? "80vw" : "520px", width: isMobile() ? "92vw" : "520px",
}); });
dialog.element.querySelector(".b3-button--cancel").addEventListener("click", () => { dialog.element.querySelector(".b3-button--cancel").addEventListener("click", () => {
dialog.destroy(); dialog.destroy();

5
app/src/util/mount.ts
View file

@ -49,6 +49,7 @@ export const newDailyNote = () => {
} }
}); });
const dialog = new Dialog({ const dialog = new Dialog({
title: window.siyuan.languages.plsChoose,
content: `<div class="b3-dialog__content"> content: `<div class="b3-dialog__content">
<select class="b3-select fn__block">${optionsHTML}</select> <select class="b3-select fn__block">${optionsHTML}</select>
</div> </div>
@ -56,7 +57,7 @@ export const newDailyNote = () => {
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: isMobile() ? "80vw" : "520px", width: isMobile() ? "92vw" : "520px",
}); });
dialog.element.setAttribute("data-key", window.siyuan.config.keymap.general.dailyNote.custom); dialog.element.setAttribute("data-key", window.siyuan.config.keymap.general.dailyNote.custom);
const btnsElement = dialog.element.querySelectorAll(".b3-button"); const btnsElement = dialog.element.querySelectorAll(".b3-button");
@ -97,7 +98,7 @@ export const newNotebook = () => {
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: isMobile() ? "80vw" : "520px" width: isMobile() ? "92vw" : "520px"
}); });
const btnsElement = dialog.element.querySelectorAll(".b3-button"); const btnsElement = dialog.element.querySelectorAll(".b3-button");
dialog.bindInput(dialog.element.querySelector("input"), () => { dialog.bindInput(dialog.element.querySelector("input"), () => {

2
app/src/util/noRelyPCFunction.ts
View file

@ -11,7 +11,7 @@ export const renameTag = (labelName: string) => {
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: isMobile() ? "80vw": "520px", width: isMobile() ? "92vw": "520px",
}); });
const btnsElement = dialog.element.querySelectorAll(".b3-button"); const btnsElement = dialog.element.querySelectorAll(".b3-button");
btnsElement[0].addEventListener("click", () => { btnsElement[0].addEventListener("click", () => {

2
app/src/util/pathName.ts
View file

@ -154,7 +154,7 @@ export const movePathTo = (cb: (toPath: string[], toNotebook: string[]) => void,
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: isMobile() ? "90vw" : "50vw", width: isMobile() ? "92vw" : "50vw",
destroyCallback() { destroyCallback() {
if (range) { if (range) {
focusByRange(range); focusByRange(range);