imatrix-ui 0.2.46-up → 0.2.49-up

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "0.2.46-up",
+  "version": "0.2.49-up",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/src/permission.js

@@ -17,7 +17,9 @@ const whiteList = [
 ] // 不重定向白名单
 
 let devpJWTKey = '_devpJWT'
+let runDevpJWTKey = '_runDevpJWT'
 let currentRoleKey = '_CURRENT_ROLE'
+let runCurrentRoleKey = '_RUN_CURRENT_ROLE'
 router.beforeEach((to, from, next) => {
   NProgress.start()
   console.log('router.beforeEach-to=', to)
@@ -25,14 +27,14 @@ router.beforeEach((to, from, next) => {
   // console.log('router.beforeEach-to.path=', to.path)
   if (to.query && to.query[devpJWTKey]) {
     setToken(to.query[devpJWTKey])
-    authApi.setSessionCache(devpJWTKey, to.query[devpJWTKey])
+    authApi.setSessionCache(runDevpJWTKey, to.query[devpJWTKey])
   }
   if (to.query && to.query[currentRoleKey]) {
-    authApi.setSessionCache(currentRoleKey, to.query[currentRoleKey])
+    authApi.setSessionCache(runCurrentRoleKey, to.query[currentRoleKey])
   }
   // 是否是开发环境功能
   let isDevp = false
-  if(authApi.getSessionCache(devpJWTKey)) {
+  if(authApi.getSessionCache(runDevpJWTKey)) {
     isDevp = true
   }
   let token = getToken()
@@ -101,7 +103,7 @@ router.beforeEach((to, from, next) => {
                     .dispatch('getCurrentUser')
                     .then((user) => {
                       console.log('router.beforeEach-getCurrentUser')
-                      const devpRoleCodes = authApi.getSessionCache(currentRoleKey)
+                      const devpRoleCodes = authApi.getSessionCache(runCurrentRoleKey)
                       if(isDevp && devpRoleCodes){
                         // 表示是开发环境JWT
                         return store.dispatch(

package/src/views/layout/components/Menubar/SidebarItem.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="menu-wrapper">
-    <template v-if="!item.children || item.children.lenght === 0">
+    <template v-if="!item.children || item.children.length === 0">
       <app-link :to="toPath(item)" @click="clickMenu(toPath(item))">
         <el-menu-item
           :index="item.fullPath + '~~' + item.i18nValue"
@@ -76,6 +76,8 @@ export default {
     let currentRoleKey = '_CURRENT_ROLE'
     return {
       onlyOneChild: null,
+      devpJWTKey,
+      currentRoleKey,
       platFrontUrl: authApi.getSessionCache(frontendUrlKey),
       platBackendUrl: authApi.getSessionCache(backendUrlKey),
       devpJWT: authApi.getSessionCache(devpJWTKey),
@@ -105,44 +107,41 @@ export default {
     toPath(menu) {
       const toPathObj = {};
       let routePath = menu.fullPath;      
+      if(!routePath) {
+        routePath = ''
+      }
       toPathObj.openWay = menu.openWay;
       if (this.isExternalLink(menu.pageType)) {
-        if (this.platFrontUrl) {
-          if (routePath && routePath.indexOf("?") > 0) {
-            routePath += "&"
-          } else {
-            routePath += "?"
-          }
-          routePath = routePath + this.platFrontUrl;
-        }
-        if (this.platBackendUrl) {
-          if (routePath && routePath.indexOf("?") > 0) {
-            routePath += "&"
-          } else {
-            routePath += "?"
+        if((routePath.indexOf('http:') < 0 && routePath.indexOf('https:') < 0) && this.platFrontUrl) {
+          // 说明不是全路径，需要拼接运行平台前端访问路径
+          if(this.platFrontUrl.lastIndex('/') === this.platFrontUrl.length - 1) {
+            // 去掉最后一个/
+            this.platFrontUrl = this.platFrontUrl.substring(0,this.platFrontUrl.length - 1)
           }
-          routePath = routePath + this.platBackendUrl;
+          routePath =this.platFrontUrl + routePath
         }
         if (this.devpJWT) {
-          if (routePath && routePath.indexOf("?") > 0) {
+          // 开发平台中访问运行平台的菜单需要的参数
+          if (routePath.indexOf("?") > 0) {
             routePath += "&"
           } else {
             routePath += "?"
           }
-          routePath = routePath + this.devpJWT
+          routePath = routePath + this.devpJWTKey + ' = ' + this.devpJWT
         }
         if (this.currentRole) {
-          if (routePath && routePath.indexOf("?") > 0) {
+          // 开发平台中访问运行平台的菜单需要的参数
+          if (routePath.indexOf("?") > 0) {
             routePath += "&"
           } else {
             routePath += "?"
           }
-          routePath = routePath + this.currentRole
+          routePath = routePath + this.currentRoleKey + '=' + this.currentRole
         }
-        toPathObj.path = "/tab-content-iframe-index"
-        toPathObj.tabPath = "/iframe-page/page"
+        toPathObj.path = "/tab-content-index"
+        toPathObj.tabPath = routePath
         toPathObj.query = {};
-        toPathObj.query.src = routePath;
+        // toPathObj.query.src = routePath;
         toPathObj.isExternal = true;
         // 如果路径中没有拼系统编码，才需要把系统编码放到参数中
         toPathObj.query.customSystem = getSystemCode();
@@ -165,7 +164,6 @@ export default {
       return false;
     },
     clickMenu(toPathObj) {
-      // console.log('clickMenu----toPathObj=', toPathObj)
       if (
         toPathObj.openWay &&
         toPathObj.openWay === "NEW_PAGE_OPEN" &&

package/src/views/layout/components/tabs/tab-content.vue

@@ -105,7 +105,7 @@ export default {
       }
     },
     getFullPath(tag) {
-      let path
+      let path = ''
       if (tag.routePath === '/iframe-page/page') {
         // 表示是iframe页面
         let src
@@ -127,7 +127,14 @@ export default {
         }
       } else {
         // 表示页面跳转
-        path = '#' + tag.routePath + '?'
+        if(tag.routePath.indexOf('http:') < 0 && tag.routePath.indexOf('https:') < 0 ) {
+          path = '#' 
+        }
+        if(tag.routePath.indexOf('?') >= 0) {
+          path = path + tag.routePath + '&'
+        } else {
+          path = path + tag.routePath + '?'
+        }
         if (tag.routeQuery) {
           for (const key in tag.routeQuery) {
             path += key + '=' + tag.routeQuery[key] + '&'