Merge pull request #24 from musnow/dev

Dev

Author: sendya

.prettierrc

@@ -0,0 +1,5 @@
+{
+  "printWidth": 120,
+  "semi": false,
+  "singleQuote": true
+}

package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@antv/data-set": "^0.10.1",
-    "ant-design-vue": "^1.1.10-beta",
+    "ant-design-vue": "^1.1.10",
     "axios": "^0.18.0",
     "dayjs": "^1.7.5",
     "enquire.js": "^2.1.6",

src/permission.js

@@ -5,11 +5,11 @@ import store from './store'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
 import notification from 'ant-design-vue/es/notification'
-import { ACCESS_TOKEN } from "@/store/mutation-types"
+import { ACCESS_TOKEN } from '@/store/mutation-types'
 
-NProgress.configure({ showSpinner: false })// NProgress Configuration
+NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
-const whiteList = ['/user/login', '/user/register', '/user/register-result']// no redirect whitelist
+const whiteList = ['/user/login', '/user/register', '/user/register-result'] // no redirect whitelist
 
 router.beforeEach((to, from, next) => {
   NProgress.start() // start progress bar
@@ -21,35 +21,48 @@ router.beforeEach((to, from, next) => {
       NProgress.done()
     } else {
       if (store.getters.roles.length === 0) {
-        store.dispatch('GetInfo').then(res => {
-          const roles = res.result && res.result.role
-          store.dispatch('GenerateRoutes', { roles }).then(() => { // 根据roles权限生成可访问的路由表
-            router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
-            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+        store
+          .dispatch('GetInfo')
+          .then(res => {
+            const roles = res.result && res.result.role
+            store.dispatch('GenerateRoutes', { roles }).then(() => {
+              // 根据roles权限生成可访问的路由表
+              // 动态添加可访问路由表
+              router.addRoutes(store.getters.addRouters)
+              const redirect = decodeURIComponent(from.query.redirect || to.path)
+              if (to.path === redirect) {
+                // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+                next({ ...to, replace: true })
+              } else {
+                // 跳转到目的路由
+                next({ path: redirect })
+              }
+            })
           })
-        }).catch(() => {
-          notification.error({ message: '错误', description: '请求用户信息失败，请重试' })
-          store.dispatch('Logout').then(() => {
-            next({ path: '/user/login' })
+          .catch(() => {
+            notification.error({
+              message: '错误',
+              description: '请求用户信息失败，请重试'
+            })
+            store.dispatch('Logout').then(() => {
+              next({ path: '/user/login', query: { redirect: to.fullPath } })
+            })
           })
-        })
-
       } else {
         next()
       }
     }
   } else {
-    if (whiteList.indexOf(to.path) !== -1) { // 在免登录白名单，直接进入
+    if (whiteList.indexOf(to.path) !== -1) {
+      // 在免登录白名单，直接进入
       next()
     } else {
-      next('/user/login')
+      next({ path: '/user/login', query: { redirect: to.fullPath } })
       NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it
     }
-
   }
-
 })
 
 router.afterEach(() => {
   NProgress.done() // finish progress bar
-})
+})

src/utils/request.js

@@ -13,20 +13,26 @@ const service = axios.create({
 
 const err = (error) => {
   if (error.response) {
-    if (error.status === 403) {
-      notification.error({ message: '拒绝访问', description: '无权限，拒绝访问' })
+    let data = error.response.data
+    const token = Vue.ls.get(ACCESS_TOKEN)
+    if (error.response.status === 403) {
+      notification.error({ message: 'Forbidden', description: data.message})
     }
-    if (error.status === 401) {
-      notification.error({ message: '未授权', description: '授权验证失败' })
-      store.dispatch('Logout').then(() => {
-        location.reload()
-      })
+    if (error.response.status === 401) {
+      notification.error({ message: 'Unauthorized', description: 'Authorization verification failed' })
+      if (token) {
+        store.dispatch('Logout').then(() => {
+          setTimeout(() => {
+            window.location.reload()
+          }, 1500)
+        })
+      }
     }
   }
   return Promise.reject(error)
 };
 
-// request 拦截器
+// request interceptor
 service.interceptors.request.use(config => {
   const token = Vue.ls.get(ACCESS_TOKEN)
   if (token) {
@@ -35,7 +41,7 @@ service.interceptors.request.use(config => {
   return config
 }, err)
 
-// response 拦截器
+// response interceptor
 service.interceptors.response.use((response) => {
     return response.data
   }, err)

src/views/form/BasicForm.vue

@@ -6,10 +6,10 @@
         :labelCol="{lg: {span: 7}, sm: {span: 7}}"
         :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
         <a-input
-          v-decorator="{
-            id: 'name',
-            options: {rules: [{ required: true, message: '请输入标题' }]}
-          }"
+          v-decorator="[
+            'name',
+            {rules: [{ required: true, message: '请输入标题' }]}
+          ]"
           name="name"
           placeholder="给目标起个名字" />
       </a-form-item>
@@ -20,45 +20,45 @@
         <a-range-picker
           name="buildTime"
           style="width: 100%"
-          v-decorator="{
-            id: 'buildTime',
-            options: {rules: [{ required: true, message: '请选择起止日期' }]}
-          }" />
+          v-decorator="[
+            'buildTime',
+            {rules: [{ required: true, message: '请选择起止日期' }]}
+          ]" />
       </a-form-item>
       <a-form-item
         label="目标描述"
         :labelCol="{lg: {span: 7}, sm: {span: 7}}"
         :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
         <a-textarea
-          v-decorator="{
-            id: 'description',
-            options: {rules: [{ required: true, message: '请输入目标描述' }]}
-          }"
           rows="4"
-          placeholder="请输入你阶段性工作目标" />
+          placeholder="请输入你阶段性工作目标"
+          v-decorator="[
+            'description',
+            {rules: [{ required: true, message: '请输入目标描述' }]}
+          ]" />
       </a-form-item>
       <a-form-item
         label="衡量标准"
         :labelCol="{lg: {span: 7}, sm: {span: 7}}"
         :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
         <a-textarea
-          v-decorator="{
-            id: 'type',
-            options: {rules: [{ required: true, message: '请输入衡量标准' }]}
-          }"
           rows="4"
-          placeholder="请输入衡量标准" />
+          placeholder="请输入衡量标准"
+          v-decorator="[
+            'type',
+            {rules: [{ required: true, message: '请输入衡量标准' }]}
+          ]" />
       </a-form-item>
       <a-form-item
         label="客户"
         :labelCol="{lg: {span: 7}, sm: {span: 7}}"
         :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
         <a-input 
           placeholder="请描述你服务的客户，内部客户直接 @姓名／工号"
-          v-decorator="{
-            id: 'customer',
-            options: {rules: [{ required: true, message: '请描述你服务的客户' }]}
-          }" />
+          v-decorator="[
+            'customer',
+            {rules: [{ required: true, message: '请描述你服务的客户' }]}
+          ]" />
       </a-form-item>
       <a-form-item
         label="邀评人"

src/views/form/advancedForm/AdvancedForm.vue

@@ -38,7 +38,7 @@
               <span v-else>
                 <a @click="saveRow(record.key)">保存</a>
                 <a-divider type="vertical" />
-                <a @click="cancle(record.key)">取消</a>
+                <a @click="cancel(record.key)">取消</a>
               </span>
             </template>
             <span v-else>
@@ -50,7 +50,7 @@
             </span>
           </template>
         </a-table>
-        <a-button style="width: 100%; margin-top: 16px; margin-bottom: 8px" type="dashed" icon="plus" @click="newMeber">新增成员</a-button>
+        <a-button style="width: 100%; margin-top: 16px; margin-bottom: 8px" type="dashed" icon="plus" @click="newMember">新增成员</a-button>
       </form>
     </a-card>
 
@@ -136,7 +136,7 @@
       handleSubmit (e) {
         e.preventDefault()
       },
-      newMeber () {
+      newMember () {
         this.data.push({
           key: '-1',
           name: '',
@@ -163,7 +163,7 @@
         const data = this.data
         return (newData || data).filter(item => item.key === key)[0]
       },
-      cancle (key) {
+      cancel (key) {
         let target = this.data.filter(item => item.key === key)[0]
         target.editable = false
       },