agilebuilder-ui 1.0.2 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.0.2",
+  "version": "1.0.5",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/src/permission.js

@@ -1,6 +1,6 @@
 import NProgress from 'nprogress' // Progress 进度条
 import 'nprogress/nprogress.css' // Progress 进度条样式
-import { getToken, setToken } from './utils/auth' // 验权
+import { getToken, setToken, isDevpSystem } from './utils/auth' // 验权
 import store from './store'
 import router, { errorRouterMap } from './router'
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
@@ -46,22 +46,23 @@ router.beforeEach((to, from, next) => {
   // console.log('router.beforeEach-to.path=', to.path)
   console.log('router.beforeEach-to.query=', to.query)
   if (to.query && to.query[devpJWTKey]) {
+    // 表示开发平台点击了运行平台的菜单传过来的JWT，该JWT需要作为后续的权限验证凭证
     console.log('router.beforeEach-to.query[_devpJWT])=', to.query[devpJWTKey])
     // setToken(to.query[devpJWTKey])
     authApi.setSessionCache(runDevpJWTKey, to.query[devpJWTKey])
   }
   if (to.query && to.query[currentRoleKey]) {
+    // 表示开发平台中设计项目时传过来的岗位编码“开发者”、“观察者”
     console.log('router.beforeEach-to.query[_CURRENT_ROLE])=', to.query[currentRoleKey])
     authApi.setSessionCache(runCurrentRoleKey, to.query[currentRoleKey])
   }
   let token
   // 是否是开发环境功能
-  let isDevp = false
+  let isDevp = isDevpSystem()
   if(authApi.getSessionCache(runDevpJWTKey)) {
     // setToken(authApi.getSessionCache(runDevpJWTKey))
     token = authApi.getSessionCache(runDevpJWTKey)
     console.log('router.beforeEach-authApi.getSessionCache(_runDevpJWT)=', authApi.getSessionCache(runDevpJWTKey))
-    isDevp = true
   }
   if(!token) {
     token = getToken()
@@ -141,19 +142,22 @@ router.beforeEach((to, from, next) => {
                       })
                     }).then((user)=>{
                       console.log('router.beforeEach-getCurrentUser')
-                        const devpRoleCodes = authApi.getSessionCache(runCurrentRoleKey)
-                        if(isDevp && devpRoleCodes){
-                          // 表示是开发环境JWT
+                      const devpRoleCodes = authApi.getSessionCache(runCurrentRoleKey)
+                      if(!isDevp && devpRoleCodes){
+                          // 表示是开发环境设计时生成的运行平台的JWT，且缓存了项目权限编码，对应运行平台的岗位编码
+                      console.log('开发环境设计时生成的运行平台的JWT，且缓存了项目权限编码时，!isDevp && devpRoleCodes')
                           return store.dispatch(
-                              'getDevPlatformPermissions',
-                              devpRoleCodes
+                            'getDevPlatformPermissions',
+                            devpRoleCodes
                           )
-                        } else {
-                          return store.dispatch(
-                              'getCurrentUserPermissions',
-                              user.loginName
-                          )
-                        }
+                      } else {
+                        // 开发平台本身的功能或直接平台功能时
+                      console.log('开发平台本身的功能或直接平台功能时')
+                        return store.dispatch(
+                            'getCurrentUserPermissions',
+                            user.loginName
+                        )
+                      }
                     })
                     .then((permissions) => {
                       return store.dispatch('generateRoutes', permissions)

package/src/utils/auth-api.js

@@ -9,16 +9,35 @@ const langKey = 'CURRENT_LANGUAGE'
 const allLangKey = 'AMB_LANG_INFO'
 const versionEnv = 'VERSION_ENVIRONMENT'
 const userVersion = 'CURRENT_USER_SYSTEM_VERSION'
+const runDevpJwtKey = '_runDevpJWT'
 
 function getToken() {
-    let runDevpJWTKey = '_runDevpJWT'
-    let token = getSessionCache(runDevpJWTKey)
-    if(!token) {
-      // 开发平台iframe访问运行平台token不存在，则表示是正常访问系统
+    // 是否是开发平台功能
+    let isDevp = isDevpSystem()
+    let token
+    if(isDevp) {
+        // 表示是开发平台功能，从JWT参数中获得token
         token = getMyToken()
+    } else {
+        // 表示是运行平台，先从runJwt参数获得，如果没有再从JWT参数获得
+        token = getSessionCache(runDevpJwtKey)
+        if(!token) {
+        // 开发平台iframe访问运行平台token不存在，则表示是正常访问系统
+            token = getMyToken()
+        }
     }
     return token
 }
+// 是否是开发平台
+function isDevpSystem() {
+    // 是否是开发平台
+    let isDevp = false
+    const systemCode = window.$vueApp.config.globalProperties.systemCode
+    if(systemCode && systemCode === 'devp') {
+        isDevp = true
+    }
+    return isDevp
+}
 
 function getMyToken() {
     let token = getCookieCache(jwtKey)
@@ -43,13 +62,7 @@ function removeToken() {
 }
 
 function getUsername() {
-    let runDevpJWTKey = '_runDevpJWT'
-    let token = getSessionCache(runDevpJWTKey)
-    let myCurrentUserNameKey = currentUserNameKey
-    if(token) {
-        // 表示是开发平台iframe访问时
-        myCurrentUserNameKey = '_run_' + myCurrentUserNameKey
-    }
+    let myCurrentUserNameKey = getRunInfoKey(currentUserNameKey)
     let username = getCookieCache(myCurrentUserNameKey)
     if (!username) {
         username = getSessionCache(myCurrentUserNameKey)
@@ -58,13 +71,7 @@ function getUsername() {
 }
 
 function setUsername(username) { 
-    let runDevpJWTKey = '_runDevpJWT'
-    let token = getSessionCache(runDevpJWTKey)
-    let myCurrentUserNameKey = currentUserNameKey
-    if(token) {
-        // 表示是开发平台iframe访问时
-        myCurrentUserNameKey = '_run_' + myCurrentUserNameKey
-    }
+    let myCurrentUserNameKey = getRunInfoKey(currentUserNameKey)
     setSessionCache(myCurrentUserNameKey, username)
     setCookieCache(myCurrentUserNameKey, username)
 }
@@ -75,13 +82,7 @@ function removeUsername() {
 }
 
 function getCurrentUser() {
-    let runDevpJWTKey = '_runDevpJWT'
-    let token = getSessionCache(runDevpJWTKey)
-    let myCurrentUserInfoKey = currentUserInfoKey
-    if(token) {
-        // 表示是开发平台iframe访问时
-        myCurrentUserInfoKey = '_run_' + myCurrentUserInfoKey
-    }
+    const myCurrentUserInfoKey = getRunInfoKey(currentUserInfoKey)
     return getCurrentUserByKey(myCurrentUserInfoKey)
 }
 
@@ -96,13 +97,7 @@ function getCurrentUserByKey(key) {
 }
 
 function setCurrentUser(userInfo) {
-    let runDevpJWTKey = '_runDevpJWT'
-    let token = getSessionCache(runDevpJWTKey)
-    let myCurrentUserInfoKey = currentUserInfoKey
-    if(token) {
-        // 表示是开发平台iframe访问时
-        myCurrentUserInfoKey = '_run_' + myCurrentUserInfoKey
-    }
+    const myCurrentUserInfoKey = getRunInfoKey(currentUserInfoKey)
     if (userInfo) {
         if (userInfo.password) {
             userInfo.password = null
@@ -112,6 +107,24 @@ function setCurrentUser(userInfo) {
         setCookieCache(myCurrentUserInfoKey, userinfoStr)
     }
 }
+/**
+ * 获得缓存的key。判断运行平台还是开发平台
+ * @param {} orgKey 
+ * @returns 
+ */
+function getRunInfoKey(orgKey) {
+    let newKey = orgKey
+    let isDevp = isDevpSystem()
+    if(!isDevp) {
+        // 表示不是开发平台功能时，运行平台或直接访问平台功能时
+        let token = getSessionCache(runDevpJwtKey)
+        if(token) {
+            // 表示是开发平台iframe访问时
+            newKey = '_run_' + newKey
+        }
+    }
+    return newKey
+}
 
 function removeCurrentUser() {
     removeSessionCache(currentUserInfoKey)
@@ -255,5 +268,7 @@ export default {
     getAllLanguages,
     setAllLanguages,
     removeAllLanguages,
-    removePublishControl
+    removePublishControl,
+    isDevpSystem,
+    getRunInfoKey
 }

package/src/utils/auth.js

@@ -95,4 +95,12 @@ export function removeDevpPermissions() {
 let currentRoleKey = '_CURRENT_ROLE'
 authApi.removeSessionCache(devpJWTKey)
 authApi.removeSessionCache(currentRoleKey)
+}
+
+export function isDevpSystem() {
+  return authApi.isDevpSystem()
+}
+
+export function getRunInfoKey() {
+  return authApi.getRunInfoKey()
 }

package/src/utils/permissionAuth.js

@@ -1,5 +1,5 @@
 import * as Vue from 'vue'
-import {getSessionCache} from './auth'
+import {getSessionCache, getRunInfoKey} from './auth'
 
 const permissionKey = 'PERMISSION-'
 const permissionMenuKey = 'PERMISSION_MENU-'
@@ -63,14 +63,8 @@ export function removePermissions() {
 export function getMenus(systemCode) {
   if (!systemCode) {
     systemCode = getSystemCode()
-  }
-  let myPermissionMenuKey = permissionMenuKey
-  let runDevpJWTKey = '_runDevpJWT'
-  let token = getSessionCache(runDevpJWTKey)
-  if(!token) {
-    // 开发平台iframe访问运行平台token不存在，则表示是正常访问系统
-    myPermissionMenuKey = '_run_' + myPermissionMenuKey
-  }
+  } 
+  const myPermissionMenuKey = getRunInfoKey(permissionMenuKey)
   const permissions = window.sessionStorage.getItem(
     myPermissionMenuKey + systemCode
   )
@@ -85,13 +79,7 @@ export function setMenus(menus, systemCode) {
     if (!systemCode) {
       systemCode = getSystemCode()
     }
-    let myPermissionMenuKey = permissionMenuKey
-    let runDevpJWTKey = '_runDevpJWT'
-    let token = getSessionCache(runDevpJWTKey)
-    if(!token) {
-      // 开发平台iframe访问运行平台token不存在，则表示是正常访问系统
-      myPermissionMenuKey = '_run_' + myPermissionMenuKey
-    }
+    const myPermissionMenuKey = getRunInfoKey(permissionMenuKey)
     window.sessionStorage.setItem(
       myPermissionMenuKey + systemCode,
       JSON.stringify(menus)
@@ -104,13 +92,7 @@ export function removeMenus(systemCode) {
   if (!systemCode) {
     systemCode = getSystemCode()
   }
-  let myPermissionMenuKey = permissionMenuKey
-  let runDevpJWTKey = '_runDevpJWT'
-  let token = getSessionCache(runDevpJWTKey)
-  if(!token) {
-    // 开发平台iframe访问运行平台token不存在，则表示是正常访问系统
-    myPermissionMenuKey = '_run_' + myPermissionMenuKey
-  }
+  const myPermissionMenuKey = getRunInfoKey(permissionMenuKey)
   window.sessionStorage.removeItem(myPermissionMenuKey + systemCode)
   for (var i = 0; i < window.sessionStorage.length; i++) {
     var key = window.sessionStorage.key(i)

package/src/utils/request.js

@@ -25,12 +25,7 @@ service.interceptors.request.use(
     store.commit('togglePreventReclick', true)
     const timeZone = getTimeZone()
     config.headers['timeZone'] = timeZone
-    let runDevpJWTKey = '_runDevpJWT'
-    let token = authApi.getSessionCache(runDevpJWTKey)
-    if(!token) {
-      // 开发平台iframe访问运行平台token不存在，则表示是正常访问系统
-      token = getToken()
-    }
+    const token = getToken()
     if (token) {
       config.headers['Authorization'] = token // 让每个请求携带自定义token 请根据实际情况自行修改
     }
@@ -170,6 +165,7 @@ export const apiUrlMappings = {}
  * @param {*} options 是一个对象，包括data和param两个子对象属性，形如{param:{},data:{}}
  */
 export function request(code, options) {
+  let requestParam
   const config = {}
   if (options) {
     if (options.data) {
@@ -193,6 +189,9 @@ export function request(code, options) {
     if (options.url) {
       config.url = options.url
     }
+    if (options.requestParam) {
+      requestParam = options.requestParam
+    }
   }
   if (code) {
     if (!checkPermission(code)) {
@@ -226,6 +225,16 @@ export function request(code, options) {
       showClose: true,
     })
   }
+  if(requestParam) {
+    for(let key in requestParam) {
+      if (config.url.indexOf('?') > 0) {
+        // 表示有参数
+        config.url = config.url + '&' + key + '=' + requestParam[key]
+      } else {
+        config.url = config.url + '?' + key + '=' + requestParam[key]
+      }
+    }
+  }
   if (config.method && config.method.toLowerCase() === 'get') {
     if (config.url.indexOf('?') > 0) {
       // 表示有参数

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

@@ -68,6 +68,11 @@ export default {
       type: String,
       default: "",
     },
+    // 是否是开发平台使用
+    isDevp:{
+      type: Boolean,
+      default:false
+    }
   },
   data() {
    let frontendUrlKey = '_PLAT_FORM_FRONTEND_URL'
@@ -110,19 +115,17 @@ export default {
       return false;
     },
     toPath(menu) {
-      this.platFrontUrl= authApi.getSessionCache(this.frontendUrlKey)
-      this.platBackendUrl= authApi.getSessionCache(this.backendUrlKey)
-      this.devpJWT= authApi.getSessionCache(this.devpJWTKey)
-      this.currentRole= authApi.getSessionCache(this.currentRoleKey)
-      this.runDevpJWT= authApi.getSessionCache(this.runDevpJWTKey)
+      if(this.isDevp) {
+        // 开发平台中访问运行平台的菜单需要的参数
+        this.platFrontUrl= authApi.getSessionCache(this.frontendUrlKey)
+        this.platBackendUrl= authApi.getSessionCache(this.backendUrlKey)
+        this.devpJWT= authApi.getSessionCache(this.devpJWTKey)
+        this.currentRole= authApi.getSessionCache(this.currentRoleKey)
+        this.runDevpJWT= authApi.getSessionCache(this.runDevpJWTKey)
+      }
       const toPathObj = {};
       let routePath
       toPathObj.openWay = menu.openWay;
-      let isDevp = false
-      if (this.devpJWT) {
-        // 开发平台中访问运行平台的菜单需要的参数
-        isDevp = true
-      }
       if (this.isExternalLink(menu.pageType)) {
         routePath = menu.path      
         if(!routePath) {
@@ -143,7 +146,7 @@ export default {
         }
         routePath = this.getRoutePath(routePath)
         toPathObj.path = "/tab-content-index"
-        if(isDevp){
+        if(this.isDevp){
           // 如果是开发平台，进入开发平台设置首页
           toPathObj.path = "/devp-project/setting"
         }
@@ -167,7 +170,7 @@ export default {
         }
         routePath = routePath + '_isNeedMenu_=false'
         toPathObj.path = "/tab-content-index";
-        if(isDevp){
+        if(this.isDevp){
           // 如果是开发平台，进入开发平台设置首页
           toPathObj.path = "/devp-project/setting"
         }

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

@@ -53,6 +53,11 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+		// 是否是开发平台使用
+		isDevp:{
+		type: Boolean,
+		default:false
+		}
 	},
 	data() {
 		let systemName

package/src/views/layout/tab-content-index.vue

@@ -31,6 +31,13 @@ export default {
     Breadcrumb,
     TabContent,
   },
+  props:{
+    // 是否是开发平台使用
+    isDevp:{
+      type: Boolean,
+      default:false
+    }
+  },
   mixins: [ResizeMixin],
   data() {
     // 是否显示菜单路径，默认是不显示