0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2024-04-28 09:52:01 +08:00
commit 544df28920
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,9 +23,9 @@ export const about = {
</div>
<span class="fn__space"></span>
<select class="b3-select fn__flex-center fn__size200" id="autoLaunch">
<option value="0" ${window.siyuan.config.system.autoLaunch === 0 ? "selected" : ""}>${window.siyuan.languages.autoLaunchMode0}</option>
<option value="1" ${window.siyuan.config.system.autoLaunch === 1 ? "selected" : ""}>${window.siyuan.languages.autoLaunchMode1}</option>
<option value="2" ${window.siyuan.config.system.autoLaunch === 2 ? "selected" : ""}>${window.siyuan.languages.autoLaunchMode2}</option>
<option value="0" ${window.siyuan.config.system.autoLaunch2 === 0 ? "selected" : ""}>${window.siyuan.languages.autoLaunchMode0}</option>
<option value="1" ${window.siyuan.config.system.autoLaunch2 === 1 ? "selected" : ""}>${window.siyuan.languages.autoLaunchMode1}</option>
<option value="2" ${window.siyuan.config.system.autoLaunch2 === 2 ? "selected" : ""}>${window.siyuan.languages.autoLaunchMode2}</option>
</select>
</div>
<label class="fn__flex b3-label${isBrowser() || window.siyuan.config.system.isMicrosoftStore || window.siyuan.config.system.container !== "std" ? " fn__none" : ""}">
@ -354,7 +354,7 @@ export const about = {
autoLaunchElement.addEventListener("change", () => {
const autoLaunchMode = parseInt(autoLaunchElement.value)
fetchPost("/api/system/setAutoLaunch", {autoLaunch: autoLaunchMode}, () => {
window.siyuan.config.system.autoLaunch = autoLaunchMode;
window.siyuan.config.system.autoLaunch2 = autoLaunchMode;
ipcRenderer.send(Constants.SIYUAN_AUTO_LAUNCH, {openAtLogin: 0 != autoLaunchMode});
});
});

2
app/src/types/config.d.ts vendored
View file

@ -1360,7 +1360,7 @@ declare namespace Config {
* - `1`: Boot automatically
* - `2`: Boot automatically + Minimize UI
*/
autoLaunch: number;
autoLaunch2: number;
/**
* The absolute path of the `conf` directory of the current workspace
*/