From 0e6879335d618a355e7275a8e79cd9c25f69587f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com>
Date: Sat, 7 Sep 2024 16:24:51 +0800
Subject: [PATCH] =?UTF-8?q?feature:=20`=E5=90=AF=E5=8A=A8=E8=BD=AF?=
 =?UTF-8?q?=E4=BB=B6=E6=97=B6=E6=98=AF=E5=90=A6=E6=89=93=E5=BC=80=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3`=20=E5=8F=AF=E9=85=8D=E7=BD=AE=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/src/config/index.js       |  1 +
 packages/gui/src/background.js          | 27 ++++++++++++++++---------
 packages/gui/src/view/pages/setting.vue | 13 ++++++++++++
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/packages/core/src/config/index.js b/packages/core/src/config/index.js
index 9a8758d..c0f9bdd 100644
--- a/packages/core/src/config/index.js
+++ b/packages/core/src/config/index.js
@@ -26,6 +26,7 @@ module.exports = {
       // 个人远程配置地址
       personalUrl: ''
     },
+    startOpenWindow: true, // 启动时是否隐藏window，true=打开，false=隐藏
     theme: 'dark', // 主题：light=亮色, dark=暗色
     autoChecked: true, // 是否自动检查更新
     skipPreRelease: true, // 是否忽略预发布版本
diff --git a/packages/gui/src/background.js b/packages/gui/src/background.js
index 3137182..2e553ca 100644
--- a/packages/gui/src/background.js
+++ b/packages/gui/src/background.js
@@ -37,7 +37,11 @@ function setTray () {
       // 系统托盘图标目录
       label: 'DevTools',
       click: () => {
-        win.webContents.openDevTools()
+        try {
+          win.webContents.openDevTools()
+        } catch (e) {
+          log.error('win.webContents.openDevTools() error:', e)
+        }
       }
     },
     {
@@ -234,17 +238,20 @@ function setDock () {
 app.disableHardwareAcceleration() // 禁用gpu
 
 // 开启后是否默认隐藏window
-let startHideWindow = false
-if (process.argv) {
-  const args = minimist(process.argv)
-  if (args.hideWindow) {
-    startHideWindow = true
-  }
-
-  log.info('start args:', args)
-}
+let startHideWindow = !DevSidecar.api.config.get().app.startOpenWindow
 if (app.getLoginItemSettings().wasOpenedAsHidden) {
   startHideWindow = true
+} else if (process.argv) {
+  const args = minimist(process.argv)
+  log.info('start args:', args)
+
+  // 通过启动参数，判断是否隐藏窗口
+  const hideWindowArg = args.hideWindow + ''
+  if (hideWindowArg === 'true' || hideWindowArg === '1') {
+    startHideWindow = true
+  } else if (hideWindowArg === 'false' || hideWindowArg === '0') {
+    startHideWindow = false
+  }
 }
 log.info('start hide window:', startHideWindow, app.getLoginItemSettings())
 
diff --git a/packages/gui/src/view/pages/setting.vue b/packages/gui/src/view/pages/setting.vue
index 57a1bc9..27d52ad 100644
--- a/packages/gui/src/view/pages/setting.vue
+++ b/packages/gui/src/view/pages/setting.vue
@@ -88,6 +88,19 @@
           点击窗口右上角关闭按钮的效果
         </div>
       </a-form-item>
+      <a-form-item label="启动时打开窗口" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-radio-group v-model="config.app.startOpenWindow" default-value="true" button-style="solid">
+          <a-radio-button :value="true">
+            打开窗口
+          </a-radio-button>
+          <a-radio-button :value="false">
+            隐藏窗口
+          </a-radio-button>
+        </a-radio-group>
+        <div class="form-help">
+          启动软件时，是否打开窗口。提示：如果设置为隐藏窗口，可点击系统托盘小图标打开窗口。
+        </div>
+      </a-form-item>
       <hr/>
       <a-form-item label="自动检查更新" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-radio-group v-model="config.app.autoChecked" default-value="light" button-style="solid">