vue2-client 1.4.64 → 1.5.0

package/src/layouts/header/HeaderAvatar.vue

@@ -1,60 +1,61 @@
-<template>
-  <a-dropdown>
-    <div class="header-avatar" style="cursor: pointer">
-      <a-avatar class="avatar" size="small" shape="circle" :src="user.avatar"/>
-      <span class="name">{{ user.name }}</span>
-    </div>
-    <a-menu :class="['avatar-menu']" slot="overlay">
-      <a-menu-item>
-        <a-icon type="user" />
-        <span>个人中心</span>
-      </a-menu-item>
-      <a-menu-item>
-        <a-icon type="setting" />
-        <span>设置</span>
-      </a-menu-item>
-      <a-menu-divider />
-      <a-menu-item @click="logout">
-        <a-icon style="margin-right: 8px;" type="poweroff" />
-        <span>退出登录</span>
-      </a-menu-item>
-    </a-menu>
-  </a-dropdown>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import { logout } from '@vue2-client/services/user'
-
-export default {
-  name: 'HeaderAvatar',
-  computed: {
-    ...mapGetters('account', ['user'])
-  },
-  methods: {
-    logout () {
-      logout()
-      this.$router.push('/login')
-    }
-  }
-}
-</script>
-
-<style lang="less">
-  .header-avatar{
-    display: inline-flex;
-    .avatar, .name{
-      align-self: center;
-    }
-    .avatar{
-      margin-right: 8px;
-    }
-    .name{
-      font-weight: 500;
-    }
-  }
-  .avatar-menu{
-    width: 150px;
-  }
-
-</style>
+<template>
+  <a-dropdown>
+    <div class="header-avatar" style="cursor: pointer">
+      <a-avatar class="avatar" size="small" shape="circle" :src="user.avatar"/>
+      <span class="name">{{ user.name }}</span>
+    </div>
+    <a-menu :class="['avatar-menu']" slot="overlay">
+      <a-menu-item>
+        <a-icon type="user" />
+        <span>个人中心</span>
+      </a-menu-item>
+      <a-menu-item>
+        <a-icon type="setting" />
+        <span>设置</span>
+      </a-menu-item>
+      <a-menu-divider />
+      <a-menu-item @click="logout">
+        <a-icon style="margin-right: 8px;" type="poweroff" />
+        <span>退出登录</span>
+      </a-menu-item>
+    </a-menu>
+  </a-dropdown>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { logout } from '@vue2-client/services/user'
+
+export default {
+  name: 'HeaderAvatar',
+  computed: {
+    ...mapGetters('account', ['user'])
+  },
+  methods: {
+    logout () {
+      logout().finally(res => {
+        location.href = '/login'
+      })
+    }
+  }
+}
+</script>
+
+<style lang="less">
+  .header-avatar{
+    display: inline-flex;
+    .avatar, .name{
+      align-self: center;
+    }
+    .avatar{
+      margin-right: 8px;
+    }
+    .name{
+      font-weight: 500;
+    }
+  }
+  .avatar-menu{
+    width: 150px;
+  }
+
+</style>

package/src/pages/login/Login.vue

@@ -41,7 +41,7 @@
                   </a-input>
                 </a-form-item>
                 <a-form-item>
-                  <a-button :loading="logging" htmlType="submit" size="large" class="btn" type="primary">登录</a-button>
+                  <a-button :loading="loading" htmlType="submit" size="large" class="btn" type="primary">登录</a-button>
                 </a-form-item>
               </a-tab-pane>
             </a-tabs>
@@ -70,7 +70,7 @@ export default {
   components: { CommonLayout },
   data () {
     return {
-      logging: false,
+      loading: false,
       error: '',
       form: this.$form.createForm(this)
     }
@@ -84,22 +84,28 @@ export default {
       e.preventDefault()
       this.form.validateFields((err) => {
         if (!err) {
-          this.logging = true
+          this.loading = true
           const name = this.form.getFieldValue('name')
           const password = this.form.getFieldValue('password')
           switch (this.compatible) {
             case 'V3': {
-              login(name, password).then(this.afterLogin).finally(() => { this.logging = false })
+              login(name, password).then(this.afterLogin).catch(msg => {
+                this.error = msg
+                this.loading = false
+              })
               break
             }
             case 'OA' : {
-              loginStart(name, password).then(this.afterLoginOA).finally(() => { this.logging = false })
+              loginStart(name, password).then(this.afterLoginOA).catch(msg => {
+                this.error = msg
+                this.loading = false
+              })
               break
             }
             case 'V4' : {
               V4Login(name, password).then(this.afterLoginV4).catch(msg => {
                 this.error = msg
-                this.logging = false
+                this.loading = false
               })
               break
             }
@@ -108,12 +114,19 @@ export default {
       })
     },
     afterLoginOA (result) {
-      // 默认第一个是旧OA地址
-      result.functions[0].navigate = result.functions[0].link
-      result.functions[0].link = null
-      this.afterGeneral(result)
-      this.setAccessToken(result.password)
-      this.$router.push(this.homePage).catch(() => {})
+      try {
+        // 默认第一个是旧OA地址
+        result.functions[0].navigate = result.functions[0].link
+        result.functions[0].link = null
+        this.afterGeneral(result)
+        this.setAccessToken(result.password)
+        this.$router.push(this.homePage).catch(() => {
+        })
+      } catch (res) {
+        this.error = res
+      } finally {
+        this.loading = false
+      }
     },
     afterLoginV4 (res) {
       this.setV4AccessToken(res)
@@ -127,12 +140,15 @@ export default {
           this.$router.push(this.homePage).catch(() => {
           })
         }
+      }).catch(res => {
+        this.error = res
+      }).finally(() => {
+        this.loading = false
       })
     },
     afterLogin (res) {
       const name = this.form.getFieldValue('name')
       const password = this.form.getFieldValue('password')
-      this.logging = false
       const loginRes = res.states
       if (loginRes === '登录成功') {
         const encrypt = new JSEncrypt()
@@ -156,33 +172,32 @@ export default {
             } else {
               this.$router.push(this.homePage).catch(() => {})
             }
+          }).finally(() => {
+            this.loading = false
           })
+        }).catch(res => {
+          this.error = res
         })
       } else {
         this.error = loginRes
+        this.loading = false
       }
     },
     afterGeneral (result) {
-      try {
-        const user = Object.assign({
-          username: result.ename,
-          name: result.name,
-          avatar: 'https://gw.alipayobjects.com/zos/rmsportal/jZUIxmJycoymBprLOUbT.png',
-          address: '西安市',
-          position: positions[0]
-        }, result)
-        this.setUser(user)
-        this.setPermissions([{ id: 'queryForm', operation: ['add', 'edit'] }])
-        this.setRoles([{ id: 'admin', operation: ['add', 'edit', 'delete'] }])
-        loadRoutes(funcToRouter(user.functions))
-        // 每次重新登录时，清除indexedDB缓存
-        indexedDB.clear()
-        this.$message.success(timeFix().CN + `，${result.name} 欢迎回来`, 3)
-      } catch (msg) {
-        this.error = msg
-      } finally {
-        this.logging = false
-      }
+      const user = Object.assign({
+        username: result.ename,
+        name: result.name,
+        avatar: 'https://gw.alipayobjects.com/zos/rmsportal/jZUIxmJycoymBprLOUbT.png',
+        address: '西安市',
+        position: positions[0]
+      }, result)
+      this.setUser(user)
+      this.setPermissions([{ id: 'queryForm', operation: ['add', 'edit'] }])
+      this.setRoles([{ id: 'admin', operation: ['add', 'edit', 'delete'] }])
+      loadRoutes(funcToRouter(user.functions))
+      // 每次重新登录时，清除indexedDB缓存
+      indexedDB.clear()
+      this.$message.success(timeFix().CN + `，${result.name} 欢迎回来`, 3)
     },
     setAccessToken (data) {
       if (data) {

package/src/router/guards.js

@@ -2,6 +2,7 @@ import { hasAuthority } from '@vue2-client/utils/authority-utils'
 import { loginIgnore } from '@vue2-client/router/index'
 import { checkAuthorization } from '@vue2-client/utils/request'
 import NProgress from 'nprogress'
+import { logout } from '@vue2-client/services/user'
 
 NProgress.configure({ showSpinner: false })
 
@@ -27,12 +28,20 @@ const progressStart = (to, from, next) => {
  * @param options
  */
 const loginGuard = (to, from, next, options) => {
-  const { message } = options
+  const { store, message } = options
   if ((!loginIgnore.includes(to) || to.name === '404') && !checkAuthorization()) {
     message.warning('登录已失效，请重新登录')
     next({ path: '/login' })
   } else {
-    next()
+    const roles = store.getters['account/roles']
+    if (roles.length === 0 && to.path !== '/login') {
+      message.warning('登录已失效，请重新登录')
+      logout().finally(res => {
+        next({ path: '/login' })
+      })
+    } else {
+      next()
+    }
   }
 }
 

package/src/utils/indexedDB.js

@@ -1,146 +1,145 @@
-// indexDB 存储
-import { post } from '@vue2-client/services/api'
-
-export const indexedDB = {
-  db: undefined,
-  indexedDB: window.indexedDB || window.webkitindexedDB,
-  IDBKeyRange: window.IDBKeyRange || window.webkitIDBKeyRange, // 键范围
-  openDB: function (callback) {
-    // 建立或打开数据库，建立对象存储空间(ObjectStore)
-    const self = this
-    if (self.db) {
-      callback(self.db)
-    } else {
-      const version = 1
-      const request = self.indexedDB.open('view', version)
-
-      request.onerror = function (e) {
-        console.error('打开数据库失败:' + e.currentTarget.error.message)
-      }
-      request.onsuccess = function (e) {
-        self.db = e.target.result
-        callback(self.db)
-      }
-      request.onupgradeneeded = function (e) {
-        const db = e.target.result
-        if (!db.objectStoreNames.contains('metaCache')) {
-          // 没有该对象空间时创建该对象空间
-          db.createObjectStore('metaCache', {
-            keyPath: 'key'
-          })
-        }
-      }
-    }
-  },
-  deleteDB: function (dbname) {
-    // 删除数据库
-    const self = this
-    self.indexedDB.deleteDatabase(dbname)
-    console.log(dbname + '数据库已删除')
-  },
-  closeDB: function () {
-    const self = this
-    if (!self.db) {
-      self.db.close()
-    }
-    console.log('数据库已关闭')
-  },
-  add: function (key, data) {
-    const self = this
-    self.openDB((res) => {
-      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').add({
-        key: key,
-        data: data
-      })
-      request.onerror = function () {
-        self.update(data)
-      }
-      request.onsuccess = function () {
-        console.log('数据已存入到数据库')
-      }
-    })
-  },
-  update: function (key, data) {
-    const self = this
-    self.openDB((res) => {
-      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').put({
-        key: key,
-        data: data
-      })
-      request.onerror = function () {
-        console.error('数据更新失败')
-      }
-      request.onsuccess = function () {
-        console.log('数据已更新到数据库')
-      }
-    })
-  },
-  get: function (key, callback) {
-    const self = this
-    self.openDB((res) => {
-      // 根据存储空间的键找到对应数据
-      const store = res.transaction('metaCache', 'readwrite').objectStore('metaCache')
-      const request = store.get(key)
-      request.onerror = function () {
-        console.log('读取数据失败，键：' + key)
-      }
-      request.onsuccess = function (e) {
-        const result = e.target.result
-        if (typeof (callback) === 'function') {
-          callback(result.data)
-        }
-      }
-    })
-  },
-  getByWeb: function (key, url, params, callback) {
-    const self = this
-    self.openDB((res) => {
-      // 根据存储空间的键找到对应数据
-      const store = res.transaction('metaCache', 'readwrite').objectStore('metaCache')
-      const request = store.get(key)
-      request.onerror = function () {
-        console.log('读取数据失败，键：' + key)
-      }
-      request.onsuccess = function (e) {
-        const result = e.target.result
-        if (!result && url) {
-          post(url, params).then((res) => {
-            self.add(key, res)
-            callback(res)
-          })
-        } else {
-          callback(result.data)
-        }
-      }
-    })
-  },
-  delete: function (key) {
-    const self = this
-    self.openDB((res) => {
-      // 删除某一条记录
-      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').delete(key)
-
-      request.onerror = function () {
-        console.error('数据删除失败')
-      }
-      request.onsuccess = function (event) {
-        console.log('已删除存储空间' + 'metaCache' + '中' + key + '记录')
-      }
-    })
-  },
-  clear: function (callback) {
-    const self = this
-    self.openDB((res) => {
-      // 删除存储空间全部记录
-      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').clear()
-
-      request.onerror = function () {
-        console.error('数据删除失败')
-      }
-      request.onsuccess = function (event) {
-        console.log('已删除存储空间' + 'metaCache' + '中所有记录')
-        callback()
-      }
-    })
-  }
-}
+// indexDB 存储
+import { post } from '@vue2-client/services/api'
+
+export const indexedDB = {
+  db: undefined,
+  indexedDB: window.indexedDB || window.webkitindexedDB,
+  IDBKeyRange: window.IDBKeyRange || window.webkitIDBKeyRange, // 键范围
+  openDB: function (callback) {
+    // 建立或打开数据库，建立对象存储空间(ObjectStore)
+    const self = this
+    if (self.db) {
+      callback(self.db)
+    } else {
+      const version = 1
+      const request = self.indexedDB.open('view', version)
+
+      request.onerror = function (e) {
+        console.error('打开数据库失败:' + e.currentTarget.error.message)
+      }
+      request.onsuccess = function (e) {
+        self.db = e.target.result
+        callback(self.db)
+      }
+      request.onupgradeneeded = function (e) {
+        const db = e.target.result
+        if (!db.objectStoreNames.contains('metaCache')) {
+          // 没有该对象空间时创建该对象空间
+          db.createObjectStore('metaCache', {
+            keyPath: 'key'
+          })
+        }
+      }
+    }
+  },
+  deleteDB: function (dbname) {
+    // 删除数据库
+    const self = this
+    self.indexedDB.deleteDatabase(dbname)
+    console.log(dbname + '数据库已删除')
+  },
+  closeDB: function () {
+    const self = this
+    if (!self.db) {
+      self.db.close()
+    }
+    console.log('数据库已关闭')
+  },
+  add: function (key, data) {
+    const self = this
+    self.openDB((res) => {
+      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').add({
+        key: key,
+        data: data
+      })
+      request.onerror = function () {
+        self.update(data)
+      }
+      request.onsuccess = function () {
+        console.log('数据已存入到数据库')
+      }
+    })
+  },
+  update: function (key, data) {
+    const self = this
+    self.openDB((res) => {
+      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').put({
+        key: key,
+        data: data
+      })
+      request.onerror = function () {
+        console.error('数据更新失败')
+      }
+      request.onsuccess = function () {
+        console.log('数据已更新到数据库')
+      }
+    })
+  },
+  get: function (key, callback) {
+    const self = this
+    self.openDB((res) => {
+      // 根据存储空间的键找到对应数据
+      const store = res.transaction('metaCache', 'readwrite').objectStore('metaCache')
+      const request = store.get(key)
+      request.onerror = function () {
+        console.log('读取数据失败，键：' + key)
+      }
+      request.onsuccess = function (e) {
+        const result = e.target.result
+        if (typeof (callback) === 'function') {
+          callback(result.data)
+        }
+      }
+    })
+  },
+  getByWeb: function (key, url, params, callback) {
+    const self = this
+    self.openDB((res) => {
+      // 根据存储空间的键找到对应数据
+      const store = res.transaction('metaCache', 'readwrite').objectStore('metaCache')
+      const request = store.get(key)
+      request.onerror = function () {
+        console.log('读取数据失败，键：' + key)
+      }
+      request.onsuccess = function (e) {
+        const result = e.target.result
+        if (!result && url) {
+          post(url, params).then((res) => {
+            self.add(key, res)
+            callback(res)
+          })
+        } else {
+          callback(result.data)
+        }
+      }
+    })
+  },
+  delete: function (key) {
+    const self = this
+    self.openDB((res) => {
+      // 删除某一条记录
+      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').delete(key)
+
+      request.onerror = function () {
+        console.error('数据删除失败')
+      }
+      request.onsuccess = function (event) {
+        console.log('已删除存储空间' + 'metaCache' + '中' + key + '记录')
+      }
+    })
+  },
+  clear: function (callback) {
+    const self = this
+    self.openDB((res) => {
+      // 删除存储空间全部记录
+      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').clear()
+
+      request.onerror = function () {
+        console.error('数据删除失败')
+      }
+      request.onsuccess = function (event) {
+        console.log('已删除存储空间' + 'metaCache' + '中所有记录')
+      }
+    })
+  }
+}