imatrix-ui 0.2.3-up → 0.2.5-up

package/src/permission.js

@@ -1,160 +1,160 @@
-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 { ElMessage as Message } from 'element-plus'
-import * as 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_) {
-    // 表示需要设置浏览器页签名
-    window.top.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',
-                          window.$vueApp.config.globalProperties.currentSystem
-                      )
-                    })
-                    .then(() => {
-                      // 根据roles权限生成可访问的路由表
-                      console.log(
-                          'router.beforeEach-generateRoutes==to=',
-                          to,
-                          ',from=',
-                          from
-                      )
-                      store.getters.protectedRouters.forEach(item =>{
-                        router.addRoute(item)
-                      })
-                      console.log('%c描述-170412','color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px',router.options.routes);
-                      // 404等错误路由一定要放到受权限保护的路由之后
-                      // router.addRoutes(errorRouterMap)
-                      window.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 {
-        window.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()
-    }
-  }
-})
-
-router.afterEach(() => {
-  NProgress.done() // 结束Progress
-})
+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 { ElMessage as Message } from 'element-plus'
+import * as 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_) {
+    // 表示需要设置浏览器页签名
+    window.top.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',
+                          window.$vueApp.config.globalProperties.currentSystem
+                      )
+                    })
+                    .then(() => {
+                      // 根据roles权限生成可访问的路由表
+                      console.log(
+                          'router.beforeEach-generateRoutes==to=',
+                          to,
+                          ',from=',
+                          from
+                      )
+                      store.getters.protectedRouters.forEach(item =>{
+                        router.addRoute(item)
+                      })
+                      console.log('%c描述-170412','color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px',router.options.routes);
+                      // 404等错误路由一定要放到受权限保护的路由之后
+                      // router.addRoutes(errorRouterMap)
+                      window.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 {
+        window.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()
+    }
+  }
+})
+
+router.afterEach(() => {
+  NProgress.done() // 结束Progress
+})

package/src/router/index.js

@@ -1,110 +1,110 @@
-import * as Vue from 'vue'
-import * as VueRouter from 'vue-router'
-
-/* Layout */
-import Layout from '../views/layout/NewLayout.vue'
-
-/**
-* hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
-* alwaysShow: true               if set true, will always show the root menu, whatever its child routes length
-*                                if not set alwaysShow, only more than one route under the children
-*                                it will becomes nested mode, otherwise not show the root menu
-* redirect: noredirect           if `redirect:noredirect` will no redirect in the breadcrumb
-* name:'router-name'             the name is used by <keep-alive> (must set!!!)
-* meta : {
-    title: 'title'               the name show in submenu and breadcrumb (recommend set)
-    icon: 'svg-name'             the icon show in the sidebar,
-  }
-**/
-export const publicRouterMap = [
-  {
-    path: '/redirect',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: '/redirect/:path*',
-        component: Vue.defineAsyncComponent(
-            () => import('../views/redirect/index.vue')
-        ),
-      },
-    ],
-  },
-  {
-    path: '/iframe-page',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: 'page',
-        component: Vue.defineAsyncComponent(
-            () => import('../views/layout/components/iframe-page.vue')
-        ),
-        hidden: true,
-      },
-    ],
-  },
-  // {
-  //   path: '/login',
-  //   component: () => import('../views/login/index'),
-  //   hidden: true
-  // },
-  {
-    path: '/auth-redirect',
-    component: Vue.defineAsyncComponent(
-        () => import('../views/login/authredirect.vue')
-    ),
-    hidden: true,
-  },
-  {
-    path: '/404',
-    component: Vue.defineAsyncComponent(
-        () => import('../views/error-page/404.vue')
-    ),
-    hidden: true,
-  },
-  {
-    path: '/401',
-    component: Vue.defineAsyncComponent(
-        () => import('../views/error-page/401.vue')
-    ),
-    hidden: true,
-  },
-  {
-    path: '/show-sub-wf-history',
-    component: Vue.defineAsyncComponent(
-        () => import('../views/wf-history/tache-subprocess-history.vue')
-    ),
-    hidden: true,
-  },
-  {
-    path: '/tab-content-index',
-    component: Vue.defineAsyncComponent(
-        () => import('../views/layout/tab-content-index.vue')
-    ),
-    hidden: true,
-  },
-  {
-    path: '/tab-content-iframe-index',
-    component: Vue.defineAsyncComponent(
-      Vue.defineAsyncComponent(
-        () => import('../views/layout/tab-content-iframe-index.vue')
-      )
-    ),
-    hidden: true,
-  },
-]
-export const protectedRouterMap = []
-export const errorRouterMap = [
-  // 404的映射必须是最后一个
-  { path: '*', redirect: '/404', hidden: true },
-]
-
-
-export default VueRouter.createRouter({
-  history: VueRouter.createWebHashHistory(),
-  routes: publicRouterMap,
-  scrollBehavior: () => ({
-    top: 0,
-  }),
-})
+import * as Vue from 'vue'
+import * as VueRouter from 'vue-router'
+
+/* Layout */
+import Layout from '../views/layout/NewLayout.vue'
+
+/**
+* hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
+* alwaysShow: true               if set true, will always show the root menu, whatever its child routes length
+*                                if not set alwaysShow, only more than one route under the children
+*                                it will becomes nested mode, otherwise not show the root menu
+* redirect: noredirect           if `redirect:noredirect` will no redirect in the breadcrumb
+* name:'router-name'             the name is used by <keep-alive> (must set!!!)
+* meta : {
+    title: 'title'               the name show in submenu and breadcrumb (recommend set)
+    icon: 'svg-name'             the icon show in the sidebar,
+  }
+**/
+export const publicRouterMap = [
+  {
+    path: '/redirect',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '/redirect/:path*',
+        component: Vue.defineAsyncComponent(
+            () => import('../views/redirect/index.vue')
+        ),
+      },
+    ],
+  },
+  {
+    path: '/iframe-page',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'page',
+        component: Vue.defineAsyncComponent(
+            () => import('../views/layout/components/iframe-page.vue')
+        ),
+        hidden: true,
+      },
+    ],
+  },
+  // {
+  //   path: '/login',
+  //   component: () => import('../views/login/index'),
+  //   hidden: true
+  // },
+  {
+    path: '/auth-redirect',
+    component: Vue.defineAsyncComponent(
+        () => import('../views/login/authredirect.vue')
+    ),
+    hidden: true,
+  },
+  {
+    path: '/404',
+    component: Vue.defineAsyncComponent(
+        () => import('../views/error-page/404.vue')
+    ),
+    hidden: true,
+  },
+  {
+    path: '/401',
+    component: Vue.defineAsyncComponent(
+        () => import('../views/error-page/401.vue')
+    ),
+    hidden: true,
+  },
+  {
+    path: '/show-sub-wf-history',
+    component: Vue.defineAsyncComponent(
+        () => import('../views/wf-history/tache-subprocess-history.vue')
+    ),
+    hidden: true,
+  },
+  {
+    path: '/tab-content-index',
+    component: Vue.defineAsyncComponent(
+        () => import('../views/layout/tab-content-index.vue')
+    ),
+    hidden: true,
+  },
+  {
+    path: '/tab-content-iframe-index',
+    component: Vue.defineAsyncComponent(
+      Vue.defineAsyncComponent(
+        () => import('../views/layout/tab-content-iframe-index.vue')
+      )
+    ),
+    hidden: true,
+  },
+]
+export const protectedRouterMap = []
+export const errorRouterMap = [
+  // 404的映射必须是最后一个
+  { path: '*', redirect: '/404', hidden: true },
+]
+
+
+export default VueRouter.createRouter({
+  history: VueRouter.createWebHashHistory(),
+  routes: publicRouterMap,
+  scrollBehavior: () => ({
+    top: 0,
+  }),
+})