张恒

修正打包之后多窗口白屏的问题

......@@ -5025,9 +5025,9 @@
}
},
"electron": {
"version": "8.2.3",
"resolved": "https://registry.npm.taobao.org/electron/download/electron-8.2.3.tgz",
"integrity": "sha1-t9akO9nzokKMZg3NBVogA0Ug4eo=",
"version": "8.2.4",
"resolved": "https://registry.npm.taobao.org/electron/download/electron-8.2.4.tgz?cache=0&sync_timestamp=1588061230383&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron%2Fdownload%2Felectron-8.2.4.tgz",
"integrity": "sha1-xOUcqOhLWlvqqr2uECS9UrpIe6Q=",
"dev": true,
"requires": {
"@electron/get": "^1.0.1",
......@@ -7846,7 +7846,7 @@
},
"semver": {
"version": "5.7.1",
"resolved": "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz?cache=0&sync_timestamp=1586534511518&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-5.7.1.tgz",
"resolved": "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz",
"integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
"dev": true
}
......@@ -9700,7 +9700,7 @@
},
"matcher": {
"version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/matcher/download/matcher-2.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmatcher%2Fdownload%2Fmatcher-2.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/matcher/download/matcher-2.1.0.tgz",
"integrity": "sha1-ZOEEHBW5k+I7eG+TMgp0dL+DPCg=",
"dev": true,
"optional": true,
......@@ -9710,7 +9710,7 @@
"dependencies": {
"escape-string-regexp": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-2.0.0.tgz?cache=0&sync_timestamp=1586278520081&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fescape-string-regexp%2Fdownload%2Fescape-string-regexp-2.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-2.0.0.tgz",
"integrity": "sha1-owME6Z2qMuI7L9IPUbq9B8/8o0Q=",
"dev": true,
"optional": true
......@@ -11241,9 +11241,9 @@
}
},
"portfinder": {
"version": "1.0.25",
"resolved": "https://registry.npm.taobao.org/portfinder/download/portfinder-1.0.25.tgz",
"integrity": "sha1-JU/TN/+6hp9LnTftwpgFnLTTXso=",
"version": "1.0.26",
"resolved": "https://registry.npm.taobao.org/portfinder/download/portfinder-1.0.26.tgz",
"integrity": "sha1-R1ZY1WyjC+1yrH8TeO01C9G2TnA=",
"dev": true,
"requires": {
"async": "^2.6.2",
......@@ -11402,7 +11402,7 @@
},
"posthtml": {
"version": "0.9.2",
"resolved": "https://registry.npm.taobao.org/posthtml/download/posthtml-0.9.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fposthtml%2Fdownload%2Fposthtml-0.9.2.tgz",
"resolved": "https://registry.npm.taobao.org/posthtml/download/posthtml-0.9.2.tgz",
"integrity": "sha1-9MBtufZ7Yf0XxOJW5+PZUVv3Jv0=",
"dev": true,
"requires": {
......@@ -13601,9 +13601,9 @@
"dev": true
},
"style-loader": {
"version": "1.2.0",
"resolved": "https://registry.npm.taobao.org/style-loader/download/style-loader-1.2.0.tgz?cache=0&sync_timestamp=1587731556074&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstyle-loader%2Fdownload%2Fstyle-loader-1.2.0.tgz",
"integrity": "sha1-945NScr1AY98A64YhuEnAST+6wo=",
"version": "1.2.1",
"resolved": "https://registry.npm.taobao.org/style-loader/download/style-loader-1.2.1.tgz",
"integrity": "sha1-xcu/vxFw0HbP3YbgEJxbuhFLqho=",
"dev": true,
"requires": {
"loader-utils": "^2.0.0",
......@@ -13813,9 +13813,9 @@
}
},
"svg-baker-runtime": {
"version": "1.4.6",
"resolved": "https://registry.npm.taobao.org/svg-baker-runtime/download/svg-baker-runtime-1.4.6.tgz",
"integrity": "sha1-c0mXNsY2YQEhqeF65s6y6hAj7Gs=",
"version": "1.4.7",
"resolved": "https://registry.npm.taobao.org/svg-baker-runtime/download/svg-baker-runtime-1.4.7.tgz?cache=0&sync_timestamp=1588076122804&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsvg-baker-runtime%2Fdownload%2Fsvg-baker-runtime-1.4.7.tgz",
"integrity": "sha1-9HIGN/W2IC7vY3jYHx/q0IFfik4=",
"dev": true,
"requires": {
"deepmerge": "1.3.2",
......@@ -13832,9 +13832,9 @@
}
},
"svg-sprite-loader": {
"version": "4.2.6",
"resolved": "https://registry.npm.taobao.org/svg-sprite-loader/download/svg-sprite-loader-4.2.6.tgz?cache=0&sync_timestamp=1587916768179&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsvg-sprite-loader%2Fdownload%2Fsvg-sprite-loader-4.2.6.tgz",
"integrity": "sha1-n1rG1114voB1iWarxCEKKF7bIHM=",
"version": "4.2.7",
"resolved": "https://registry.npm.taobao.org/svg-sprite-loader/download/svg-sprite-loader-4.2.7.tgz?cache=0&sync_timestamp=1588076872686&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsvg-sprite-loader%2Fdownload%2Fsvg-sprite-loader-4.2.7.tgz",
"integrity": "sha1-IwQwm0Y2ijTnsnFpNmTZJ2HYuU4=",
"dev": true,
"requires": {
"bluebird": "^3.5.0",
......@@ -13844,7 +13844,7 @@
"html-webpack-plugin": "^3.2.0",
"loader-utils": "^1.1.0",
"svg-baker": "^1.5.0",
"svg-baker-runtime": "^1.4.6",
"svg-baker-runtime": "^1.4.7",
"url-slug": "2.0.0"
},
"dependencies": {
......
......@@ -118,7 +118,7 @@
"cross-env": "^7.0.2",
"css-loader": "^3.5.3",
"del": "^5.1.0",
"electron": "^8.2.3",
"electron": "^8.2.4",
"electron-builder": "^22.5.1",
"electron-devtools-installer": "^3.0.0",
"eslint": "^6.8.0",
......@@ -138,11 +138,11 @@
"multispinner": "^0.2.1",
"node-loader": "^0.6.0",
"node-sass": "^4.14.0",
"portfinder": "^1.0.25",
"portfinder": "^1.0.26",
"sass-loader": "^8.0.2",
"split2": "^3.1.1",
"style-loader": "^1.2.0",
"svg-sprite-loader": "^4.2.6",
"style-loader": "^1.2.1",
"svg-sprite-loader": "^4.2.7",
"terser-webpack-plugin": "^2.3.6",
"through2-filter": "^3.0.0",
"url-loader": "^4.1.0",
......
......@@ -63,11 +63,12 @@ export default {
webSecurity: false,
// 如果是开发模式可以使用devTools
devTools: process.env.NODE_ENV === 'development',
// devTools: true,
// 在macos中启用橡皮动画
scrollBounce: process.platform === 'darwin'
}
})
ChildWin.loadURL(winURL + `/#${arg.url}`)
ChildWin.loadURL(winURL + `#${arg.url}`)
ChildWin.webContents.once('dom-ready', () => {
ChildWin.show()
ChildWin.webContents.send('send-data', arg.sendData)
......
/* eslint-disable no-tabs */
import router from './router'
import store from './store'
import { Message } from 'element-ui'
const whiteList = ['/login'] // 不重定向白名单
router.beforeEach((to, from, next) => {
......@@ -9,18 +7,7 @@ router.beforeEach((to, from, next) => {
if (to.path === '/login') {
next({ path: '/' })
} else {
if (store.getters.roles.length === 0) {
store.dispatch('GetInfo').then(res => { // 拉取用户信息
next()
}).catch((err) => {
store.dispatch('FedLogOut').then(() => {
Message.error(err || 'Verification failed, please login again')
next({ path: '/' })
})
})
} else {
next()
}
next()
}
} else {
if (whiteList.indexOf(to.path) !== -1) {
......@@ -31,4 +18,4 @@ router.beforeEach((to, from, next) => {
}
})
router.afterEach(() => {})
router.afterEach(() => { })
......
/* eslint-disable prefer-promise-reject-errors */
// import { login, logout, getInfo } from '@/api/login'
import { getToken, setToken, removeToken } from '@/utils/auth'
const user = {
state: {
token: getToken(),
name: '',
avatar: '',
roles: []
token: JSON.parse(localStorage.getItem('token')),
name: JSON.parse(localStorage.getItem('name')),
roles: JSON.parse(localStorage.getItem('roles'))
},
mutations: {
SET_TOKEN: (state, token) => {
localStorage.setItem('token', JSON.stringify(token))
state.token = token
},
SET_NAME: (state, name) => {
localStorage.setItem('name', JSON.stringify(name))
state.name = name
},
SET_AVATAR: (state, avatar) => {
state.avatar = avatar
},
SET_ROLES: (state, roles) => {
localStorage.setItem('roles', JSON.stringify(roles))
state.roles = roles
}
},
actions: {
// 登录
Login ({ commit }, userInfo) {
Login ({ commit }, data) {
return new Promise((resolve, reject) => {
// login(data).then(response => {
// const data = response.data
// setToken(data.token)
// commit('SET_TOKEN', data.token)
// resolve()
// }).catch(error => {
// reject(error)
// })
setToken('admin')
console.log('这是传过来的登录信息', data)
commit('SET_TOKEN', 'admin')
resolve()
})
},
// 获取用户信息
GetInfo ({ commit, state }) {
return new Promise((resolve, reject) => {
// getInfo(state.token).then(response => {
// const data = response.data
// if (data.roles && data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
// commit('SET_ROLES', data.roles)
// } else {
// reject('getInfo: roles must be a non-null array !')
// }
// commit('SET_NAME', data.name)
// commit('SET_AVATAR', data.avatar)
// resolve(response)
// }).catch(error => {
// reject(error)
// })
commit('SET_ROLES', ['admin'])
commit('SET_NAME', 'Super Admin')
commit('SET_AVATAR', 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif')
resolve()
})
},
......@@ -69,21 +35,15 @@ const user = {
// 登出
LogOut ({ commit, state }) {
return new Promise((resolve, reject) => {
// logout(state.token).then(() => {
commit('SET_TOKEN', '')
commit('SET_ROLES', [])
removeToken()
resolve()
// }).catch(error => {
// reject(error)
// })
})
},
// 前端 登出
FedLogOut ({ commit }) {
return new Promise(resolve => {
removeToken()
commit('SET_TOKEN', '')
resolve()
})
......
......@@ -3,8 +3,8 @@
*/
export function isvalidUsername (str) {
const valid_map = ['admin', 'editor']
return valid_map.indexOf(str.trim()) >= 0
const validMap = ['admin', 'editor']
return validMap.indexOf(str.trim()) >= 0
}
/* 合法uri */
......