imatrix-ui 2.8.2-dw → 2.8.2-tmp2

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

@@ -5,7 +5,7 @@
     background: rgb(255, 255, 255);
     line-height: 72px;
     height: 72px;
-    position: fixed;
+    position: absolute;
     z-index: 100;
     top: 0px;
     left: 0px;
@@ -17,7 +17,7 @@
     background: rgb(255, 255, 255);
     line-height: 72px;
     height: 72px;
-    position: fixed;
+    position: absolute;
     bottom: 0px;
     z-index: 100;
     left: 0px;

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/utils/auth-api.js

@@ -0,0 +1,115 @@
+import Cookies from 'js-cookie'
+import Vue from 'vue'
+
+const jwtKey = 'JWT'
+const currentUserNameKey = 'USERNAME'
+const currentUserInfoKey = 'CURRENT_USER'
+
+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)
+}
+export default {
+  getToken,
+  setToken,
+  removeToken,
+  getUsername,
+  setUsername,
+  removeUsername,
+  getCurrentUser,
+  setCurrentUser,
+  removeCurrentUser,
+  getCookieCache,
+  setCookieCache,
+  removeCookieCache,
+  getSessionCache,
+  setSessionCache,
+  removeSessionCache
+}

package/src/utils/auth.js

@@ -1,48 +1,61 @@
-import sessionStorage from 'sessionstorage'
-import Cookies from 'js-cookie'
-import Vue from 'vue'
-
-const jwtKey = 'JWT'
-const currentUserNameKey = 'USERNAME'
+import authApi from './auth-api'
 
 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() {
+  return authApi.getCurrentUser()
+}
+
+export function setCurrentUser(userInfo) {
+  authApi.setCurrentUser(userInfo)
+}
+
+export function removeCurrentUser() {
+  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)
 }

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/common-util.js

@@ -189,3 +189,37 @@ export function getServerConfigUtil(http) {
     })
   })
 }
+/**
+ * postmessage跨域传message时获得orign路径使用
+ * @returns orign路径
+ */
+export function getOrignUrl() {
+  const url = window.location.href
+  let orignUrl
+  if (url && url.indexOf('/') > 0) {
+    const urls = url.split('/')
+    orignUrl = urls[0] + '//' + urls[2]
+  }
+  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'
@@ -421,6 +426,7 @@ function openDialogWhenPopup(jumpPageSetting, system, pageCode, dataId, jumpMode
     popPageSetting.jumpPageHeight = jumpPageSetting.jumpPageHeight
     popPageSetting.valueMappings = jumpPageSetting.valueMappings
     popPageSetting.updateValueEvent = jumpPageSetting.updateValueEvent
+    popPageSetting.closeEvent = jumpPageSetting.closeEvent
   }
   // 是否是自定义系统
   let isDsc = false
@@ -447,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/menu.js

@@ -0,0 +1,19 @@
+import { getLanguageWithLocale } from './util'
+
+export function getI18nName(menu) {
+  if (!menu) {
+    return
+  }
+  if (menu.i18Names) {
+    const language = getLanguageWithLocale()
+    const i18Names = JSON.parse(menu.i18Names)
+    if (i18Names[language]) {
+      return i18Names[language]
+    }
+  }
+  if (menu.i18nValue) {
+    return menu.i18nValue
+  } else {
+    return menu.name
+  }
+}

package/src/utils/permission.js

@@ -24,3 +24,7 @@ export default function checkPermission(permission) {
     return false
   }
 }
+
+export {
+  checkPermission
+}

package/src/utils/permissionAuth.js

@@ -2,24 +2,35 @@ import sessionStorage from 'sessionstorage'
 import Vue from 'vue'
 
 const permissionKey = 'PERMISSION-'
+const permissionMenuKey = 'PERMISSION_MENU-'
 export function getSystemCode() {
-  let systemCode = Vue.prototype.systemCode
+  let systemCode
   if (Vue.prototype.customSystem) {
     systemCode = Vue.prototype.customSystem
+  } else {
+    systemCode = Vue.prototype.systemCode
   }
+  // let systemCode = Vue.prototype.systemCode
+  // if (Vue.prototype.customSystem) {
+  //   systemCode = Vue.prototype.customSystem
+  // }
   return systemCode
 }
 
 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++) {
@@ -27,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
 }
 
@@ -41,3 +54,37 @@ export function removePermissions() {
   }
 }
 
+export function getMenus(systemCode) {
+  if (!systemCode) {
+    systemCode = getSystemCode()
+  }
+  const permissions = sessionStorage.getItem(permissionMenuKey + systemCode)
+  if (permissions) {
+    return JSON.parse(permissions)
+  }
+  return null
+}
+
+export function setMenus(menus, systemCode) {
+  if (menus) {
+    if (!systemCode) {
+      systemCode = getSystemCode()
+    }
+    sessionStorage.setItem(permissionMenuKey + systemCode, JSON.stringify(menus))
+    return menus
+  }
+}
+
+export function removeMenus(systemCode) {
+  if (!systemCode) {
+    systemCode = getSystemCode()
+  }
+  sessionStorage.removeItem(permissionMenuKey + systemCode)
+  for (var i = 0; i < sessionStorage.length; i++) {
+    var key = sessionStorage.key(i)
+    if (key.indexOf(permissionMenuKey) >= 0) {
+      sessionStorage.removeItem(key)
+    }
+  }
+}
+

package/src/utils/request.js

@@ -1,7 +1,7 @@
 import axios from 'axios'
 import {
   Message
-} from '@gcommon/gcommon-ui'
+} from 'element-ui'
 import {
   getToken,
   removeToken
@@ -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 请根据实际情况自行修改
@@ -112,6 +115,10 @@ service.interceptors.response.use(
         }
         console.log(message)
         let errorMsg = getI18n().t('imatrixUIMessage.internalServerError')
+        if (message && message !== 'Internal Server Error') {
+          // 表示显示原始异常
+          errorMsg = message
+        }
         if (message && (message === 'gateway.timeout' || message === 'gateway.callFailed')) {
           // 网关的fallback返回的异常信息“接口调用超时”、“接口调用失败”
           errorMsg = getI18n().t(message)
@@ -124,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)
     }
   }
 )

package/src/utils/util.js

@@ -218,7 +218,7 @@ function parseCondition(entity, conditionList, isSql, tableName, additionalParam
       }
     }
     conditions += conditionResult + ' '
-    if (leftBracket && leftBracket !== null && leftBracket !== '') {
+    if (rightBracket && rightBracket !== null && rightBracket !== '') {
       conditions = conditions + rightBracket
       conditions = conditions + (' ')
       // conditions.append(rightBracket).append(' ')
@@ -237,8 +237,12 @@ function parseCondition(entity, conditionList, isSql, tableName, additionalParam
     }
   }
   console.log('parseCondition----conditions=', conditions)
-  // eslint-disable-next-line no-eval
-  return eval('(' + conditions + ')')
+  if (conditions) {
+    // eslint-disable-next-line no-eval
+    return eval('(' + conditions + ')')
+  } else {
+    return true
+  }
 }
 const REPLACE_DOT = '__'
 
@@ -393,7 +397,7 @@ export function analysisValue(conditionValue, entity, additionalParameter, conte
 }
 
 /**
- * 设置entity中某属性的值,处理子对象的情况
+ * 设置entity中某属性的值,处理子对象的情况。使用该方法，性能可能有问题
  * @param {*} entity
  * @param {*} prop
  * @param {*} value
@@ -403,10 +407,23 @@ export function setEntityFieldValue(entity, prop, value) {
     if (prop && prop.indexOf('.') > 0) {
       const parentObj = getParentObjectUtil(prop, entity)
       if (parentObj) {
-        Vue.set(parentObj, prop.substring(prop.lastIndexOf('.') + 1), value)
+        const subProp = prop.substring(prop.lastIndexOf('.') + 1)
+        if (parentObj[subProp] === undefined) {
+          // 动态对象属性赋值，防止属性不存在，导致属性无法赋值问题
+          Vue.set(parentObj, prop.substring(prop.lastIndexOf('.') + 1), value)
+        } else {
+          // 静态对象属性赋值，提高性能
+          parentObj[subProp] = value
+        }
       }
     } else {
-      Vue.set(entity, prop, value)
+      if (entity[prop] === undefined) {
+        // 动态对象属性赋值，防止属性不存在，导致属性无法赋值问题
+        Vue.set(entity, prop, value)
+      } else {
+        // 静态对象属性赋值，提高性能
+        entity[prop] = value
+      }
     }
   }
 }

package/src/views/404.vue

@@ -2,26 +2,30 @@
   <div class="wscn-http404-container">
     <div class="wscn-http404">
       <div class="pic-404">
-        <img class="pic-404__parent" src="@/assets/404/404.png" alt="404">
-        <img class="pic-404__child left" src="@/assets/404/404-cloud.png" alt="404">
-        <img class="pic-404__child mid" src="@/assets/404/404-cloud.png" alt="404">
-        <img class="pic-404__child right" src="@/assets/404/404-cloud.png" alt="404">
+        <img class="pic-404__parent" src="../../assets/404/404.png" alt="404">
+        <img class="pic-404__child left" src="../../assets/404/404-cloud.png" alt="404">
+        <img class="pic-404__child mid" src="../../assets/404/404-cloud.png" alt="404">
+        <img class="pic-404__child right" src="../../assets/404/404-cloud.png" alt="404">
       </div>
       <div class="bullshit">
-        <div class="bullshit__oops">
+        <!-- <div class="bullshit__oops">
           OOPS!
         </div>
         <div class="bullshit__info">
           版权所有
-          <a class="link-type" href="https://wallstreetcn.com" target="_blank">华尔街见闻</a>
-        </div>
+          <a class="link-type" href="https://wallstreetcn.com" target="_blank">
+            华尔街见闻
+          </a>
+        </div> -->
         <div class="bullshit__headline">
           {{ message }}
         </div>
         <div class="bullshit__info">
-          请检查您输入的网址是否正确，请点击以下按钮返回主页或者发送错误报告
+          请检查您输入的网址是否正确
         </div>
-        <a href="" class="bullshit__return-home">返回首页</a>
+        <!-- <a href="" class="bullshit__return-home">
+          返回首页
+        </a> -->
       </div>
     </div>
   </div>
@@ -33,7 +37,7 @@ export default {
   name: 'Page404',
   computed: {
     message() {
-      return '网管说这个页面你不能进......'
+      return '页面不存在'
     }
   }
 }

package/src/views/dsc-component/Sidebar/Item.vue

@@ -29,13 +29,13 @@ export default {
       if (icon.indexOf('fa-') === 0) {
         // 表示以“fa-”开头，使用font-awesome中的图标
         icon = 'fa ' + icon
-        vnodes.push(<div style='display: inline-block;'><i class={icon}/></div>)
+        vnodes.push(<div style='display: inline-block;overflow:hidden;'><i class={icon}/></div>)
       } else if (icon.indexOf('svg-') === 0) {
         icon = icon.substring(icon.indexOf('svg-') + 4)
-        vnodes.push(<div style='display: inline-block;'><svg-icon icon-class={icon}/></div>)
+        vnodes.push(<div style='display: inline-block;overflow:hidden;'><svg-icon icon-class={icon}/></div>)
       } else {
         icon += ' svg-icon'
-        vnodes.push(<div style='display: inline-block;'><i class={icon}/></div>)
+        vnodes.push(<div style='display: inline-block;overflow:hidden;'><i class={icon}/></div>)
       }
     }