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

🎨 https://github.com/siyuan-note/siyuan/issues/6404

Browse source
This commit is contained in:
Vanessa 2022-10-30 09:37:46 +08:00
parent fe846b4f59
commit 6ee275195e
8 changed files with 55 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

39
app/src/util/onGetConfig.ts
View file

@ -1,5 +1,5 @@
import {openSearch} from "../search/spread";
import {exportLayout, JSONToLayout, resizeDrag, resizeTabs} from "../layout/util";
import {exportLayout, JSONToLayout, resetLayout, resizeDrag, resizeTabs} from "../layout/util";
import {hotKey2Electron, updateHotkeyTip} from "../protyle/util/compatibility";
/// #if !BROWSER
import {dialog, getCurrentWindow} from "@electron/remote";
@ -15,7 +15,7 @@ import {globalShortcut} from "./globalShortcut";
import {fetchPost} from "./fetch";
import {mountHelp, newDailyNote} from "./mount";
import {MenuItem} from "../menus/Menu";
import {initAssets, loadAssets, setInlineStyle, setMode} from "./assets";
import {addGA, initAssets, loadAssets, setInlineStyle, setMode} from "./assets";
import {renderSnippet} from "../config/util/snippets";
import {getOpenNotebookCount} from "./pathName";
import {openFileById} from "../editor/util";
@ -138,9 +138,7 @@ export const onGetConfig = (isStart: boolean) => {
try {
JSONToLayout(isStart);
} catch (e) {
fetchPost("/api/system/setUILayout", {layout: {}}, () => {
window.location.reload();
});
resetLayout();
}
});
initBar();
@ -161,36 +159,7 @@ export const onGetConfig = (isStart: boolean) => {
if (window.siyuan.config.newbie) {
mountHelp();
}
if (!window.siyuan.config.system.disableGoogleAnalytics) {
addScript("https://www.googletagmanager.com/gtag/js?id=G-L7WEXVQCR9", "gaScript").then(() => {
try {
window.dataLayer = window.dataLayer || [];
window.gtag = function (...args) {
window.dataLayer.push(args);
};
window.gtag("js", new Date());
window.gtag("config", "G-L7WEXVQCR9");
const para = {
"version": Constants.SIYUAN_VERSION,
"container": window.siyuan.config.system.container,
"isLoggedIn": "false",
"subscriptionStatus": "-1",
"subscriptionPlan": "-1",
"subscriptionType": "-1",
};
if (window.siyuan.user) {
para.isLoggedIn = "true";
para.subscriptionStatus = window.siyuan.user.userSiYuanSubscriptionStatus.toString();
para.subscriptionPlan = window.siyuan.user.userSiYuanSubscriptionPlan.toString();
para.subscriptionType = window.siyuan.user.userSiYuanSubscriptionType.toString();
}
window.gtag("event", Constants.ANALYTICS_EVT_ON_GET_CONFIG, para);
} catch (e) {
console.error(e);
}
});
}
addGA();
};
const initBar = () => {