diff --git a/package.json b/package.json index 0881076..24f2489 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "electron-ssr", - "version": "0.3.0-alpha.3", + "version": "0.3.0-alpha.4", "description": "Cross platform ShadowsocksR GUI client built with electron", "author": { "name": "The Electron-SSR Authors", @@ -43,7 +43,7 @@ "chalk": "^3.0.0", "cli-progress": "^3.6.0", "devtron": "^1.4.0", - "electron": "^6.1.7", + "electron": "^6.1.9", "eslint": "^5.16.0", "eslint-plugin-vue": "^5.0.0", "request": "^2.88.2", diff --git a/src/main/index.js b/src/main/index.js index 3d74b55..6e3a0d0 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -55,7 +55,7 @@ if (!isPrimaryInstance) { if (changed.length === 0) { // if there is no config, or ssrPath is not set, show window // 初始化时没有配置则打开页面,有配置则不显示主页面 - if (appConfig.configs.length === 0 || !appConfig.ssrPath) { + if (!appConfig.hideWindow || appConfig.configs.length === 0 || !appConfig.ssrPath) { showWindow() } } else if (changed.indexOf('autoLaunch') > -1) { diff --git a/src/main/tray.js b/src/main/tray.js index 57e3a78..8f7168c 100644 --- a/src/main/tray.js +++ b/src/main/tray.js @@ -72,6 +72,7 @@ async function generateMenus (appConfig) { handler.toggleProxy(appConfig.sysProxyMode) } }, + { label: $t('MENU_SUB_COPY_HTTP_PROXY'), click: handler.copyHttpProxyCode }, { label: $t('MENU_PAC'), submenu: [ diff --git a/src/main/window.js b/src/main/window.js index 3ce1816..a87bccd 100644 --- a/src/main/window.js +++ b/src/main/window.js @@ -4,7 +4,6 @@ import logger from './logger' import { createProtocol } from 'vue-cli-plugin-electron-builder/lib' -import { isLinux } from '@/shared/env' let mainWindow let readyPromise @@ -19,7 +18,7 @@ export function createWindow () { resizable: false, minimizable: false, maximizable: false, - show: isLinux, + show: false, webPreferences: { webSecurity: process.env.NODE_ENV === 'production', nodeIntegration: true } }) if (process.platform === 'darwin') { app.dock.show() } diff --git a/src/renderer/views/panel/SSRGroupForm.vue b/src/renderer/components/form/SSRGroupForm.vue similarity index 100% rename from src/renderer/views/panel/SSRGroupForm.vue rename to src/renderer/components/form/SSRGroupForm.vue diff --git a/src/renderer/views/panel/SSRNodeForm.vue b/src/renderer/components/form/SSRNodeForm.vue similarity index 100% rename from src/renderer/views/panel/SSRNodeForm.vue rename to src/renderer/components/form/SSRNodeForm.vue diff --git a/src/renderer/views/panel/SSRNode.vue b/src/renderer/components/node/SSRNode.vue similarity index 81% rename from src/renderer/views/panel/SSRNode.vue rename to src/renderer/components/node/SSRNode.vue index 5f0fa65..89a107b 100644 --- a/src/renderer/views/panel/SSRNode.vue +++ b/src/renderer/components/node/SSRNode.vue @@ -1,12 +1,7 @@