agilebuilder-ui 1.0.69 → 1.0.71

package/src/utils/permissionAuth.js

@@ -1,11 +1,13 @@
 import * as Vue from 'vue'
 import {getSessionCache, getRunInfoKey} 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) {
@@ -23,13 +25,27 @@ export function getSystemCode() {
 }
 
 export function getPermissions() {
+  let totalPermissions = null
   const 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() {
@@ -45,6 +61,15 @@ export function getTotalPermissions() {
   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) {
     let permissions = {}
@@ -54,6 +79,9 @@ export function getTotalPermissions() {
     if(sysetemPermissionsObj){
       Object.assign(permissions, sysetemPermissionsObj)
     }
+    if(mobilePermissionsObj){
+      Object.assign(permissions, mobilePermissionsObj)
+    }
     // console.log('getTotalPermissions----permissions=', permissions )
     return permissions
   }
@@ -61,8 +89,21 @@ export function getTotalPermissions() {
 }
 
 export function setPermissions(permissions) {
-  const a = new Date().getTime()
-  const systemCode = getSystemCode()
+  const isMobile = isMobileBrowser()
+  let key
+  const permissionObjs = getPermissionObjs(permissions)
+  if(isMobile){
+    key = mobilePermissionKey
+  } else {
+    const 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]
@@ -71,9 +112,6 @@ export function setPermissions(permissions) {
       permissionObjs[permission] = true
     }
   }
-  const key = permissionKey + systemCode
-  localStorage.setItem(key, JSON.stringify(permissionObjs))
-  setPermissionAllSystemKey(key)
   return permissionObjs
 }
 
@@ -147,6 +185,7 @@ function rtrim(str) { // 删除右边的空格
 
 // 删除缓存的资源和菜单
 export function removeAllSystemPermissions() {
+  localStorage.removeItem(mobilePermissionKey)
   const systemCode = getSystemCode()
   localStorage.removeItem(permissionKey + systemCode)
   const myPermissionMenuKey = getRunInfoKey(permissionMenuKey)

package/src/utils/util.js

@@ -965,7 +965,7 @@ export function isImage(fileName) {
     // const fileType = fileName.substring(fileName.lastIndexOf('.'), fileName.length).toLowerCase()
     // const imageTypes = ['.jpg', '.JPG', '.png', '.bmp', '.BMP', '.jpeg', '.gif', '.psd', '.tif', '.tga', '.svg', '.eps']
     // const index = imageTypes.indexOf(fileType)
-    if (
+    if (fileName && 
         /\.(jpg|JPG|jpeg|JPEG|png|PNG|gif|GIF|bmp|BMP|psd|PSD|tif|TIF)$/.test(
             fileName
         )