imatrix-ui 2.8.21 → 2.8.22-boe2

package/src/styles/theme/dark-blue/sidebar.scss

@@ -6,30 +6,26 @@
     .main-container {
       height: 100%;
       transition: margin-left .28s;
-      margin-left: 210px;
+      margin-left: 224px;
       // padding-left: 24px;
       position: relative;
       background: #F8F9FA;
 
       .nav-tab {
-        padding-top: 0px;
-        padding-left: 0px;
-        .el-tabs__header{
-          padding-left: 24px;
-        }
+        padding-top: 5px;
+        padding-left: 5px;
       }
     }
 
     // 侧边栏
     .sidebar-container {
       transition: width 0.28s;
-      width: 210px !important;
+      width: 224px !important;
       height: 100%;
       position: fixed;
       top: 0;
       bottom: 0;
       left: 0;
-      padding-top: 16px;
       z-index: 1001;
       overflow: hidden;
       font-weight: medium;
@@ -173,11 +169,11 @@
 
     .sidebar-container .nest-menu .el-submenu>.el-submenu__title,
     .sidebar-container .el-submenu .el-menu-item {
-      min-width: 180px !important;
+      min-width: 224px !important;
     }
 
     .sidebar-container .el-menu--collapse .el-menu .el-submenu {
-      min-width: 180px !important;
+      min-width: 224px !important;
     }
 
     .sidebar-container .el-menu--collapse .el-submenu.is-active>.el-submenu__title,
@@ -185,7 +181,7 @@
       background-color: #FFFFFF !important;
       color: #1A6BF3;
       font-weight: medium;
-      border-left: 4px solid #1A6BF3
+      border-right: 2px solid #3D4CF2
     }
 
     .sidebar-container .el-menu--collapse .el-submenu__title:not(.is-disabled):hover,
@@ -227,10 +223,6 @@
     }
   }
 
-  .sidebar-container-popper {
-    width: 180px;
-  }
-
   .sidebar-container-popper .el-submenu__title:not(.is-disabled):hover {
     background: #F7F7F8;
     color: rgba(0, 13, 31, 0.85);
@@ -259,33 +251,11 @@
     text-align: left;
   }
 
-  //侧边弹出菜单样式
-  .sidebar-container-popper .el-menu-item {
-    height: 46px;
-    line-height: 46px;
-    font-weight: medium;
-    color: #A4ABB8;
-    min-width: 164px;
-  }
-
-  .sidebar-container-popper .el-submenu__title {
-    height: 46px;
-    line-height: 46px;
-    color: #A4ABB8;
-    font-weight: medium;
-  }
 
   .sidebar-container-popper .el-menu--collapse {
     text-align: left;
   }
 
-  .sidebar-container-popper .el-menu--popup {
-    min-width: 180px;
-    padding: 12px 8px 12px 8px;
-  }
-
-
-
   .el-menu--vertical {
     &>.el-menu {
       .svg-icon {

package/src/styles/theme/dark-blue/table.scss

@@ -22,6 +22,7 @@
   // }
 
   .el-table .el-table__cell {
+    color: $table-cell-font-color;
     padding: 0;
   }
 
@@ -38,7 +39,6 @@
 
   // 表格内容颜色
   .el-table .cell {
-    color: $table-cell-font-color;
     font-family: Source Han Sans CN;
     font-weight: regular;
     font-size: 14px;

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

@@ -38,5 +38,17 @@
 
 
   }
-
+  .gray_card_box {
+    border-radius: 6px;
+    background: #FFFFFF;
+    padding: 20px;
+    box-shadow: 0px 1px 8px 0px #00000019;
+    box-sizing: border-box;
+    overflow-y: scroll;
+  }
+  .gray_buttomBtn_box{
+    position: fixed;
+    bottom: 0;
+    right: 4%;
+  }
 }

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

@@ -29,4 +29,42 @@
       color: rgba(0, 13, 31, 0.85);
     }
   }
+
+  .page-layout__title {
+    width: 46px;
+    height: 16px;
+    font-size: 11px;
+    font-weight: 500;
+    color: #333333;
+    line-height: 13px;
+  }
+
+  .component-type-name__title {
+    width: 40px;
+    height: 14px;
+    font-size: 10px;
+    font-weight: 500;
+    color: #333333;
+    line-height: 12px;
+    // -webkit-background-clip: text;
+    // -webkit-text-fill-color: transparent;
+  }
+
+  .page-layout__title::before {
+    content: "";
+    text-align: center;
+    background: #1A6BF3;
+    float: left;
+    position: relative;
+    border-radius: 3px;
+    /** 定义成 block 元素 **/
+    display: block;
+    // height: 21px;
+    // width: 4px;
+    margin-right: 12px;
+
+    width: 2px;
+    height: 16px;
+
+  }
 }

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

@@ -3,7 +3,7 @@
 @import './card-style.scss';
 @import './tab-style.scss';
 @import './input-style.scss';
-@import './form-style.scss';
+@import './scrollbar-style.scss';
 
 .gray {
   font-family: microsoft yahei, Arial, Helvetica, sans-serif;
@@ -76,8 +76,9 @@
   }
 
   .app-container {
-    // padding: 20px;
-    padding: 0px;
+    padding: 20px;
+    border-radius: 6px;
+    box-shadow: 0px 1px 8px 0px #00000019;
 
     .box-card {
       margin: 16px 24px;
@@ -95,26 +96,6 @@
   }
 
 
-  .form-container {
-    height: calc(100vh - 82px);
-    overflow: auto;
-  }
-
-  .form-container .el-form .el-card {
-    margin-bottom: 10px;
-  }
-
-  .form-container .el-form .el-card:last-child {
-    margin-bottom: 0;
-  }
-
-  // 带有tab页签的表单高度
-  .tab-form-container {
-    height: calc(100vh - 190px);
-    overflow: auto;
-  }
-
-
   // 解决tab页签中内容多时没有滚动条问题
   .el-tabs__content {
     flex-grow: 1;
@@ -173,12 +154,19 @@
   .el-table th {
     padding: 0;
   }
+
   /**表格内容纵向分隔线去掉**/
-  .el-table--border td, .el-table--border th, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
+  .el-table--border td,
+  .el-table--border th,
+  .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
     border-right: 0px
   }
+
   /**表格标题纵向分隔线颜色调浅点儿**/
-  .el-table--border td, .el-table--border th,.el-table--border th.is-leaf, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
+  .el-table--border td,
+  .el-table--border th,
+  .el-table--border th.is-leaf,
+  .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
     border-right: 1px solid #fefefe;
   }
 }

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

@@ -0,0 +1,32 @@
+.dark-blue {
+
+  // 滚动条基础样式
+  ::-webkit-scrollbar {
+    width: 6px; // 纵向的宽度
+    height: 8px; // 横向的高度
+  }
+
+  // 默认下滚动条的样式
+  ::-webkit-scrollbar-thumb {
+    background: #eaeaea;
+    border: none;
+    border-radius: 4px;
+  }
+
+  // 鼠标悬停在滚动条时的样式
+  ::-webkit-scrollbar-thumb:hover {
+    background: rgba(157, 165, 183, 0.7)
+  }
+
+  // 滚动条区域 空白地方的样式
+  ::-webkit-scrollbar-track {
+    background-color: transparent;
+    border: none;
+  }
+
+  // 鼠标悬停在滚动条时 滚动条区域 空白地方的样式
+  ::-webkit-scrollbar-track:hover {
+    background-color: #eaeaea;
+    border: none;
+  }
+}

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

@@ -8,6 +8,11 @@
       transition: margin-left .28s;
       margin-left: 224px;
       position: relative;
+
+      .nav-tab {
+        padding-top: 5px;
+        padding-left: 5px;
+      }
     }
 
     // 侧边栏

package/src/utils/auth-api.js

@@ -4,6 +4,7 @@ import Vue from 'vue'
 const jwtKey = 'JWT'
 const currentUserNameKey = 'USERNAME'
 const currentUserInfoKey = 'CURRENT_USER'
+const currentSystemUrlKey = 'CURRENT_SYSTEM_URL_'
 
 function getToken() {
   let token = getCookieCache(jwtKey)
@@ -96,6 +97,45 @@ function setSessionCache(key, value) {
 function removeSessionCache(key) {
   sessionStorage.removeItem(key)
 }
+
+function getSystemCacheUrlByCode(systemCode) {
+  if (!systemCode) {
+    systemCode = Vue.prototype.customSystem
+  }
+  if (!systemCode) {
+    systemCode = Vue.prototype.systemCode
+  }
+  if (systemCode) {
+    const systemUrls = getSystemCacheUrl()
+    if (systemUrls) {
+      return systemUrls[systemCode]
+    }
+  }
+}
+
+function getSystemCacheUrl() {
+  let systemUrlJson = getCookieCache(currentSystemUrlKey)
+  if (!systemUrlJson) {
+    systemUrlJson = getSessionCache(currentSystemUrlKey)
+  }
+  if (systemUrlJson) {
+    return JSON.parse(systemUrlJson)
+  }
+}
+
+function setSystemCacheUrl(systemUrlObj) {
+  if (systemUrlObj) {
+    const systemUrlStr = JSON.stringify(systemUrlObj)
+    setSessionCache(currentSystemUrlKey, systemUrlStr)
+    setCookieCache(currentSystemUrlKey, systemUrlStr)
+  }
+}
+
+function removeSystemCacheUrl() {
+  removeSessionCache(currentSystemUrlKey)
+  removeCookieCache(currentSystemUrlKey)
+}
+
 export default {
   getToken,
   setToken,
@@ -111,5 +151,9 @@ export default {
   removeCookieCache,
   getSessionCache,
   setSessionCache,
-  removeSessionCache
+  removeSessionCache,
+  getSystemCacheUrlByCode,
+  getSystemCacheUrl,
+  setSystemCacheUrl,
+  removeSystemCacheUrl
 }

package/src/utils/common-util.js

@@ -223,3 +223,14 @@ export function getTimeZone() {
   }
   return timeZone
 }
+
+export function setCustomSystemBackendUrl(customSystem) {
+  // 重新缓存系统后台路径
+  if (!Vue.prototype.projectModel || Vue.prototype.projectModel !== 'developing.model') {
+    // 表示是生产环境时，需要根据数据库配置获得对应的后端地址
+    const backendUrl = window.$authApi.getSystemCacheUrlByCode(customSystem)
+    if (backendUrl) {
+      Vue.prototype.baseURL = getRelativeBaseUrl(backendUrl)
+    }
+  }
+}

package/src/utils/range-selector.js

@@ -0,0 +1,185 @@
+export function getFirstDayOfSeason(date) {
+  var month = new Date(date).getMonth()
+  if (month < 3) {
+    date.setMonth(0)
+  } else if (month > 2 && month < 6) {
+    date.setMonth(3)
+  } else if (month > 5 && month < 9) {
+    date.setMonth(6)
+  } else if (month > 8 && month < 11) {
+    date.setMonth(9)
+  }
+  date.setDate(1)
+  return formatDate(date)
+}
+export function getWeekOfSeason(date) {
+  const weekTime = date.getDay() - 1
+  if (weekTime === -1) {
+    return date.getTime() - 6 * 24 * 60 * 60 * 1000
+  } else {
+    return date.getTime() - weekTime * 24 * 60 * 60 * 1000
+  }
+}
+
+function formatDate(time) {
+  const date = new Date(time) // 创建Date对象
+  const year = date.getFullYear() // 获取年份
+  const month = date.getMonth() + 1 // 获取月份，记得+1
+  const day = date.getDate() // 获取日期
+  return `${year}-${month}-${day}` // 返回格式化后的日期字符串
+}
+
+export function formatTimefn(format, dateTime) {
+  if (format === undefined || format === null || format === '') { return dateTime }
+  const nowTime = new Date(dateTime)
+  const year = nowTime.getFullYear()
+  const month = nowTime.getMonth() + 1
+  const date = nowTime.getDate()
+  const hour = nowTime.getHours()
+  const minute = nowTime.getMinutes()
+  const second = nowTime.getSeconds()
+
+  function getCharCount(char) {
+    var regex = new RegExp(char, 'g') // 使用g表示整个字符串都要匹配
+    var result = format.match(regex) // match方法可在字符串内检索指定的值，或找到一个或多个正则表达式的匹配。
+    var count = !result ? 0 : result.length
+    return count
+  }
+  function setDateItem(oneUnit, twoUnit, itemDate) {
+    if (getCharCount(oneUnit) === 1) {
+      format = format.replace(oneUnit, itemDate)
+    } else if (getCharCount(oneUnit) === 2 && itemDate < 10) {
+      format = format.replace(twoUnit, '0' + itemDate)
+    } else {
+      format = format.replace(twoUnit, itemDate)
+    }
+  }
+  // 获取第几周
+  function getYearWeek(a, b, c) { // a为年 b为月 c为日
+    var date1 = new Date(a, parseInt(b) - 1, c)
+    var date2 = new Date(a, 0, 1)
+    var d = Math.round((date1.valueOf() - date2.valueOf()) / 86400000)
+    return Math.ceil((d + ((date2.getDay() + 1) - 1)) / 7)
+  }
+
+  if (format.indexOf('y') !== -1) {
+    format = format.replace('yyyy', year)
+  }
+
+  if (format.indexOf('M') !== -1) {
+    setDateItem('M', 'MM', month)
+  }
+
+  if (format.indexOf('W') !== -1) {
+    const week = getYearWeek(year, month, date)
+    setDateItem('W', 'WW', week)
+  }
+  if (format.indexOf('d') !== -1) {
+    setDateItem('d', 'dd', date)
+  }
+
+  if (format.indexOf('H') !== -1) {
+    setDateItem('H', 'HH', hour)
+  }
+
+  if (format.indexOf('m') !== -1) {
+    setDateItem('m', 'mm', minute)
+  }
+
+  if (format.indexOf('s') !== -1) {
+    setDateItem('s', 'ss', second)
+  }
+  return format
+}
+
+export function getDateRangeSelectorDefaultValue(stareScopeTimeType, format) {
+  let Staretime = ''
+  const endTime = new Date()
+  const computeTime = new Date()
+  if (stareScopeTimeType === 'oneYear') {
+    // 近一年
+    const yearTime = endTime.getFullYear()
+    computeTime.setFullYear(yearTime)
+    computeTime.setMonth(0)
+    Staretime = computeTime.setDate(1)
+  } else if (stareScopeTimeType === 'twoYear') {
+    // 近两年
+    const yearTime = endTime.getFullYear() - 1
+    computeTime.setFullYear(yearTime)
+    computeTime.setMonth(0)
+    Staretime = computeTime.setDate(1)
+  } else if (stareScopeTimeType === 'oneQuarter') {
+    // 近一个季度
+    Staretime = new Date(getFirstDayOfSeason(computeTime))
+  } else if (stareScopeTimeType === 'twoQuarter') {
+    // 近两个季度
+    const timeMonth = computeTime.getMonth()
+    if (endTime.getMonth < 3) {
+      const yeaNum = computeTime.getFullYear() - 1
+      computeTime.setFullYear(yeaNum)
+      computeTime.setMonth(10)
+    } else {
+      computeTime.setMonth(timeMonth - 3)
+    }
+    Staretime = new Date(getFirstDayOfSeason(computeTime))
+  } else if (stareScopeTimeType === 'threeQuarter') {
+    // 近三个季度
+    const timeMonth = computeTime.getMonth()
+    if (endTime.getMonth < 8 && endTime.getMonth > 2) {
+      const yeaNum = computeTime.getFullYear() - 1
+      computeTime.setFullYear(yeaNum)
+      computeTime.setMonth(8)
+    } else if (endTime.getMonth < 3) {
+      const yeaNum = computeTime.getFullYear() - 1
+      computeTime.setFullYear(yeaNum)
+      computeTime.setMonth(5)
+    } else {
+      computeTime.setMonth(timeMonth - 6)
+    }
+    Staretime = new Date(getFirstDayOfSeason(computeTime))
+  } else if (stareScopeTimeType === 'oneMonth') {
+    // 近一个月
+    Staretime = computeTime.setDate(1)
+  } else if (stareScopeTimeType === 'twoMonth') {
+    // 近两个月
+    const monthNum = endTime.getMonth() - 1
+    if (monthNum > -1) {
+      computeTime.setMonth(monthNum)
+    } else {
+      const yeartime = endTime.getFullYear() - 1
+      computeTime.setFullYear(yeartime)
+      computeTime.setMonth(11)
+    }
+    Staretime = computeTime.setDate(1)
+  } else if (stareScopeTimeType === 'threeMonth') {
+    // 近三个月
+    const monthTime = endTime.getMonth() - 2
+    if (monthTime > -1) {
+      computeTime.setMonth(monthTime)
+    } else {
+      const yeartime = endTime.getFullYear() - 1
+      computeTime.setFullYear(yeartime)
+      computeTime.setMonth(10)
+    }
+    Staretime = computeTime.setDate(1)
+  } else if (stareScopeTimeType === 'oneWeek') {
+    // 近一周
+    const MondayTime = getWeekOfSeason(computeTime)
+    Staretime = new Date(MondayTime)
+  } else if (stareScopeTimeType === 'twoWeek') {
+    // 近两周
+    const MondayTime = getWeekOfSeason(computeTime)
+    Staretime = new Date(MondayTime - 7 * 24 * 60 * 60 * 1000)
+  } else if (stareScopeTimeType === 'threeWeek') {
+    // 近三周
+    const MondayTime = getWeekOfSeason(computeTime)
+    Staretime = new Date(MondayTime - 14 * 24 * 60 * 60 * 1000)
+  }
+  if (Staretime) {
+    const startTimeTemp = new Date(Staretime).getTime()
+    const endTimeTemp = endTime.getTime()
+    const startDate = formatTimefn(format, startTimeTemp)
+    const endDate = formatTimefn(format, endTimeTemp)
+    return { startTimeTemp, endTimeTemp, startDate, endDate }
+  }
+}

package/src/utils/request.js

@@ -14,12 +14,13 @@ import {
 } from './util'
 import {
   getRelativeBaseUrl,
-  getTimeZone
+  getTimeZone,
+  setCustomSystemBackendUrl
 } from './common-util'
 // 创建axios实例
 const service = axios.create({
   // baseURL: process.env.VUE_APP_BASE_API, // api 的 base_url
-  timeout: 150000, // 请求超时时间
+  timeout: 300000, // 请求超时时间
   withCredentials: true
 })
 
@@ -38,6 +39,8 @@ service.interceptors.request.use(
     const customSystem = Vue.prototype.customSystem
     if (customSystem) {
       config.headers['customSystem'] = customSystem
+      // 重新缓存系统后台路径
+      setCustomSystemBackendUrl(customSystem)
     }
     if (Vue.prototype.baseURL) {
       config.baseURL = getRelativeBaseUrl(Vue.prototype.baseURL)

package/src/utils/util.js

@@ -274,12 +274,14 @@ function getValueByField(entityData, fieldName) {
       // 表示是子表字段
       value = getSubEntityValue(entityData, fieldName)
     } else {
-      value = entityData[fieldName]
+      value = entityData[fieldName.toUpperCase()]
+      if (value === undefined) {
+        value = entityData[fieldName.toLowerCase()]
+      }
     }
     return value
   }
 }
-
 function getSubEntityValue(entityData, fieldName) {
   let value = null
   let subEntityData = entityData
@@ -452,11 +454,11 @@ export function getEntityFieldValueWithOutCase(entity, prop) {
  */
 export function getEntityFieldValue(entity, prop, isLowerCase) {
   let value = getEntityFieldValueWithCase(entity, prop)
-  if (value === undefined) {
+  if (value === undefined || value === null) {
     // 兼容mysql数据库
     value = getEntityFieldValueWithCase(entity, prop.toLowerCase())
   }
-  if (value === undefined && isLowerCase === undefined) {
+  if (value === undefined || value === null && isLowerCase === undefined) {
     // 兼容oracle数据库
     value = getEntityFieldValueWithCase(entity, prop.toUpperCase())
   }
@@ -509,7 +511,7 @@ function getParentModelPropWithCase(prop, parentObj) {
   if (!parentObj) {
     parentObj = {}
   }
-  if (!parentObj[prop]) {
+  if (!parentObj[prop] && !parentObj[prop.toUpperCase()]) {
     parentObj[prop] = {}
   }
   return parentObj[prop]

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

@@ -43,7 +43,9 @@ export default {
       let width = '130px'
       if (hasChildren) {
         // 当是父菜单时，为了使后面的三角能显示出来，需要将宽度设小点
-        width = '100px'
+        // width = '100px'
+        // boe 反应左侧菜单栏无法展示全部文字，调整
+        width = '130px'
       }
       if (isRoot) {
         // 是否是根目录，没有子菜单时
@@ -52,7 +54,7 @@ export default {
         </div>)
       } else {
         // 有子菜单时
-        vnodes.push(<div v-slot:title style='display: inline-block'>
+        vnodes.push(<div slot='title' style='display: inline-block'>
           <div title={title} style={'display: inline-block;width:' + width + ';overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:keep-all;'}>{(title)}</div>
         </div>)
       }

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

@@ -9,7 +9,7 @@
     </template>
 
     <el-submenu v-else :index="resolvePath(item.code,item.path,item.pageType)" :show-timeout="0" :hide-timeout="50" popper-class="sidebar-container-popper">
-      <template v-slot:title>
+      <template slot="title">
         <item :icon="item.iconName" :title="getI18nName(item)" :has-children="item.children.length > 0?true:false" />
       </template>
 
@@ -38,7 +38,6 @@ import AppLink from './Link'
 import Vue from 'vue'
 import tabJs from '../../../api/tab'
 import { getI18nName } from '../../../utils/menu'
-// import { SidebarItemChild } from './SidebarItemChild.vue'
 export default {
   name: 'SidebarItem',
   components: { Item, AppLink },