agilebuilder-ui 1.0.621 → 1.0.962

package/src/utils/permission.js

@@ -1,5 +1,5 @@
 import 'nprogress/nprogress.css' // Progress 进度条样式
-import { getTotalPermissions } from './permissionAuth'
+import { getTotalPermissions, isDevpAccess } from './permissionAuth'
 
 /**
  * @param {String} permission 多个资源编码以逗号隔开
@@ -7,6 +7,12 @@ import { getTotalPermissions } from './permissionAuth'
  */
 export default function checkPermission(permission) {
   if (permission) {
+    // 是否是预览项目时开发平台用户
+    const isDevpPermission= isDevpAccess()
+    // console.log('checkPermission---------permission=', permission, 'isDevpPermission=', isDevpPermission)
+    if(isDevpPermission){
+      return true
+    }
     let hasPermission = false
     const storeCurrentUserPermissions = getTotalPermissions()
     if (

package/src/utils/permissionAuth.js

@@ -1,9 +1,13 @@
 import * as Vue from 'vue'
-import {getSessionCache, getRunInfoKey} from './auth'
+import {getSessionCache, getRunInfoKey, getUsername, getRunCurrentRole} from './auth'
+import { isMobileBrowser } from './common-util'
 
 const permissionKey = 'PERMISSION-'
 const permissionMenuKey = 'PERMISSION_MENU-'
 const _RUN_PERMISSION = '_RUN_PERMISSION'
+
+const permissionAllSystemKey = 'PERMISSION_All_SYSTSEM_KEY'
+const mobilePermissionKey = 'PERMISSION-MOBILE-WEB'
 export function getSystemCode() {
   let systemCode
   if (window.$vueApp.config.globalProperties.customSystem) {
@@ -20,14 +24,30 @@ export function getSystemCode() {
   return systemCode
 }
 
-export function getPermissions() {
-  const systemCode = getSystemCode()
-  let permissions = window.sessionStorage.getItem(permissionKey + systemCode)
+export function getPermissions(systemCode) {
+  let totalPermissions = null
+  if(!systemCode){
+    systemCode = getSystemCode()
+  }
+  let permissions = localStorage.getItem(permissionKey + systemCode)
   if (permissions) {
-    permissions = JSON.parse(permissions)
-    return permissions
+    if(!totalPermissions){
+      totalPermissions = {}
+    }
+    Object.assign(totalPermissions,JSON.parse(permissions))
   }
-  return null
+
+  const isMobile = isMobileBrowser()
+  if(isMobile){
+    const permissions = localStorage.getItem(mobilePermissionKey)
+    if (permissions) {
+      if(!totalPermissions){
+        totalPermissions = {}
+      }
+      Object.assign(totalPermissions,JSON.parse(permissions))
+    }
+  }
+  return totalPermissions
 }
 
 export function getTotalPermissions() {
@@ -39,12 +59,21 @@ export function getTotalPermissions() {
   }
   let sysetemPermissionsObj
   const systemCode = getSystemCode()
-  const sysetemPermissions = window.sessionStorage.getItem(permissionKey + systemCode)
+  const sysetemPermissions = localStorage.getItem(permissionKey + systemCode)
   if (sysetemPermissions) {
     sysetemPermissionsObj = JSON.parse(sysetemPermissions)
   }
+
+  let mobilePermissionsObj
+  const isMobile = isMobileBrowser()
+  if(isMobile){
+    const mobilePermissions = localStorage.getItem(mobilePermissionKey)
+    if (mobilePermissions) {
+      mobilePermissionsObj = JSON.parse(mobilePermissions)
+    }
+  }
   const b = new Date().getTime()
-  if(runPermissionsObj || sysetemPermissionsObj) {
+  if(runPermissionsObj || sysetemPermissionsObj || mobilePermissionsObj) {
     let permissions = {}
     if(runPermissionsObj){
       Object.assign(permissions, runPermissionsObj)
@@ -52,15 +81,33 @@ export function getTotalPermissions() {
     if(sysetemPermissionsObj){
       Object.assign(permissions, sysetemPermissionsObj)
     }
+    if(mobilePermissionsObj){
+      Object.assign(permissions, mobilePermissionsObj)
+    }
     // console.log('getTotalPermissions----permissions=', permissions )
     return permissions
   }
   return null
 }
 
-export function setPermissions(permissions) {
-  const a = new Date().getTime()
-  const systemCode = getSystemCode()
+export function setPermissions(permissions, systemCode) {
+  const isMobile = isMobileBrowser()
+  let key
+  const permissionObjs = getPermissionObjs(permissions)
+  if(isMobile){
+    key = mobilePermissionKey
+  } else {
+    if (!systemCode) {
+      systemCode = getSystemCode()
+    }
+    key = permissionKey + systemCode
+  }
+  localStorage.setItem(key, JSON.stringify(permissionObjs))
+  setPermissionAllSystemKey(key)
+  return permissionObjs
+}
+
+function getPermissionObjs(permissions){
   const permissionObjs = {}
   for (let i = 0; i < permissions.length; i++) {
     const functionCode = permissions[i]
@@ -69,31 +116,16 @@ export function setPermissions(permissions) {
       permissionObjs[permission] = true
     }
   }
-  window.sessionStorage.setItem(
-    permissionKey + systemCode,
-    JSON.stringify(permissionObjs)
-  )
-  const b = new Date().getTime()
   return permissionObjs
 }
 
-export function removePermissions() {
-  const systemCode = getSystemCode()
-  window.sessionStorage.removeItem(permissionKey + systemCode)
-  for (var i = 0; i < window.sessionStorage.length; i++) {
-    var key = window.sessionStorage.key(i)
-    if (key.indexOf(permissionKey) >= 0) {
-      window.sessionStorage.removeItem(key)
-    }
-  }
-}
 
 export function getMenus(systemCode) {
   if (!systemCode) {
     systemCode = getSystemCode()
   } 
   const myPermissionMenuKey = getRunInfoKey(permissionMenuKey)
-  const permissions = window.sessionStorage.getItem(
+  const permissions = localStorage.getItem(
     myPermissionMenuKey + systemCode
   )
   if (permissions) {
@@ -108,10 +140,9 @@ export function setMenus(menus, systemCode) {
       systemCode = getSystemCode()
     }
     const myPermissionMenuKey = getRunInfoKey(permissionMenuKey)
-    window.sessionStorage.setItem(
-      myPermissionMenuKey + systemCode,
-      JSON.stringify(menus)
-    )
+    const key = myPermissionMenuKey + systemCode
+    localStorage.setItem(key, JSON.stringify(menus))
+    setPermissionAllSystemKey(key)
     return menus
   }
 }
@@ -121,11 +152,98 @@ export function removeMenus(systemCode) {
     systemCode = getSystemCode()
   }
   const myPermissionMenuKey = getRunInfoKey(permissionMenuKey)
-  window.sessionStorage.removeItem(myPermissionMenuKey + systemCode)
-  for (var i = 0; i < window.sessionStorage.length; i++) {
-    var key = window.sessionStorage.key(i)
-    if (key.indexOf(permissionMenuKey) >= 0) {
-      window.sessionStorage.removeItem(key)
+  localStorage.removeItem(myPermissionMenuKey + systemCode)
+  for (var i = 0; i < localStorage.length; i++) {
+    var key = localStorage.key(i)
+    if (key.indexOf(myPermissionMenuKey) >= 0 || key.indexOf(permissionMenuKey) >= 0) {
+      localStorage.removeItem(key)
     }
   }
 }
+
+function setPermissionAllSystemKey(systemPermissionKey) {
+  const permissionAllSystems = getPermissionAllSystemKey()
+  if (permissionAllSystems.indexOf(systemPermissionKey) < 0) {
+    permissionAllSystems.push(systemPermissionKey)
+  }
+  localStorage.setItem(permissionAllSystemKey, permissionAllSystems.join(','))
+}
+
+function getPermissionAllSystemKey() {
+  let permissionAllSystems = localStorage.getItem(permissionAllSystemKey)
+  if (permissionAllSystems) {
+    permissionAllSystems = permissionAllSystems.split(',')
+  }
+  if (!permissionAllSystems) {
+    permissionAllSystems = []
+  }
+  return permissionAllSystems
+}
+
+function removePermissionSystemKey() {
+  localStorage.removeItem(permissionAllSystemKey)
+}
+function rtrim(str) { // 删除右边的空格
+  return str.replace(/(\s*$)/g, '')
+}
+
+// 删除缓存的资源和菜单
+export function removeAllSystemPermissions() {
+  localStorage.removeItem(mobilePermissionKey)
+  const systemCode = getSystemCode()
+  localStorage.removeItem(permissionKey + systemCode)
+  const myPermissionMenuKey = getRunInfoKey(permissionMenuKey)
+  localStorage.removeItem(myPermissionMenuKey + systemCode)
+  const permissionAllSystems = getPermissionAllSystemKey()
+  permissionAllSystems.forEach(key => {
+    key = rtrim(key)
+    localStorage.removeItem(key)
+  })
+  removePermissionSystemKey()
+}
+// 开发平台项目负责人角色编码
+const DEV_ROLE_PROJECT_ADMIN_CODE = "PROJECT_ADMIN"
+// 开发平台项目开发者角色编码
+const DEV_ROLE_PROJECT_DEVELOPER_CODE = "PROJECT_DEVELOPER"
+// 开发平台项目观察者角色编码
+const DEV_ROLE_PROJECT_VIEWER_CODE = "PROJECT_VIEWER"
+
+/**
+     * 预览项目时查询应用权限使用。
+     * 负责人岗位和观察者岗位
+     * @return
+     */
+export function isDevpAccess() {
+    const username = getUsername()
+    // console.log("isDevpAccess-----username=",username);
+    const DEVP_APP_ID = "0bba9791-d4f1-47ca-b5e6-1fc840b54f3a"
+    if(username && username === DEVP_APP_ID){
+        // 开发环境的角色编码，运行环境中是岗位
+        const postManagementCodes = getPostManagementCodes()
+        // console.log("isDevAccess----postManagementCodes=",postManagementCodes);
+        if(postManagementCodes && postManagementCodes.indexOf(DEV_ROLE_PROJECT_ADMIN_CODE) >= 0 ||
+                postManagementCodes.indexOf(DEV_ROLE_PROJECT_VIEWER_CODE) >= 0){
+            // 表示是项目负责人岗位或观察者岗位或平台管理员，且当前登录用户是 devp的应用id
+          return true
+        }
+    }
+    return false
+}
+
+function getPostManagementCodes() {
+  const devpPostManagements = getRunCurrentRole()
+  if(devpPostManagements){
+    let postCodes = [];
+    const devpCodes = devpPostManagements.split(",");
+    devpCodes.forEach(code=>{
+      let roleCode = code
+      if(code === DEV_ROLE_PROJECT_ADMIN_CODE || code === DEV_ROLE_PROJECT_DEVELOPER_CODE ){
+        roleCode = DEV_ROLE_PROJECT_ADMIN_CODE
+      }
+      if(postCodes.indexOf(roleCode) < 0) {
+        postCodes.push(roleCode)
+      }
+    })
+    return postCodes
+  }
+}

package/src/utils/request.js

@@ -1,11 +1,9 @@
 import axios from 'axios'
 import { ElMessage as Message } from 'element-plus'
-import { getToken, removeToken } from './auth'
+import { getToken, removeToken, getRunCurrentRole } from './auth'
 import store from '../store'
 import checkPermission from './permission'
-import * as Vue from 'vue'
 import { getI18n } from './util'
-import authApi from './auth-api'
 import {
   getRelativeBaseUrl,
   getTimeZone,
@@ -29,10 +27,10 @@ service.interceptors.request.use(
     if (token) {
       config.headers['Authorization'] = token // 让每个请求携带自定义token 请根据实际情况自行修改
     }
-    let runCurrentRoleKey = '_RUN_CURRENT_ROLE'
-    const currentRole = authApi.getSessionCache(runCurrentRoleKey)
+    const currentRole = getRunCurrentRole()
     // console.log('axios请求后台11---currentRole=', currentRole)
     if(currentRole){
+      let runCurrentRoleKey = '_RUN_CURRENT_ROLE'
       config.headers[runCurrentRoleKey] = currentRole 
     }
     // console.log('axios请求后台22---config=', config)
@@ -93,19 +91,20 @@ service.interceptors.response.use(
       } else if (error.response.status === 403) {
         // ForbiddenException(403) 403没权限
         const message = getI18n().t('imatrixUIMessage.forbiddenException')
+        const serverConfig = window['$vueApp'].config.globalProperties
         let vnode
-        if (Vue.prototype.forbiddenUser || Vue.prototype.forbiddenLinkUrl) {
+        if (serverConfig.forbiddenUser || serverConfig.forbiddenLinkUrl) {
           vnode = '<p><span>' + message + '</span>'
           // 请点击进行权限申请
           const forbiddenExceptionLinkUrlMsg = getI18n().t('imatrixUIMessage.forbiddenExceptionLinkUrl')
-          if (Vue.prototype.forbiddenLinkUrl) {
-            vnode += ',<a href="#" style="color: #1800ff;font-weight: bold;text-decoration:underline" onclick="window.open(\'' + Vue.prototype.forbiddenLinkUrl + '\')">' + forbiddenExceptionLinkUrlMsg + '</a>'
+          if (serverConfig.forbiddenLinkUrl) {
+            vnode += ',<a href="#" style="color: #1800ff;font-weight: bold;text-decoration:underline" onclick="window.open(\'' + serverConfig.forbiddenLinkUrl + '\')">' + forbiddenExceptionLinkUrlMsg + '</a>'
           }
-          if (Vue.prototype.forbiddenUser) {
+          if (serverConfig.forbiddenUser) {
             // 如有疑问请联系
             const forbiddenExceptionLinkUserMsg = getI18n().t('imatrixUIMessage.forbiddenExceptionLinkUser')
             vnode += '<span>'
-            const forbiddenUserHtml = ',' + forbiddenExceptionLinkUserMsg + '<span style="color: #1800ff;"> ' + Vue.prototype.forbiddenUser + '</span>'
+            const forbiddenUserHtml = ',' + forbiddenExceptionLinkUserMsg + '<span style="color: #1800ff;"> ' + serverConfig.forbiddenUser + '</span>'
             let contactUrlHtml
             if (!window._clickForbiddenUser) {
               contactUrlHtml = forbiddenUserHtml
@@ -116,7 +115,7 @@ service.interceptors.response.use(
             //     alert(linkUser)
             //   }
             // </script>
-              contactUrlHtml = '<a href="#"  onclick="window._clickForbiddenUser(\'' + Vue.prototype.forbiddenUser + '\');return false">' + forbiddenUserHtml + '</a>'
+              contactUrlHtml = '<a href="#"  onclick="window._clickForbiddenUser(\'' + serverConfig.forbiddenUser + '\');return false">' + forbiddenUserHtml + '</a>'
             }
             vnode += '</span>'
             vnode += contactUrlHtml