张恒

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

...@@ -5025,9 +5025,9 @@ ...@@ -5025,9 +5025,9 @@
5025 } 5025 }
5026 }, 5026 },
5027 "electron": { 5027 "electron": {
5028 - "version": "8.2.3", 5028 + "version": "8.2.4",
5029 - "resolved": "https://registry.npm.taobao.org/electron/download/electron-8.2.3.tgz", 5029 + "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",
5030 - "integrity": "sha1-t9akO9nzokKMZg3NBVogA0Ug4eo=", 5030 + "integrity": "sha1-xOUcqOhLWlvqqr2uECS9UrpIe6Q=",
5031 "dev": true, 5031 "dev": true,
5032 "requires": { 5032 "requires": {
5033 "@electron/get": "^1.0.1", 5033 "@electron/get": "^1.0.1",
...@@ -7846,7 +7846,7 @@ ...@@ -7846,7 +7846,7 @@
7846 }, 7846 },
7847 "semver": { 7847 "semver": {
7848 "version": "5.7.1", 7848 "version": "5.7.1",
7849 - "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", 7849 + "resolved": "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz",
7850 "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=", 7850 "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
7851 "dev": true 7851 "dev": true
7852 } 7852 }
...@@ -9700,7 +9700,7 @@ ...@@ -9700,7 +9700,7 @@
9700 }, 9700 },
9701 "matcher": { 9701 "matcher": {
9702 "version": "2.1.0", 9702 "version": "2.1.0",
9703 - "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", 9703 + "resolved": "https://registry.npm.taobao.org/matcher/download/matcher-2.1.0.tgz",
9704 "integrity": "sha1-ZOEEHBW5k+I7eG+TMgp0dL+DPCg=", 9704 "integrity": "sha1-ZOEEHBW5k+I7eG+TMgp0dL+DPCg=",
9705 "dev": true, 9705 "dev": true,
9706 "optional": true, 9706 "optional": true,
...@@ -9710,7 +9710,7 @@ ...@@ -9710,7 +9710,7 @@
9710 "dependencies": { 9710 "dependencies": {
9711 "escape-string-regexp": { 9711 "escape-string-regexp": {
9712 "version": "2.0.0", 9712 "version": "2.0.0",
9713 - "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", 9713 + "resolved": "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-2.0.0.tgz",
9714 "integrity": "sha1-owME6Z2qMuI7L9IPUbq9B8/8o0Q=", 9714 "integrity": "sha1-owME6Z2qMuI7L9IPUbq9B8/8o0Q=",
9715 "dev": true, 9715 "dev": true,
9716 "optional": true 9716 "optional": true
...@@ -11241,9 +11241,9 @@ ...@@ -11241,9 +11241,9 @@
11241 } 11241 }
11242 }, 11242 },
11243 "portfinder": { 11243 "portfinder": {
11244 - "version": "1.0.25", 11244 + "version": "1.0.26",
11245 - "resolved": "https://registry.npm.taobao.org/portfinder/download/portfinder-1.0.25.tgz", 11245 + "resolved": "https://registry.npm.taobao.org/portfinder/download/portfinder-1.0.26.tgz",
11246 - "integrity": "sha1-JU/TN/+6hp9LnTftwpgFnLTTXso=", 11246 + "integrity": "sha1-R1ZY1WyjC+1yrH8TeO01C9G2TnA=",
11247 "dev": true, 11247 "dev": true,
11248 "requires": { 11248 "requires": {
11249 "async": "^2.6.2", 11249 "async": "^2.6.2",
...@@ -11402,7 +11402,7 @@ ...@@ -11402,7 +11402,7 @@
11402 }, 11402 },
11403 "posthtml": { 11403 "posthtml": {
11404 "version": "0.9.2", 11404 "version": "0.9.2",
11405 - "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", 11405 + "resolved": "https://registry.npm.taobao.org/posthtml/download/posthtml-0.9.2.tgz",
11406 "integrity": "sha1-9MBtufZ7Yf0XxOJW5+PZUVv3Jv0=", 11406 "integrity": "sha1-9MBtufZ7Yf0XxOJW5+PZUVv3Jv0=",
11407 "dev": true, 11407 "dev": true,
11408 "requires": { 11408 "requires": {
...@@ -13601,9 +13601,9 @@ ...@@ -13601,9 +13601,9 @@
13601 "dev": true 13601 "dev": true
13602 }, 13602 },
13603 "style-loader": { 13603 "style-loader": {
13604 - "version": "1.2.0", 13604 + "version": "1.2.1",
13605 - "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", 13605 + "resolved": "https://registry.npm.taobao.org/style-loader/download/style-loader-1.2.1.tgz",
13606 - "integrity": "sha1-945NScr1AY98A64YhuEnAST+6wo=", 13606 + "integrity": "sha1-xcu/vxFw0HbP3YbgEJxbuhFLqho=",
13607 "dev": true, 13607 "dev": true,
13608 "requires": { 13608 "requires": {
13609 "loader-utils": "^2.0.0", 13609 "loader-utils": "^2.0.0",
...@@ -13813,9 +13813,9 @@ ...@@ -13813,9 +13813,9 @@
13813 } 13813 }
13814 }, 13814 },
13815 "svg-baker-runtime": { 13815 "svg-baker-runtime": {
13816 - "version": "1.4.6", 13816 + "version": "1.4.7",
13817 - "resolved": "https://registry.npm.taobao.org/svg-baker-runtime/download/svg-baker-runtime-1.4.6.tgz", 13817 + "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",
13818 - "integrity": "sha1-c0mXNsY2YQEhqeF65s6y6hAj7Gs=", 13818 + "integrity": "sha1-9HIGN/W2IC7vY3jYHx/q0IFfik4=",
13819 "dev": true, 13819 "dev": true,
13820 "requires": { 13820 "requires": {
13821 "deepmerge": "1.3.2", 13821 "deepmerge": "1.3.2",
...@@ -13832,9 +13832,9 @@ ...@@ -13832,9 +13832,9 @@
13832 } 13832 }
13833 }, 13833 },
13834 "svg-sprite-loader": { 13834 "svg-sprite-loader": {
13835 - "version": "4.2.6", 13835 + "version": "4.2.7",
13836 - "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", 13836 + "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",
13837 - "integrity": "sha1-n1rG1114voB1iWarxCEKKF7bIHM=", 13837 + "integrity": "sha1-IwQwm0Y2ijTnsnFpNmTZJ2HYuU4=",
13838 "dev": true, 13838 "dev": true,
13839 "requires": { 13839 "requires": {
13840 "bluebird": "^3.5.0", 13840 "bluebird": "^3.5.0",
...@@ -13844,7 +13844,7 @@ ...@@ -13844,7 +13844,7 @@
13844 "html-webpack-plugin": "^3.2.0", 13844 "html-webpack-plugin": "^3.2.0",
13845 "loader-utils": "^1.1.0", 13845 "loader-utils": "^1.1.0",
13846 "svg-baker": "^1.5.0", 13846 "svg-baker": "^1.5.0",
13847 - "svg-baker-runtime": "^1.4.6", 13847 + "svg-baker-runtime": "^1.4.7",
13848 "url-slug": "2.0.0" 13848 "url-slug": "2.0.0"
13849 }, 13849 },
13850 "dependencies": { 13850 "dependencies": {
......
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
118 "cross-env": "^7.0.2", 118 "cross-env": "^7.0.2",
119 "css-loader": "^3.5.3", 119 "css-loader": "^3.5.3",
120 "del": "^5.1.0", 120 "del": "^5.1.0",
121 - "electron": "^8.2.3", 121 + "electron": "^8.2.4",
122 "electron-builder": "^22.5.1", 122 "electron-builder": "^22.5.1",
123 "electron-devtools-installer": "^3.0.0", 123 "electron-devtools-installer": "^3.0.0",
124 "eslint": "^6.8.0", 124 "eslint": "^6.8.0",
...@@ -138,11 +138,11 @@ ...@@ -138,11 +138,11 @@
138 "multispinner": "^0.2.1", 138 "multispinner": "^0.2.1",
139 "node-loader": "^0.6.0", 139 "node-loader": "^0.6.0",
140 "node-sass": "^4.14.0", 140 "node-sass": "^4.14.0",
141 - "portfinder": "^1.0.25", 141 + "portfinder": "^1.0.26",
142 "sass-loader": "^8.0.2", 142 "sass-loader": "^8.0.2",
143 "split2": "^3.1.1", 143 "split2": "^3.1.1",
144 - "style-loader": "^1.2.0", 144 + "style-loader": "^1.2.1",
145 - "svg-sprite-loader": "^4.2.6", 145 + "svg-sprite-loader": "^4.2.7",
146 "terser-webpack-plugin": "^2.3.6", 146 "terser-webpack-plugin": "^2.3.6",
147 "through2-filter": "^3.0.0", 147 "through2-filter": "^3.0.0",
148 "url-loader": "^4.1.0", 148 "url-loader": "^4.1.0",
......
...@@ -63,11 +63,12 @@ export default { ...@@ -63,11 +63,12 @@ export default {
63 webSecurity: false, 63 webSecurity: false,
64 // 如果是开发模式可以使用devTools 64 // 如果是开发模式可以使用devTools
65 devTools: process.env.NODE_ENV === 'development', 65 devTools: process.env.NODE_ENV === 'development',
66 + // devTools: true,
66 // 在macos中启用橡皮动画 67 // 在macos中启用橡皮动画
67 scrollBounce: process.platform === 'darwin' 68 scrollBounce: process.platform === 'darwin'
68 } 69 }
69 }) 70 })
70 - ChildWin.loadURL(winURL + `/#${arg.url}`) 71 + ChildWin.loadURL(winURL + `#${arg.url}`)
71 ChildWin.webContents.once('dom-ready', () => { 72 ChildWin.webContents.once('dom-ready', () => {
72 ChildWin.show() 73 ChildWin.show()
73 ChildWin.webContents.send('send-data', arg.sendData) 74 ChildWin.webContents.send('send-data', arg.sendData)
......
1 -/* eslint-disable no-tabs */
2 import router from './router' 1 import router from './router'
3 import store from './store' 2 import store from './store'
4 -import { Message } from 'element-ui'
5 3
6 const whiteList = ['/login'] // 不重定向白名单 4 const whiteList = ['/login'] // 不重定向白名单
7 router.beforeEach((to, from, next) => { 5 router.beforeEach((to, from, next) => {
...@@ -9,18 +7,7 @@ router.beforeEach((to, from, next) => { ...@@ -9,18 +7,7 @@ router.beforeEach((to, from, next) => {
9 if (to.path === '/login') { 7 if (to.path === '/login') {
10 next({ path: '/' }) 8 next({ path: '/' })
11 } else { 9 } else {
12 - if (store.getters.roles.length === 0) { 10 + next()
13 - store.dispatch('GetInfo').then(res => { // 拉取用户信息
14 - next()
15 - }).catch((err) => {
16 - store.dispatch('FedLogOut').then(() => {
17 - Message.error(err || 'Verification failed, please login again')
18 - next({ path: '/' })
19 - })
20 - })
21 - } else {
22 - next()
23 - }
24 } 11 }
25 } else { 12 } else {
26 if (whiteList.indexOf(to.path) !== -1) { 13 if (whiteList.indexOf(to.path) !== -1) {
...@@ -31,4 +18,4 @@ router.beforeEach((to, from, next) => { ...@@ -31,4 +18,4 @@ router.beforeEach((to, from, next) => {
31 } 18 }
32 }) 19 })
33 20
34 -router.afterEach(() => {}) 21 +router.afterEach(() => { })
......
1 -/* eslint-disable prefer-promise-reject-errors */
2 -// import { login, logout, getInfo } from '@/api/login'
3 -import { getToken, setToken, removeToken } from '@/utils/auth'
4 -
5 const user = { 1 const user = {
6 state: { 2 state: {
7 - token: getToken(), 3 + token: JSON.parse(localStorage.getItem('token')),
8 - name: '', 4 + name: JSON.parse(localStorage.getItem('name')),
9 - avatar: '', 5 + roles: JSON.parse(localStorage.getItem('roles'))
10 - roles: []
11 }, 6 },
12 7
13 mutations: { 8 mutations: {
14 SET_TOKEN: (state, token) => { 9 SET_TOKEN: (state, token) => {
10 + localStorage.setItem('token', JSON.stringify(token))
15 state.token = token 11 state.token = token
16 }, 12 },
17 SET_NAME: (state, name) => { 13 SET_NAME: (state, name) => {
14 + localStorage.setItem('name', JSON.stringify(name))
18 state.name = name 15 state.name = name
19 }, 16 },
20 - SET_AVATAR: (state, avatar) => {
21 - state.avatar = avatar
22 - },
23 SET_ROLES: (state, roles) => { 17 SET_ROLES: (state, roles) => {
18 + localStorage.setItem('roles', JSON.stringify(roles))
24 state.roles = roles 19 state.roles = roles
25 } 20 }
26 }, 21 },
27 22
28 actions: { 23 actions: {
29 // 登录 24 // 登录
30 - Login ({ commit }, userInfo) { 25 + Login ({ commit }, data) {
31 return new Promise((resolve, reject) => { 26 return new Promise((resolve, reject) => {
32 - // login(data).then(response => { 27 + console.log('这是传过来的登录信息', data)
33 - // const data = response.data
34 - // setToken(data.token)
35 - // commit('SET_TOKEN', data.token)
36 - // resolve()
37 - // }).catch(error => {
38 - // reject(error)
39 - // })
40 - setToken('admin')
41 commit('SET_TOKEN', 'admin') 28 commit('SET_TOKEN', 'admin')
42 - resolve()
43 - })
44 - },
45 -
46 - // 获取用户信息
47 - GetInfo ({ commit, state }) {
48 - return new Promise((resolve, reject) => {
49 - // getInfo(state.token).then(response => {
50 - // const data = response.data
51 - // if (data.roles && data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
52 - // commit('SET_ROLES', data.roles)
53 - // } else {
54 - // reject('getInfo: roles must be a non-null array !')
55 - // }
56 - // commit('SET_NAME', data.name)
57 - // commit('SET_AVATAR', data.avatar)
58 - // resolve(response)
59 - // }).catch(error => {
60 - // reject(error)
61 - // })
62 commit('SET_ROLES', ['admin']) 29 commit('SET_ROLES', ['admin'])
63 commit('SET_NAME', 'Super Admin') 30 commit('SET_NAME', 'Super Admin')
64 - commit('SET_AVATAR', 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif')
65 resolve() 31 resolve()
66 }) 32 })
67 }, 33 },
...@@ -69,21 +35,15 @@ const user = { ...@@ -69,21 +35,15 @@ const user = {
69 // 登出 35 // 登出
70 LogOut ({ commit, state }) { 36 LogOut ({ commit, state }) {
71 return new Promise((resolve, reject) => { 37 return new Promise((resolve, reject) => {
72 - // logout(state.token).then(() => {
73 commit('SET_TOKEN', '') 38 commit('SET_TOKEN', '')
74 commit('SET_ROLES', []) 39 commit('SET_ROLES', [])
75 - removeToken()
76 resolve() 40 resolve()
77 - // }).catch(error => {
78 - // reject(error)
79 - // })
80 }) 41 })
81 }, 42 },
82 43
83 // 前端 登出 44 // 前端 登出
84 FedLogOut ({ commit }) { 45 FedLogOut ({ commit }) {
85 return new Promise(resolve => { 46 return new Promise(resolve => {
86 - removeToken()
87 commit('SET_TOKEN', '') 47 commit('SET_TOKEN', '')
88 resolve() 48 resolve()
89 }) 49 })
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
3 */ 3 */
4 4
5 export function isvalidUsername (str) { 5 export function isvalidUsername (str) {
6 - const valid_map = ['admin', 'editor'] 6 + const validMap = ['admin', 'editor']
7 - return valid_map.indexOf(str.trim()) >= 0 7 + return validMap.indexOf(str.trim()) >= 0
8 } 8 }
9 9
10 /* 合法uri */ 10 /* 合法uri */
......