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

app/electron/main.js

@@ -52,6 +52,11 @@ remote.initialize();
 app.setPath("userData", app.getPath("userData") + "-Electron"); // `~/.config` 下 Electron 相关文件夹名称改为 `SiYuan-Electron` https://github.com/siyuan-note/siyuan/issues/3349
 fs.rmSync(app.getPath("appData") + "/" + app.name, {recursive: true}); // 删除自动创建的应用目录 https://github.com/siyuan-note/siyuan/issues/13150
 
+if (process.platform === 'win32') {
+    // Windows 需要设置 AppUserModelId 才能正确显示应用名称 https://github.com/siyuan-note/siyuan/issues/17022
+    app.setAppUserModelId(app.name);
+}
+
 if (!app.requestSingleInstanceLock()) {
     app.quit();
     return;