Merge branch 'master' into dev

src/renderer/utils/index.js

@@ -175,7 +175,7 @@ export const objectDeepMerge = (target, source) => {
  * @param {*} setting
  */
 export const updateSetting = (setting, version) => {
-  const defaultVersion = '1.0.20'
+  const defaultVersion = '1.0.22'
   if (!version) {
     if (setting) {
       version = setting.version
@@ -237,6 +237,10 @@ export const updateSetting = (setting, version) => {
         password: '',
       },
     },
+    tray: {
+      isShow: false,
+      isToTray: false,
+    },
     windowSizeId: 2,
     themeId: 0,
     langId: 'cns',
@@ -263,6 +267,7 @@ export const updateSetting = (setting, version) => {
     setting = defaultSetting
   }
   if (setting.apiSource != 'temp') setting.apiSource = 'test' // 强制设置回 test 接口源
+
   return { setting, version: defaultVersion }
 }