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

Browse source
This commit is contained in:
Vanessa 2022-10-30 09:51:07 +08:00
parent 33fa1700f8
commit 18415517bb
4 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/index.ts
View file

@ -21,6 +21,7 @@ import {
import {promiseTransactions} from "./protyle/wysiwyg/transaction"; import {promiseTransactions} from "./protyle/wysiwyg/transaction";
import {initMessage} from "./dialog/message"; import {initMessage} from "./dialog/message";
import {resizeDrag} from "./layout/util"; import {resizeDrag} from "./layout/util";
import {setLocalStorage} from "./protyle/util/compatibility";
class App { class App {
constructor() { constructor() {
@ -81,6 +82,7 @@ class App {
}), }),
menus: new Menus() menus: new Menus()
}; };
setLocalStorage();
fetchPost("/api/system/getConf", {}, response => { fetchPost("/api/system/getConf", {}, response => {
window.siyuan.config = response.data.conf; window.siyuan.config = response.data.conf;
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) => {

18
app/src/layout/util.ts
View file

@ -10,7 +10,7 @@ import {setPadding} from "../protyle/ui/initUI";
import {newFile} from "../util/newFile"; import {newFile} from "../util/newFile";
import {Outline} from "./dock/Outline"; import {Outline} from "./dock/Outline";
import {Bookmark} from "./dock/Bookmark"; import {Bookmark} from "./dock/Bookmark";
import {updateHotkeyTip} from "../protyle/util/compatibility"; import {exportLocalStorage, updateHotkeyTip} from "../protyle/util/compatibility";
import {Tag} from "./dock/Tag"; import {Tag} from "./dock/Tag";
import {getAllModels, getAllTabs} from "./getAll"; import {getAllModels, getAllTabs} from "./getAll";
import {Asset} from "../asset"; import {Asset} from "../asset";
@ -138,7 +138,9 @@ const dockToJSON = (dock: Dock) => {
export const resetLayout = () => { export const resetLayout = () => {
fetchPost("/api/system/setUILayout", {layout: {}}, () => { fetchPost("/api/system/setUILayout", {layout: {}}, () => {
window.location.reload(); exportLocalStorage(() => {
window.location.reload();
});
}); });
}; };
@ -157,11 +159,13 @@ export const exportLayout = (reload: boolean, cb?: () => void) => {
}; };
layoutToJSON(window.siyuan.layout.layout, layoutJSON.layout); layoutToJSON(window.siyuan.layout.layout, layoutJSON.layout);
fetchPost("/api/system/setUILayout", {layout: layoutJSON, exit: typeof cb !== "undefined"}, () => { fetchPost("/api/system/setUILayout", {layout: layoutJSON, exit: typeof cb !== "undefined"}, () => {
if (reload) { exportLocalStorage(() => {
window.location.reload(); if (reload) {
} else if (cb) { window.location.reload();
cb(); } else if (cb) {
} cb();
}
})
}); });
}; };

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

@ -16,6 +16,7 @@ import {bootSync} from "../dialog/processSystem";
import {initMessage} from "../dialog/message"; import {initMessage} from "../dialog/message";
import {goBack} from "./util/MobileBackFoward"; import {goBack} from "./util/MobileBackFoward";
import {hideKeyboardToolbar, showKeyboardToolbar} from "./util/showKeyboardToolbar"; import {hideKeyboardToolbar, showKeyboardToolbar} from "./util/showKeyboardToolbar";
import {setLocalStorage} from "../protyle/util/compatibility";
class App { class App {
constructor() { constructor() {
@ -43,6 +44,7 @@ class App {
window.siyuan.menus.menu.remove(); window.siyuan.menus.menu.remove();
} }
}); });
setLocalStorage();
fetchPost("/api/system/getConf", {}, confResponse => { fetchPost("/api/system/getConf", {}, confResponse => {
confResponse.data.conf.keymap = Constants.SIYUAN_KEYMAP; confResponse.data.conf.keymap = Constants.SIYUAN_KEYMAP;
window.siyuan.config = confResponse.data.conf; window.siyuan.config = confResponse.data.conf;

15
app/src/protyle/util/compatibility.ts
View file

@ -1,4 +1,5 @@
import {focusByRange} from "./selection"; import {focusByRange} from "./selection";
import {fetchPost} from "../../util/fetch";
export const openByMobile = (uri: string) => { export const openByMobile = (uri: string) => {
if (!uri) { if (!uri) {
@ -13,7 +14,7 @@ export const openByMobile = (uri: string) => {
} }
}; };
export const readText = async () => { export const readText = async () => {
if ("android" === window.siyuan.config.system.container && window.JSAndroid) { if ("android" === window.siyuan.config.system.container && window.JSAndroid) {
return window.JSAndroid.readClipboard(); return window.JSAndroid.readClipboard();
} }
@ -133,9 +134,15 @@ export const hotKey2Electron = (key: string) => {
}; };
export const setLocalStorage = () => { export const setLocalStorage = () => {
fetchPost("/api/system/getLocalStorage", undefined, (response) => {
Object.keys(response.data).forEach(item => {
window.localStorage.setItem(item, response.data[item]);
})
});
} }
export const exportLocalStorage = () => { export const exportLocalStorage = (cb: () => void) => {
fetchPost("/api/system/setLocalStorage", {val: JSON.stringify(localStorage)}, (response) => {
cb();
});
} }