imatrix-ui 2.9.27-dw → 2.9.27-dw-tmp1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.9.27-dw",
+  "version": "2.9.27-dw-tmp1",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,

package/src/permission.js

@@ -33,6 +33,17 @@ router.beforeEach((to, from, next) => {
     // 表示需要设置浏览器页签名
     document.title = to.query._systemName_
   }
+  // 表示需要显示菜单。为了控制是否需要走获得有权限的菜单集合的接口。单点登录跳转到表单页面时不需要请求菜单，提高页面显示速度。
+  let isNeedMenu
+  if (to.query && to.query._isNeedMenu_) {
+    isNeedMenu = to.query._isNeedMenu_
+  }
+  if (isNeedMenu !== undefined && isNeedMenu !== null && isNeedMenu === 'false') {
+    isNeedMenu = false
+  } else {
+    isNeedMenu = true
+  }
+  console.log('iMatrix-router.beforeEach2-isNeedMenu==', isNeedMenu)
   // 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') {
@@ -57,15 +68,22 @@ router.beforeEach((to, from, next) => {
               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)
+              if (isNeedMenu) {
+                // 需要显示左侧菜单
+                console.log('iMatrix-router.beforeEach2-getPermissionMenus')
+                return store.dispatch('getPermissionMenus', Vue.prototype.currentSystem)
+              } else {
+                return new Promise((resolve, reject) => {
+                  resolve()
+                })
+              }
             }).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)
+              // 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) => {
@@ -82,9 +100,17 @@ router.beforeEach((to, from, next) => {
           })
         })
       } else {
-        sessionStorage.setItem(new Date().getTime() + '-name!==null-from~~toPath', from.path + '~~' + to.path)
+        // sessionStorage.setItem(new Date().getTime() + '-name!==null-from~~toPath', from.path + '~~' + to.path)
         console.log('router.beforeEach-store.getters.name ==', store.getters.name)
-        next()
+        if (isNeedMenu) {
+          // 需要显示左侧菜单
+          console.log('iMatrix-router.beforeEach33-getPermissionMenus,Vue.prototype.currentSystem=', Vue.prototype.currentSystem)
+          return store.dispatch('getPermissionMenus', Vue.prototype.currentSystem).then(() => {
+            next()
+          })
+        } else {
+          next()
+        }
       }
     }
   } else {