imatrix-ui 2.8.39-dw → 2.8.39-pvtmp

package/src/styles/theme/gray/input-style.scss

@@ -6,6 +6,14 @@
       height: 32px;
       line-height: 32px;
     }
+
+    .el-input.is-disabled .el-input__inner {
+      color: #606266;
+    }
+
+    .el-textarea.is-disabled .el-textarea__inner {
+      color: #606266;
+    }
   }
 
 }

package/src/styles/theme/gray/sidebar.scss

@@ -79,8 +79,11 @@
       }
 
       .el-menu {
+        position: static;
         border: none;
-        height: 100%;
+        // height: 100%;
+        height: auto;
+        max-height: 100vh;
         width: 100% !important;
         background-color: #FFF;
         color: #000D1F
@@ -188,13 +191,22 @@
     }
   }
 
+  .sidebar-container-popper .el-menu{
+    // height: 100vh;
+    height: auto;
+    max-height: 100vh;
+    overflow-y: auto;
+    overflow-x: hidden;
+    scroll-behavior: smooth;
+  }
+
   .sidebar-container-popper .el-submenu__title:not(.is-disabled):hover {
     background: #F7F7F8;
     color: rgba(0, 13, 31, 0.85);
     font-weight: 500;
   }
 
-  .sidebar-container-popper .el-menu .el-submenu.is-active>.el-submenu__title {
+  .sidebar-container-popper .el-menu-item.is-active,.sidebar-container-popper .el-menu .el-submenu.is-active>.el-submenu__title {
     background-color: #EBECFF !important;
     color: #3D4CF2;
     font-weight: 500;

package/src/utils/auth-api.js

@@ -0,0 +1,171 @@
+import Cookies from 'js-cookie'
+import Vue from 'vue'
+
+const jwtKey = 'JWT'
+const currentUserNameKey = 'USERNAME'
+const currentUserInfoKey = 'CURRENT_USER'
+const versionEnv = 'VERSION_ENVIRONMENT'
+const userVersion = 'CURRENT_USER_SYSTEM_VERSION'
+const langKey = 'CURRENT_LANGUAGE'
+const allLangKey = 'AMB_LANG_INFO'
+
+function getToken() {
+  let token = getCookieCache(jwtKey)
+  const projectModel = Vue.prototype.projectModel
+  if (!token && projectModel && projectModel === 'developing.model') {
+    // 如果是开发环境从sessionStorage中获得token
+    token = getSessionCache(jwtKey)
+  }
+  return token
+}
+
+function setToken(token) {
+  setCookieCache(jwtKey, token)
+  setSessionCache(jwtKey, token)
+}
+
+function removeToken() {
+  removeCookieCache(jwtKey)
+  removeSessionCache(jwtKey)
+}
+
+function getUsername() {
+  let username = getCookieCache(currentUserNameKey)
+  if (!username) {
+    username = getSessionCache(currentUserNameKey)
+  }
+  return username
+}
+
+function setUsername(username) {
+  setSessionCache(currentUserNameKey, username)
+  setCookieCache(currentUserNameKey, username)
+}
+
+function removeUsername() {
+  removeSessionCache(currentUserNameKey)
+  removeCookieCache(currentUserNameKey)
+}
+
+function getCurrentUser() {
+  let userJson = getCookieCache(currentUserInfoKey)
+  if (!userJson) {
+    userJson = getSessionCache(currentUserInfoKey)
+  }
+  if (userJson) {
+    return JSON.parse(userJson)
+  }
+}
+
+function setCurrentUser(userInfo) {
+  if (userInfo) {
+    if (userInfo.password) {
+      userInfo.password = null
+    }
+    const userinfoStr = JSON.stringify(userInfo)
+    setSessionCache(currentUserInfoKey, userinfoStr)
+    setCookieCache(currentUserInfoKey, userinfoStr)
+  }
+}
+
+function removeCurrentUser() {
+  removeSessionCache(currentUserInfoKey)
+  removeCookieCache(currentUserInfoKey)
+}
+
+function getCookieCache(key) {
+  return Cookies.get(key)
+}
+
+function setCookieCache(key, value) {
+  Cookies.set(key, value, {
+    path: '/'
+  })
+}
+
+function removeCookieCache(key) {
+  Cookies.remove(key, {
+    path: '/'
+  })
+}
+
+function getSessionCache(key) {
+  return sessionStorage.getItem(key)
+}
+
+function setSessionCache(key, value) {
+  return sessionStorage.setItem(key, value)
+}
+
+function removeSessionCache(key) {
+  sessionStorage.removeItem(key)
+}
+
+function removePublishControl() {
+  removeCookieCache(versionEnv)
+  removeCookieCache(userVersion)
+}
+
+function getLanguage() {
+  let language = getCookieCache(langKey)
+  const projectModel = Vue.prototype.projectModel
+  if (!language && projectModel && projectModel === 'developing.model') {
+    // 如果是开发环境从sessionStorage中获得token
+    language = getSessionCache(langKey)
+  }
+  return language
+}
+
+function setLanguage(lang) {
+  setCookieCache(langKey, lang)
+  setSessionCache(langKey, lang)
+}
+
+function removeLanguage() {
+  removeCookieCache(langKey)
+  removeSessionCache(langKey)
+}
+
+function getAllLanguages() {
+  let allLanguages = getCookieCache(allLangKey)
+  const projectModel = Vue.prototype.projectModel
+  if (!allLanguages && projectModel && projectModel === 'developing.model') {
+    // 如果是开发环境从sessionStorage中获得token
+    allLanguages = getSessionCache(allLangKey)
+  }
+  return allLanguages
+}
+
+function setAllLanguages(langs) {
+  setCookieCache(allLangKey, langs)
+  setSessionCache(allLangKey, langs)
+}
+
+function removeAllLanguages() {
+  removeCookieCache(allLangKey)
+  removeSessionCache(allLangKey)
+}
+export default {
+  getToken,
+  setToken,
+  removeToken,
+  getUsername,
+  setUsername,
+  removeUsername,
+  getCurrentUser,
+  setCurrentUser,
+  removeCurrentUser,
+  getCookieCache,
+  setCookieCache,
+  removeCookieCache,
+  getSessionCache,
+  setSessionCache,
+  removeSessionCache,
+  removePublishControl,
+  getLanguage,
+  setLanguage,
+  removeLanguage,
+  getAllLanguages,
+  setAllLanguages,
+  removeAllLanguages
+}

package/src/utils/auth.js

@@ -1,69 +1,103 @@
-import sessionStorage from 'sessionstorage'
-import Cookies from 'js-cookie'
-import Vue from 'vue'
+import authApi from './auth-api'
 
-const jwtKey = 'JWT'
-const currentUserNameKey = 'USERNAME'
-const currentUserInfoKey = 'CURRENT_USER'
+import { removeAllSystemPermissions } from './permissionAuth'
 
 export function getToken() {
-  let jwt = sessionStorage.getItem(jwtKey)
-  // console.log('auth-sessionStorage.getToken=', jwt)
-  if (!jwt) {
-    jwt = Cookies.get(jwtKey)
-    // console.log('auth-Cookies.getToken=', jwt)
-  }
-  return jwt
+  return authApi.getToken()
 }
 
 export function setToken(token) {
-  if (Vue.prototype.projectModel && Vue.prototype.projectModel === 'developing.model') {
-    // 如果是开发模式，需要设置cookie。不设置expires,就是session cookie,表示关闭浏览器，cookie即失效
-    // console.log('auth-Cookies.setToken=', token)
-    // 必须是“/”否则无法移除token
-    Cookies.set(jwtKey, token, { path: '/' })
-  } else {
-    // console.log('auth-sessionStorage.setToken=', token)
-    return sessionStorage.setItem(jwtKey, token)
-  }
+  authApi.setToken(token)
 }
 
 export function removeToken() {
-  sessionStorage.removeItem(jwtKey)
-  // console.log('auth-sessionStorage.removeToken=', getToken())
-  // 必须和setToken中的path“/”一致，否则无法移除token
-  Cookies.remove(jwtKey, { path: '/' })
-  // console.log('auth-Cookies.removeToken=', getToken())
+  authApi.removeToken()
 }
 
 export function getUsername() {
-  return sessionStorage.getItem(currentUserNameKey)
+  return authApi.getUsername()
 }
 
 export function setUsername(username) {
-  sessionStorage.setItem(currentUserNameKey, username)
+  authApi.setUsername(username)
 }
 
 export function removeUsername() {
-  sessionStorage.removeItem(currentUserNameKey)
+  authApi.removeUsername()
 }
 
 export function getCurrentUser() {
-  const userJson = sessionStorage.getItem(currentUserInfoKey)
-  if (userJson) {
-    return JSON.parse(userJson)
-  }
+  return authApi.getCurrentUser()
 }
 
 export function setCurrentUser(userInfo) {
-  if (userInfo) {
-    if (userInfo.password) {
-      userInfo.password = null
-    }
-    sessionStorage.setItem(currentUserInfoKey, JSON.stringify(userInfo))
-  }
+  authApi.setCurrentUser(userInfo)
 }
 
 export function removeCurrentUser() {
-  sessionStorage.removeItem(currentUserInfoKey)
+  authApi.removeCurrentUser()
+}
+
+export function getCookieCache(key) {
+  return authApi.getCookieCache(key)
+}
+
+export function setCookieCache(key, value) {
+  authApi.setCookieCache(key, value)
+}
+
+export function removeCookieCache(key) {
+  authApi.removeCookieCache(key)
+}
+
+export function getSessionCache(key) {
+  return authApi.getSessionCache(key)
+}
+
+export function setSessionCache(key, value) {
+  return authApi.setSessionCache(key, value)
+}
+
+export function removeSessionCache(key) {
+  authApi.removeSessionCache(key)
+}
+
+function removePublishControl() {
+  authApi.removePublishControl()
+}
+
+export function getLanguage() {
+  return authApi.getLanguage()
+}
+
+export function setLanguage(language) {
+  authApi.setLanguage(language)
+}
+
+function removeLanguage() {
+  authApi.removeLanguage()
+}
+
+export function getAllLanguages() {
+  return authApi.getAllLanguages()
+}
+
+export function setAllLanguages(langs) {
+  authApi.setAllLanguages(langs)
+}
+
+function removeAllLanguages() {
+  authApi.removeAllLanguages()
+}
+// 清空token时需要清除的缓存信息
+export function clearPermission() {
+  removeToken()
+  removeLanguage()
+  removeAllLanguages()
+
+  removeUsername()
+  removeCurrentUser()
+
+  removeAllSystemPermissions()
+  removePublishControl()
 }

package/src/utils/calculator/calculator-factory.js

@@ -45,7 +45,7 @@ class NumberCalculator extends CalculatorFactory {
       this.result = true
     } else if (this.isEQEmptyValue(leftVale, operator, rightValue)) {
       this.result = true
-    } else if (leftVale === null) {
+    } else if (leftVale === undefined || leftVale === null) {
       this.result = false
     } else {
       const preOperand = Number(leftVale + '')
@@ -81,7 +81,7 @@ class TextCalculator extends CalculatorFactory {
       this.result = true
     } else if (this.isNotNullValue(leftVale, operator)) {
       this.result = true
-    } else if (leftVale === null) {
+    } else if (leftVale === undefined || leftVale === null) {
       this.result = false
     } else {
       if (operator === 'NET') {

package/src/utils/calculator/calculator-util.js

@@ -31,10 +31,10 @@ export function parseSubTablePermissionCondition(express, dataTypeMap, parentEnt
   const OR = '||'
   let temp = express
   const strs = splitExpression(express)
-  console.log('分割后的原子表达式为：', strs)
+  // console.log('分割后的原子表达式为：', strs)
   let result = false
   for (let i = 0; i < strs.length; i++) {
-    console.log('开始分析原子表达式：', strs[i])
+    // console.log('开始分析原子表达式：', strs[i])
     const atomicExpress = strs[i]
     if (atomicExpress && atomicExpress.trim()) {
       const name = atomicExpress.substring(atomicExpress.indexOf(SQUARE_BRACKETS_LEFT) + SQUARE_BRACKETS_LEFT.length, atomicExpress.indexOf(SQUARE_BRACKETS_RIGHT))
@@ -44,9 +44,9 @@ export function parseSubTablePermissionCondition(express, dataTypeMap, parentEnt
         dataType = dataTypeMap[name]
       }
       result = parseFieldCondition(atomicExpress, dataType, parentEntity, subEntity, additionalParamMap, task, contextParameterMap)
-      console.log('原子表达式：', atomicExpress, '的分析结果为 ', result)
+      // console.log('原子表达式：', atomicExpress, '的分析结果为 ', result)
       temp = temp.replace(atomicExpress.trim(), result + '')
-      console.log('将原子表达式替换为它的结果后：', temp)
+      // console.log('将原子表达式替换为它的结果后：', temp)
     }
   }
   temp = temp.replace(/condition.operator.and/g, AND)
@@ -57,7 +57,7 @@ export function parseSubTablePermissionCondition(express, dataTypeMap, parentEnt
   if (temp.trim().endsWith(AND)) {
     temp = temp.substring(0, temp.lastIndexOf(AND))
   }
-  console.log('最终该流向的表达式为：', temp)
+  // console.log('最终该流向的表达式为：', temp)
   // eslint-disable-next-line no-eval
   return eval('(' + temp + ')')
 }
@@ -97,12 +97,12 @@ function parseFieldCondition(atomicExpress, dataType, parentEntity, subEntity, a
       return false
     }
   }
-  console.log('对应值为：', value)
+  // console.log('对应值为：', value)
   const CalculatorWf = getAbstractUserFactoryWf(dataType)
   const subExpression = atomicExpress.replace(fieldInfo, value)
   const calculatorObj = new CalculatorWf(subExpression)
   const result = calculatorObj.result
-  console.log('判断结果为：', result)
+  // console.log('判断结果为：', result)
   return result
 }
 

package/src/utils/common-util.js

@@ -1,5 +1,6 @@
 import sessionStorage from 'sessionstorage'
 import Vue from 'vue'
+import { getToken, getLanguage, getAllLanguages, setAllLanguages } from './auth'
 /**
  * 获得相对地址
  */
@@ -169,7 +170,7 @@ export function isPlateSys(systemCode) {
       systemCode === 'mms' || systemCode === 'task' ||
       systemCode === 'wf' || systemCode === 'dc' ||
       systemCode === 'mc' || systemCode === 'mobile' ||
-      systemCode === 'acs' || systemCode === 'bs')) {
+      systemCode === 'acs' || systemCode === 'bs' || systemCode === 'pcm')) {
     return true
   } else {
     return false
@@ -202,3 +203,135 @@ 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
+}
+
+export function isMobileBrowser() {
+  if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini|Opera Mobi|Windows CE|Symbian|Windows Phone|POLARIS|lgtelecom|nokia|SonyEricsson|LG|SAMSUNG|Samsung/i
+    .test(navigator.userAgent)) {
+    // 移动端浏览器
+    return true
+  } else {
+    // PC浏览器
+    return false
+  }
+}
+
+export function getLocaleByLang(lang) {
+  let locale = 'cn'
+  if (lang && lang.indexOf('_') > 0) {
+    const language = lang.substring(0, lang.indexOf('_'))
+    locale = language
+  }
+  if (locale === 'zh') {
+    locale = 'cn'
+  }
+  return locale
+}
+
+export function cacheLangs(langs) {
+  let langResult
+  if (langs) {
+    langResult = JSON.stringify(langs)
+  }
+  return setAllLanguages(langResult)
+}
+
+export function getLangs() {
+  return getAllLanguages()
+}
+/**
+ *
+ * @param {*} langShort 例如：cn或en
+ * @returns 例如：zh_CN或en_US
+ */
+export function getLangByShort(langShort) {
+  let lang
+  const langResultJson = getLangs()
+  if (langResultJson) {
+    const langObj = JSON.parse(langResultJson)
+    lang = langObj[langShort]
+  }
+  if (!lang) {
+    lang = 'zh_CN'
+  }
+  return lang
+}
+
+// 首次加载业务系统时，缓存所有语言
+export function cacheAllLanguagesUtil(http) {
+  return new Promise((resolve, reject) => {
+    const token = getToken()
+    if (token) {
+      const cookieCacheLangs = getLangs()
+      if (cookieCacheLangs) {
+        setAllLanguages(cookieCacheLangs)
+        resolve()
+      } else {
+        http.get(Vue.prototype.baseAPI + '/component/all-languages').then((langList) => {
+          const langResult = {}
+          if (langList) {
+            langList.forEach(item => {
+              // 例如：zh_CN、en_US
+              const lang = item.value
+              let langShort
+              if (lang.indexOf('_') > 0) {
+                langShort = lang.substring(0, lang.indexOf('_'))
+              }
+              if (langShort && langShort === 'zh') {
+                // 中文处理，为了兼容历史逻辑
+                langShort = 'cn'
+              }
+              if (langShort) {
+                langResult[langShort] = lang
+              }
+            })
+          }
+          cacheLangs(langResult)
+          resolve()
+        })
+      }
+    } else {
+      resolve()
+    }
+  })
+}
+
+// 首次加载业务系统时，缓存当前用户语言
+export function cacheCurrentLanguageUtil(http) {
+  return new Promise((resolve, reject) => {
+    const token = getToken()
+    if (token) {
+      const currentLanguage = getLanguage()
+      if (currentLanguage) {
+        resolve(currentLanguage)
+      } else {
+        http.get(Vue.prototype.baseAPI + '/acs/user-languages').then((currentLanguage) => {
+          resolve(currentLanguage)
+        })
+      }
+    } else {
+      // 默认是中文
+      resolve('zh_CN')
+    }
+  })
+}

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

@@ -148,7 +148,7 @@ export function jumpToPage(jumpPageSetting, system, dataId, entity, additionalPa
         // 表单页面
         paramMap.entity = entity
         paramMap.additionalParamMap = additionalParamMap
-        console.log('paramMap.parentFormData', parentFormData)
+        // console.log('paramMap.parentFormData', parentFormData)
         paramMap.parentFormData = parentFormData
         const isHasIdParam = isHasIdAdditionalParam(jumpPageSetting.jumpPageAdditional)
 
@@ -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'
@@ -326,12 +331,14 @@ function packagePathParams(dataId, path, jumpPage, ids, buttonCode, isHasIdParam
     }
   }
   if (ids && ids.length > 0) {
+    const idsStr = ids.join(',')
+    const idsPath = 'ids=' + idsStr + '&_idsStr=' + idsStr
     if (path.indexOf('?') !== -1) {
       path += '&'
-      path += 'ids=' + ids.join(',')
+      path += idsPath
     } else {
       path += '?'
-      path += 'ids=' + ids.join(',')
+      path += idsPath
     }
   }
   if (buttonCode) {
@@ -355,7 +362,7 @@ function getPageCode(jumpPageUrl) {
 function jumpWithSuperPage(jumpPageUrl, system, dataId, jumpPageSetting, ids, buttonCode, isHasIdParam) {
   return new Promise((resolve, reject) => {
     // 表示是自定义系统跳转页面编码
-    console.log('----jumpWithSuperPage---', jumpPageUrl, system, dataId, jumpPageSetting)
+    // console.log('----jumpWithSuperPage---', jumpPageUrl, system, dataId, jumpPageSetting)
     const pageCode = getPageCode(jumpPageUrl)
     let jumpMode = 'refresh'
     if (jumpPageSetting) {
@@ -422,6 +429,7 @@ function openDialogWhenPopup(jumpPageSetting, system, pageCode, dataId, jumpMode
     popPageSetting.valueMappings = jumpPageSetting.valueMappings
     popPageSetting.updateValueEvent = jumpPageSetting.updateValueEvent
     popPageSetting.closeEvent = jumpPageSetting.closeEvent
+    popPageSetting.isRefreshWhenClosePopup = jumpPageSetting.isRefreshWhenClosePopup
   }
   // 是否是自定义系统
   let isDsc = false
@@ -448,10 +456,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)
@@ -464,7 +490,7 @@ function analysisAdditionalParameterWithMap(additionalParamMap) {
   if (additionalParamMap) {
     const additionalParameterMap = JSON.parse(additionalParamMap)
     const keys = Object.keys(additionalParameterMap)
-    console.log('analysisAdditionalParameterWithMap--Object.keys(additionalParameterMap)=', keys)
+    // console.log('analysisAdditionalParameterWithMap--Object.keys(additionalParameterMap)=', keys)
     for (let i = 0; i < keys.length; i++) {
       if (additionalParameterStr !== '') {
         additionalParameterStr += '&'