张恒

升级依赖,调整文案

...@@ -14,3 +14,4 @@ yarn-error.log* ...@@ -14,3 +14,4 @@ yarn-error.log*
14 *.njsproj 14 *.njsproj
15 *.sln 15 *.sln
16 package-lock.json 16 package-lock.json
17 +electron-vue-template-ts.7z
......
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
130 "vue-loader": "^15.7.1", 130 "vue-loader": "^15.7.1",
131 "vue-style-loader": "^4.1.2", 131 "vue-style-loader": "^4.1.2",
132 "vue-template-compiler": "^2.6.10", 132 "vue-template-compiler": "^2.6.10",
133 - "webpack": "^4.39.1", 133 + "webpack": "^4.39.2",
134 "webpack-cli": "^3.3.6", 134 "webpack-cli": "^3.3.6",
135 "webpack-dev-server": "^3.7.2", 135 "webpack-dev-server": "^3.7.2",
136 "webpack-hot-middleware": "^2.25.0", 136 "webpack-hot-middleware": "^2.25.0",
......
...@@ -8,17 +8,14 @@ ...@@ -8,17 +8,14 @@
8 /* eslint-disable */ 8 /* eslint-disable */
9 9
10 // Install `electron-debug` with `devtron` 10 // Install `electron-debug` with `devtron`
11 -
12 require('electron-debug')({ showDevTools: true }) 11 require('electron-debug')({ showDevTools: true })
13 12
14 // Install `vue-devtools` 13 // Install `vue-devtools`
15 require('electron').app.on('ready', () => { 14 require('electron').app.on('ready', () => {
16 let installExtension = require('electron-devtools-installer') 15 let installExtension = require('electron-devtools-installer')
17 installExtension.default(installExtension.VUEJS_DEVTOOLS) 16 installExtension.default(installExtension.VUEJS_DEVTOOLS)
18 - .then(() => {}) 17 + .then((name) => { console.log(`installed: ${name}`) })
19 - .catch(err => { 18 + .catch(err => { console.log('Unable to install `vue-devtools`: \n', err) })
20 - console.log('Unable to install `vue-devtools`: \n', err)
21 - })
22 }) 19 })
23 20
24 // Require `main` process to boot app 21 // Require `main` process to boot app
......
...@@ -27,7 +27,7 @@ app.on('window-all-closed', () => { ...@@ -27,7 +27,7 @@ app.on('window-all-closed', () => {
27 } 27 }
28 }) 28 })
29 app.on('browser-window-created', () => { 29 app.on('browser-window-created', () => {
30 - console.log(11111) 30 + console.log('window-created')
31 }) 31 })
32 // app.on('activate', () => { 32 // app.on('activate', () => {
33 // if (mainWindow === null) { 33 // if (mainWindow === null) {
......
1 import { BrowserWindow, Menu } from 'electron' 1 import { BrowserWindow, Menu } from 'electron'
2 import menuconfig from '../config/menu' 2 import menuconfig from '../config/menu'
3 +import config from '@config'
3 4
4 const winURL = process.env.NODE_ENV === 'development' ? `http://localhost:9080` : `file://${__dirname}/index.html` 5 const winURL = process.env.NODE_ENV === 'development' ? `http://localhost:9080` : `file://${__dirname}/index.html`
5 6
...@@ -47,13 +48,13 @@ function loadindWindow (loadingURL) { ...@@ -47,13 +48,13 @@ function loadindWindow (loadingURL) {
47 48
48 loadWindow.show() 49 loadWindow.show()
49 50
50 - // setTimeout(() => { 51 + setTimeout(() => {
51 - // createMainWindow() 52 + createMainWindow()
52 - // loadWindow.destroy() 53 + loadWindow.destroy()
53 - // }, 2000) 54 + }, 2000)
54 } 55 }
55 function initWindow (loadingURL) { 56 function initWindow (loadingURL) {
56 - if (require('@config').UseStartupChart) { 57 + if (config.UseStartupChart) {
57 return loadindWindow(loadingURL) 58 return loadindWindow(loadingURL)
58 } else { 59 } else {
59 return createMainWindow() 60 return createMainWindow()
......