张恒

升级依赖,调整文案

......@@ -14,3 +14,4 @@ yarn-error.log*
*.njsproj
*.sln
package-lock.json
electron-vue-template-ts.7z
......
......@@ -130,7 +130,7 @@
"vue-loader": "^15.7.1",
"vue-style-loader": "^4.1.2",
"vue-template-compiler": "^2.6.10",
"webpack": "^4.39.1",
"webpack": "^4.39.2",
"webpack-cli": "^3.3.6",
"webpack-dev-server": "^3.7.2",
"webpack-hot-middleware": "^2.25.0",
......
......@@ -8,17 +8,14 @@
/* eslint-disable */
// Install `electron-debug` with `devtron`
require('electron-debug')({ showDevTools: true })
// Install `vue-devtools`
require('electron').app.on('ready', () => {
let installExtension = require('electron-devtools-installer')
installExtension.default(installExtension.VUEJS_DEVTOOLS)
.then(() => {})
.catch(err => {
console.log('Unable to install `vue-devtools`: \n', err)
})
.then((name) => { console.log(`installed: ${name}`) })
.catch(err => { console.log('Unable to install `vue-devtools`: \n', err) })
})
// Require `main` process to boot app
......
......@@ -27,7 +27,7 @@ app.on('window-all-closed', () => {
}
})
app.on('browser-window-created', () => {
console.log(11111)
console.log('window-created')
})
// app.on('activate', () => {
// if (mainWindow === null) {
......
import { BrowserWindow, Menu } from 'electron'
import menuconfig from '../config/menu'
import config from '@config'
const winURL = process.env.NODE_ENV === 'development' ? `http://localhost:9080` : `file://${__dirname}/index.html`
......@@ -47,13 +48,13 @@ function loadindWindow (loadingURL) {
loadWindow.show()
// setTimeout(() => {
// createMainWindow()
// loadWindow.destroy()
// }, 2000)
setTimeout(() => {
createMainWindow()
loadWindow.destroy()
}, 2000)
}
function initWindow (loadingURL) {
if (require('@config').UseStartupChart) {
if (config.UseStartupChart) {
return loadindWindow(loadingURL)
} else {
return createMainWindow()
......