🎨 fix #9087

siyuan-note · Sep 4, 2023 · 225dfbf · 225dfbf
1 parent 9333f52
commit 225dfbf
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/app/electron/main.js b/app/electron/main.js
@@ -1024,3 +1024,11 @@ powerMonitor.on("shutdown", () => {
         net.fetch(getServer(currentURL.port) + "/api/system/exit", {method: "POST"});
     });
 });
+
+
+powerMonitor.on("lock-screen", () => {
+    writeLog("system lock-screen");
+    BrowserWindow.getAllWindows().forEach(item => {
+        item.webContents.send("siyuan-send_windows", {cmd: "lockscreenByMode"});
+    });
+});
diff --git a/app/src/config/about.ts b/app/src/config/about.ts
@@ -312,7 +312,9 @@ export const about = {
         });
         const lockScreenModeElement = about.element.querySelector("#lockScreenMode") as HTMLInputElement;
         lockScreenModeElement.addEventListener("change", () => {
-            fetchPost("/api/system/setFollowSystemLockScreen", {lockScreenMode: lockScreenModeElement.checked ? 1 : 0});
+            fetchPost("/api/system/setFollowSystemLockScreen", {lockScreenMode: lockScreenModeElement.checked ? 1 : 0}, () => {
+                window.siyuan.config.system.lockScreenMode = lockScreenModeElement.checked ? 1 : 0;
+            });
         });
         const googleAnalyticsElement = about.element.querySelector("#googleAnalytics") as HTMLInputElement;
         googleAnalyticsElement.addEventListener("change", () => {

diff --git a/app/src/constants.ts b/app/src/constants.ts
@@ -32,7 +32,7 @@ export abstract class Constants {
     public static readonly SIYUAN_INIT: string = "siyuan-init";
     public static readonly SIYUAN_OPENURL: string = "siyuan-openurl";
     public static readonly SIYUAN_OPENWINDOW: string = "siyuan-openwindow";
-    public static readonly SIYUAN_SEND_WINDOWS: string = "siyuan-send_windows"; // 主窗口和各新窗口之间的通信，{cmd: "closetab"|"lockscreen", data: {}})
+    public static readonly SIYUAN_SEND_WINDOWS: string = "siyuan-send_windows"; // 主窗口和各新窗口之间的通信，{cmd: "closetab"|"lockscreen"|"lockscreenByMode", data: {}})
     public static readonly SIYUAN_SAVE_CLOSE: string = "siyuan-save-close";
     public static readonly SIYUAN_EXPORT_PDF: string = "siyuan-export-pdf";
     public static readonly SIYUAN_EXPORT_CLOSE: string = "siyuan-export-close";

diff --git a/app/src/window/onWindowsMsg.ts b/app/src/window/onWindowsMsg.ts
@@ -26,5 +26,19 @@ export const onWindowsMsg = (ipcData: IWebSocketData) => {
                 }
             });
             break;
+        case "lockscreenByMode":
+            if (window.siyuan.config.system.lockScreenMode === 1) {
+                exportLayout({
+                    reload: false,
+                    onlyData: false,
+                    errorExit: false,
+                    cb() {
+                        fetchPost("/api/system/logoutAuth", {}, () => {
+                            redirectToCheckAuth();
+                        });
+                    }
+                });
+            }
+            break;
     }
 };