fix:优化显示隐藏逻辑

src/main/browsers/login.js

@@ -61,20 +61,22 @@ module.exports = () => {
     });
   };
 
-  let createWindow = () => {
+  let createWindow = mainWindow => {
     console.log("create window");
     session.defaultSession.cookies
       .get({
         url: url
       })
       .then((cookies, err) => {
-        console.log("cookies", cookies);
+        // console.log("cookies", cookies);
       });
 
     win = new BrowserWindow({
       frame: true,
       autoHideMenuBar: true,
       title: false,
+      parent: mainWindow,
+      modal: true,
       width: 460,
       height: 400,
       show: false,
@@ -103,7 +105,7 @@ module.exports = () => {
     });
     // 打包后，失焦隐藏
     win.on("blur", () => {
-      // win.hide();
+      win.close();
     });
     win.webContents.on("did-stop-loading", () => {
       win.webContents.insertCSS(
@@ -120,7 +122,7 @@ module.exports = () => {
         .quicker_loading { height: 100vh; }
         `
       );
-      win.openDevTools()
+      win.openDevTools();
       win.show();
     });
   };

src/main/browsers/main.js

@@ -15,13 +15,14 @@ module.exports = () => {
         : `file://${__dirname}/index.html`;
 
     win = new BrowserWindow({
-      height: 74,  // client_height
+      height: 74, // client_height
       useContentSize: true,
       resizable: true,
       width: 920,
-      frame: false, 
+      frame: false,
+      backgroundColor: "#fff",
       title: "拉比克",
-      show: false,
+      show: true,
       skipTaskbar: true,
       webPreferences: {
         webSecurity: false,
@@ -50,12 +51,13 @@ module.exports = () => {
       }
     );
 
-    win.once("ready-to-show", () => win.show());
+    // win.once("ready-to-show", () => win.show());
     win.on("closed", () => {
       win = undefined;
     });
     win.on("blur", () => {
-      win.hide();
+      const childWindows = win.getChildWindows();
+      if (!childWindows.length) win.hide();
     });
   };
 

src/main/common/listener.js

@@ -217,7 +217,9 @@ class Listener {
       console.log("win", win);
 
       if (win === null || win === undefined) {
-        login.createWindow();
+        login.createWindow(mainWindow);
+      } else {
+        win.show()
       }
     });
   }