imatrix-ui 2.8.97-dw-tmp4 → 2.8.97-dw-tmp5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.8.97-dw-tmp4",
+  "version": "2.8.97-dw-tmp5",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,
@@ -30,11 +30,13 @@
     "axios": "0.19.0",
     "babel-cli": "^6.26.0",
     "babel-eslint": "^10.0.1",
+    "babel-plugin-component": "^1.1.1",
     "chai": "4.2.0",
+    "compression-webpack-plugin": "2.0.0",
     "element-ui": "2.15.3",
     "eslint": "5.16.0",
     "eslint-plugin-vue": "5.2.2",
-    "node-sass": "4.12.0",
+    "node-sass": "4.14.0",
     "nprogress": "^0.2.0",
     "sass-loader": "^7.1.0",
     "sessionstorage": "^0.1.0",

package/src/i18n/i18n.js

@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import locale from 'element-ui/lib/locale'
+import locale from '@gcommon/gcommon-ui/lib/locale'
 import VueI18n from 'vue-i18n'
 import en from './langs/en'
 import cn from './langs/cn'

package/src/i18n/langs/cn.js

@@ -1,4 +1,4 @@
-import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
+import zhLocale from '@gcommon/gcommon-ui/lib/locale/lang/zh-CN'
 const cn = {
   imatrixUIPublicModel: {
     sure: '确定',

package/src/i18n/langs/en.js

@@ -1,4 +1,4 @@
-import enLocale from 'element-ui/lib/locale/lang/en'
+import enLocale from '@gcommon/gcommon-ui/lib/locale/lang/en'
 const en = {
   imatrixUIPublicModel: {
     sure: 'Sure',

package/src/permission.js

@@ -4,7 +4,7 @@ import { getToken, setToken } from './utils/auth' // 验权
 import store from './store'
 import router, { errorRouterMap } from './router'
 NProgress.configure({ showSpinner: false })// NProgress Configuration
-import { Message } from 'element-ui'
+import { Message } from '@gcommon/gcommon-ui'
 import Vue from 'vue'
 
 const whiteList = ['/login', '/update-password', '/forget-password', '/reset-password', '/redirect'] // 不重定向白名单

package/src/permission111.js

@@ -0,0 +1,105 @@
+import NProgress from 'nprogress' // Progress 进度条
+import 'nprogress/nprogress.css'// Progress 进度条样式
+import { getToken, setToken } from './utils/auth' // 验权
+import store from './store'
+import router, { errorRouterMap } from './router'
+NProgress.configure({ showSpinner: false })// NProgress Configuration
+import { Message } from 'element-ui'
+import Vue from 'vue'
+
+const whiteList = ['/login', '/update-password', '/forget-password', '/reset-password', '/redirect'] // 不重定向白名单
+router.beforeEach((to, from, next) => {
+  NProgress.start()
+  console.log('router.beforeEach-to=', to)
+  console.log('router.beforeEach-from=', from)
+  // console.log('router.beforeEach-to.path=', to.path)
+  let token = getToken()
+  // console.log('router.beforeEach-to.query.JWT=', to.query.JWT)
+  if (!token && to.query && to.query.JWT) {
+    token = to.query.JWT
+    if (token) {
+      // 微信小程序web-view直接访问路径时使用?将JWT传过来
+      setToken(token)
+    }
+  }
+  if (!token && to.query && to.query.jwt) {
+    token = to.query.jwt
+    if (token) {
+      // 微信小程序web-view直接访问路径时使用?将JWT传过来
+      setToken(token)
+    }
+  }
+  if (to.query && to.query._systemName_) {
+    // 表示需要设置浏览器页签名
+    document.title = to.query._systemName_
+  }
+  // console.log('router.beforeEach-getToken()=', token)
+  if ((['/update-password', '/forget-password', '/reset-password', '/redirect'].indexOf(to.path) === -1 || store.getters.whiteList.indexOf(to.path) !== -1) && token) {
+    if (to.path === '/login') {
+      next({ path: '/', query: to.query })
+      NProgress.done() // if current page is dashboard will not trigger	afterEach hook, so manually handle it
+    } else {
+      console.log('router.beforeEach-to.path!=login')
+      if (store.getters.name === '') {
+        // 表示刷新了页面（例如点击了一级菜单）后，会重新走该方法
+        console.log('router.beforeEach-store.getters.name === ""')
+        store.dispatch('isLoginTimeOut').then((result) => {
+          if (result === true) {
+            store.dispatch('clearToken').then(() => {
+              next({ path: '/', replace: true })
+              NProgress.done()
+            })
+          } else {
+            store.dispatch('getCurrentUser').then(user => {
+              console.log('router.beforeEach-getCurrentUser')
+              return store.dispatch('getCurrentUserPermissions', user.loginName)
+            }).then(permissions => {
+              console.log('router.beforeEach-getCurrentUserPermissions-result==')
+              return store.dispatch('generateRoutes', permissions)
+            }).then(() => {
+              console.log('iMatrix-router.beforeEach2-getPermissionMenus')
+              return store.dispatch('getPermissionMenus', Vue.prototype.currentSystem)
+            }).then(() => {
+              // 根据roles权限生成可访问的路由表
+              console.log('router.beforeEach-generateRoutes==to=', to, ',from=', from)
+              router.addRoutes(store.getters.protectedRouters) // 动态添加可访问路由表
+              // 404等错误路由一定要放到受权限保护的路由之后
+              router.addRoutes(errorRouterMap)
+              sessionStorage.setItem(new Date().getTime() + '-name=null-from~~toPath', from.path + '~~' + to.path)
+              console.log('router.beforeEach-generateRoutes==to.path=', to.path)
+              next({ ...to, replace: true })
+            }).catch((err) => {
+              store.dispatch('clearToken').then(() => {
+                Message.error(err || 'Verification failed, please login again')
+                next({ path: '/' })
+              })
+            })
+          }
+        }).catch((err) => {
+          store.dispatch('clearToken').then(() => {
+            Message.error(err || 'Verification failed, please login again')
+            next({ path: '/' })
+          })
+        })
+      } else {
+        sessionStorage.setItem(new Date().getTime() + '-name!==null-from~~toPath', from.path + '~~' + to.path)
+        console.log('router.beforeEach-store.getters.name ==', store.getters.name)
+        next()
+      }
+    }
+  } else {
+    if (whiteList.indexOf(to.path) !== -1 || store.getters.whiteList.indexOf(to.path) !== -1) {
+      next()
+    } else {
+      // 必须使用to.fullPath，fullPath是带有参数的，to.path没有参数，会导致跳转到的页面参数丢失
+      next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+      NProgress.done()
+    }
+  }
+  const r2 = new Date().getTime()
+  console.log('路由导航所用时间', r2 - r1)
+})
+
+router.afterEach(() => {
+  NProgress.done() // 结束Progress
+})

package/src/plugins.js

@@ -3,9 +3,9 @@ import Vue from 'vue'
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 import './styles/index.scss' // global css
 
-import ElementUI from 'element-ui'
-import 'element-ui/lib/theme-chalk/index.css'
-import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n
+import ElementUI from '@gcommon/gcommon-ui'
+import '@gcommon/gcommon-ui/lib/theme-chalk/index.css'
+import locale from '@gcommon/gcommon-ui/lib/locale/lang/zh-CN' // lang i18n
 
 import SuperUI from 'imatrix-ui'
 import 'imatrix-ui/lib/super-ui.css'

package/src/store/modules/permission.js

@@ -89,7 +89,7 @@ const permission = {
         const a = new Date().getTime()
         const accessableRoutersResult = filterProtectedRouter(protectedRouterMap, currentUserPermissions)
         const b = new Date().getTime()
-        sessionStorage.setItem('=====generateRoutes====>'+new Date().getTime()+'-执行时间b-a=', (b-a)+'')
+        sessionStorage.setItem('generateRoutes==>执行时间:', (b - a) + '')
         const accessableRouters = accessableRoutersResult.allRouters
         const allMenuRoutes = accessableRoutersResult.menuRouters
         // console.log('有权限的路由表结果==', accessableRouters)
@@ -117,9 +117,9 @@ const permission = {
             // console.log('更新后的有权限的路由表结果，更新了根路由跳转的地址==', accessableRouters)
           }
         }
-        const c = new Date().getTime()
-        sessionStorage.setItem('=====generateRoutes====>执行时间c-a=', (c-a)+'')
         commit('setRouters', accessableRouters)
+        const c = new Date().getTime()
+        sessionStorage.setItem('generateRoutes==>执行时间c-a:', (c - a) + '')
         resolve()
       })
     }

package/src/utils/permissionAuth.js

@@ -25,7 +25,7 @@ export function getPermissions() {
     return JSON.parse(permissions)
   }
   const b = new Date().getTime()
-  sessionStorage.setItem('====getPermissions===>'+new Date().getTime()+'-执行时间=',(b-a)+'')
+  sessionStorage.setItem('getPermissions==>执行时间:', (b - a) + '')
   return null
 }
 
@@ -39,7 +39,7 @@ export function setPermissions(permissions) {
   }
   sessionStorage.setItem(permissionKey + systemCode, JSON.stringify(permissionObjs))
   const b = new Date().getTime()
-  sessionStorage.setItem('====setPermissions===>'+new Date().getTime()+'-执行时间=',(b-a)+'')
+  sessionStorage.setItem('setPermissions==>执行时间:', (b - a) + '')
   return permissionObjs
 }
 

package/src/utils/request.js

@@ -1,7 +1,7 @@
 import axios from 'axios'
 import {
   Message
-} from 'element-ui'
+} from '@gcommon/gcommon-ui'
 import {
   getToken,
   removeToken