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/9966

Browse source
This commit is contained in:
Vanessa 2023-12-25 15:20:30 +08:00
parent aaeff27ba6
commit 325feb4afb
5 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/index.ts
View file

@ -166,7 +166,7 @@ export class App {
} }
await loadPlugins(this); await loadPlugins(this);
getLocalStorage(() => { getLocalStorage(() => {
fetchGet(`/appearance/langs/${window.siyuan.config.appearance.lang}.json?v=${Constants.SIYUAN_VERSION}`, (lauguages) => { fetchGet(`/appearance/langs/${window.siyuan.config.appearance.lang}.json?v=${Constants.SIYUAN_VERSION}`, (lauguages:IObject) => {
window.siyuan.languages = lauguages; window.siyuan.languages = lauguages;
window.siyuan.menus = new Menus(this); window.siyuan.menus = new Menus(this);
bootSync(); bootSync();

2
app/src/mobile/index.ts
View file

@ -85,7 +85,7 @@ class App {
window.siyuan.config = confResponse.data.conf; window.siyuan.config = confResponse.data.conf;
await loadPlugins(this); await loadPlugins(this);
getLocalStorage(() => { getLocalStorage(() => {
fetchGet(`/appearance/langs/${window.siyuan.config.appearance.lang}.json?v=${Constants.SIYUAN_VERSION}`, (lauguages) => { fetchGet(`/appearance/langs/${window.siyuan.config.appearance.lang}.json?v=${Constants.SIYUAN_VERSION}`, (lauguages: IObject) => {
window.siyuan.languages = lauguages; window.siyuan.languages = lauguages;
window.siyuan.menus = new Menus(this); window.siyuan.menus = new Menus(this);
document.title = window.siyuan.languages.siyuanNote; document.title = window.siyuan.languages.siyuanNote;

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

@ -3,7 +3,7 @@ import {escapeHtml} from "../../util/escape";
import * as path from "path"; import * as path from "path";
/// #endif /// #endif
import {hideMessage, showMessage} from "../../dialog/message"; import {hideMessage, showMessage} from "../../dialog/message";
import {fetchPost} from "../../util/fetch"; import {fetchGet, fetchPost} from "../../util/fetch";
import {Dialog} from "../../dialog"; import {Dialog} from "../../dialog";
import {addScript} from "../util/addScript"; import {addScript} from "../util/addScript";
import {isMobile} from "../../util/functions"; import {isMobile} from "../../util/functions";
@ -96,7 +96,7 @@ id="preview"></div>
markItem.childNodes.forEach((item) => { markItem.childNodes.forEach((item) => {
let spanHTML = ""; let spanHTML = "";
Array.from(item.textContent).forEach(str => { Array.from(item.textContent).forEach(str => {
spanHTML += `<span style="${markItem.getAttribute("style")||""};border-radius: 0;padding-left: 0;padding-right: 0;box-shadow: none;border-left:0;border-right:0;border-top:0" data-type="${markItem.getAttribute("data-type")}">${str}</span>`; spanHTML += `<span style="${markItem.getAttribute("style") || ""};border-radius: 0;padding-left: 0;padding-right: 0;box-shadow: none;border-left:0;border-right:0;border-top:0" data-type="${markItem.getAttribute("data-type")}">${str}</span>`;
}); });
const templateElement = document.createElement("template"); const templateElement = document.createElement("template");
templateElement.innerHTML = spanHTML; templateElement.innerHTML = spanHTML;
@ -139,6 +139,13 @@ id="preview"></div>
item.setAttribute("viewBox", viewBox); item.setAttribute("viewBox", viewBox);
item.innerHTML = symbolElements[symbolElements.length - 1].innerHTML; item.innerHTML = symbolElements[symbolElements.length - 1].innerHTML;
}); });
previewElement.querySelectorAll(".img img").forEach((item: HTMLImageElement) => {
if (item.src.endsWith(".svg")) {
fetchGet(item.src, (response: string) => {
item.src = `data:image/svg+xml;base64,${btoa(unescape(encodeURIComponent(response)))}`;
})
}
});
btnsElement[0].removeAttribute("disabled"); btnsElement[0].removeAttribute("disabled");
btnsElement[1].removeAttribute("disabled"); btnsElement[1].removeAttribute("disabled");
exportDialog.element.querySelector(".fn__loading").remove(); exportDialog.element.querySelector(".fn__loading").remove();

10
app/src/util/fetch.ts
View file

@ -93,10 +93,14 @@ export const fetchSyncPost = async (url: string, data?: any) => {
return res2; return res2;
}; };
export const fetchGet = (url: string, cb: (response: IWebSocketData | IEmoji[]) => void) => { export const fetchGet = (url: string, cb: (response: IWebSocketData | IObject | string) => void) => {
fetch(url).then((response) => { fetch(url).then((response) => {
return response.json(); if (response.headers.get("content-type")?.indexOf("application/json") > -1) {
}).then((response: IWebSocketData) => { return response.json();
} else {
return response.text();
}
}).then((response) => {
cb(response); cb(response);
}); });
}; };

2
app/src/window/index.ts
View file

@ -137,7 +137,7 @@ class App {
window.siyuan.config = response.data.conf; window.siyuan.config = response.data.conf;
await loadPlugins(this); await loadPlugins(this);
getLocalStorage(() => { getLocalStorage(() => {
fetchGet(`/appearance/langs/${window.siyuan.config.appearance.lang}.json?v=${Constants.SIYUAN_VERSION}`, (lauguages) => { fetchGet(`/appearance/langs/${window.siyuan.config.appearance.lang}.json?v=${Constants.SIYUAN_VERSION}`, (lauguages: IObject) => {
window.siyuan.languages = lauguages; window.siyuan.languages = lauguages;
window.siyuan.menus = new Menus(this); window.siyuan.menus = new Menus(this);
fetchPost("/api/setting/getCloudUser", {}, userResponse => { fetchPost("/api/setting/getCloudUser", {}, userResponse => {