imatrix-ui 2.8.2-tmp1 → 2.8.2-tmp2

package/src/utils/common-util.js

@@ -202,3 +202,24 @@ export function getOrignUrl() {
   }
   return orignUrl
 }
+
+export function isPromise(p) {
+  return p && Object.prototype.toString.call(p) === '[object Promise]'
+}
+/**
+ * 获得UTC时区
+ * @returns 时区
+ */
+export function getTimeZone() {
+  const dateStr = new Date() + ''
+  let timeZone = ''
+  if (dateStr.indexOf('GMT') > 0) {
+    const timeZoneSuffix = dateStr.substring(dateStr.indexOf('GMT') + 3, dateStr.indexOf('(')).trim()
+    const partPrefix = timeZoneSuffix.substring(0, timeZoneSuffix.length - 2)
+    const partSuffix = timeZoneSuffix.substring(timeZoneSuffix.length - 2)
+    timeZone = 'UTC' + partPrefix + ':' + partSuffix
+  } else if (dateStr.indexOf('UTC') > 0) {
+    timeZone = 'UTC' + dateStr.substring(dateStr.indexOf('UTC') + 3, dateStr.indexOf('(')).trim()
+  }
+  return timeZone
+}

package/src/utils/jump-page-utils.js

@@ -243,7 +243,8 @@ function jumpToPageTwo(jumpPageSetting, system, dataId, ids, buttonCode, isHasId
         const frontendUrl = getSystemFrontendUrl(system.frontendUrl)
         path = frontendUrl + '/#' + path
       }
-      jumpToPageWithFullPath(dataId, path, additionalParameterStr, jumpPageSetting, ids, buttonCode, isHasIdParam)
+      const systemName = getSystemNameWithLanguage(system)
+      jumpToPageWithFullPath(dataId, path, additionalParameterStr, jumpPageSetting, ids, buttonCode, isHasIdParam, systemName)
       resolve()
     }
   })
@@ -255,16 +256,20 @@ function jumpToPageTwo(jumpPageSetting, system, dataId, ids, buttonCode, isHasId
  * @param {*} additionalParameterStr
  * @param {*} jumpPage
  */
-function jumpToPageWithFullPath(dataId, path, additionalParameterStr, jumpPage, ids, buttonCode, isHasIdParam) {
+function jumpToPageWithFullPath(dataId, path, additionalParameterStr, jumpPage, ids, buttonCode, isHasIdParam, systemName) {
   path = packagePathParams(dataId, path, jumpPage, ids, buttonCode, isHasIdParam)
   // 保持这种情况参数传递，是为了解决不同域时获得不到sessionStorage中存的附加参数问题
   if (additionalParameterStr && additionalParameterStr !== '') {
+    let systemNameParam = ''
+    if (systemName) {
+      systemNameParam = '&_systemName_=' + encodeURI(systemName)
+    }
     if (path.indexOf('?') !== -1) {
       path += '&'
-      path += additionalParameterStr
+      path += additionalParameterStr + systemNameParam
     } else {
       path += '?'
-      path += additionalParameterStr
+      path += additionalParameterStr + systemNameParam
     }
   }
   let jumpMode = 'refresh'
@@ -448,10 +453,28 @@ function openDialogWhenPopup(jumpPageSetting, system, pageCode, dataId, jumpMode
 
 function packageOpenUrl(system, pageCode, dataId, jumpPageSetting, jumpMode, ids, buttonCode, isHasIdParam) {
   const frontendUrl = getSystemFrontendUrl(system.frontendUrl)
-  const path = frontendUrl + '/#/dsc-full-screen/page?customSystem=' + system.code + '&pageCode=' + pageCode + '&jumpMode=' + jumpMode
+  let path = frontendUrl + '/#/dsc-full-screen/page?customSystem=' + system.code + '&pageCode=' + pageCode + '&jumpMode=' + jumpMode
+  const systemName = getSystemNameWithLanguage(system)
+  if (systemName) {
+    path += '&_systemName_=' + encodeURI(systemName)
+  }
   return packagePathParams(dataId, path, jumpPageSetting, ids, buttonCode, isHasIdParam)
 }
 
+function getSystemNameWithLanguage(system) {
+  if (system) {
+    let locale = 'cn'
+    if (window.$locale) {
+      locale = window.$locale
+    }
+    if (locale === 'cn') {
+      return system.name
+    } else {
+      return system.enName
+    }
+  }
+}
+
 // 解析跳转页面附带参数
 function analysisAdditionalParameter(paramStoreId) {
   const additionalParamMap = sessionStorage.getItem(paramStoreId)

package/src/utils/permissionAuth.js

@@ -18,15 +18,19 @@ export function getSystemCode() {
 }
 
 export function getPermissions() {
+  const a = new Date().getTime()
   const systemCode = getSystemCode()
   const permissions = sessionStorage.getItem(permissionKey + systemCode)
   if (permissions) {
     return JSON.parse(permissions)
   }
+  const b = new Date().getTime()
+  sessionStorage.setItem('====getPermissions===>'+new Date().getTime()+'-执行时间=',(b-a)+'')
   return null
 }
 
 export function setPermissions(permissions) {
+  const a = new Date().getTime()
   const systemCode = getSystemCode()
   const permissionObjs = {}
   for (let i = 0; i < permissions.length; i++) {
@@ -34,6 +38,8 @@ export function setPermissions(permissions) {
     permissionObjs[permission] = true
   }
   sessionStorage.setItem(permissionKey + systemCode, JSON.stringify(permissionObjs))
+  const b = new Date().getTime()
+  sessionStorage.setItem('====setPermissions===>'+new Date().getTime()+'-执行时间=',(b-a)+'')
   return permissionObjs
 }
 

package/src/utils/request.js

@@ -13,7 +13,8 @@ import {
   getI18n
 } from './util'
 import {
-  getRelativeBaseUrl
+  getRelativeBaseUrl,
+  getTimeZone
 } from './common-util'
 // 创建axios实例
 const service = axios.create({
@@ -27,6 +28,8 @@ service.interceptors.request.use(
   config => {
     // 防止重复发送ajax请求
     store.commit('togglePreventReclick', true)
+    const timeZone = getTimeZone()
+    config.headers['timeZone'] = timeZone
     const token = getToken()
     if (token) {
       config.headers['Authorization'] = token // 让每个请求携带自定义token 请根据实际情况自行修改
@@ -128,6 +131,15 @@ service.interceptors.response.use(
         })
         return Promise.reject(error)
       }
+    } else {
+      const errorMsg = getI18n().t('imatrixUIMessage.internalServerError')
+      Message({
+        showClose: true,
+        message: errorMsg,
+        type: 'error',
+        duration: 5 * 1000
+      })
+      return Promise.reject(error)
     }
   }
 )