imatrix-ui 2.9.10-dw → 2.9.11-boe2

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

@@ -1,7 +1,7 @@
 import axios from 'axios'
 import {
   Message
-} from '@gcommon/gcommon-ui'
+} from 'element-ui'
 import {
   getToken,
   removeToken
@@ -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

@@ -3,7 +3,6 @@ import Vue from 'vue'
 import {
   executeExpression
 } from './calculator/calculator-util'
-import { getLangByShort } from './common-util'
 export function getI18n() {
   if (!window.$locale) {
     i18n.locale = 'cn'
@@ -14,11 +13,12 @@ export function getI18n() {
 }
 
 export function getLanguageWithLocale() {
-  let currentLocale = window.$locale
-  if (!currentLocale || currentLocale === 'zh') {
-    currentLocale = 'cn'
+  const currentLocale = window.$locale
+  if (currentLocale && currentLocale === 'en') {
+    return 'en_US'
+  } else {
+    return 'zh_CN'
   }
-  return getLangByShort(currentLocale)
 }
 /**
  * 根据动态数据源获得下拉选的选项集合
@@ -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

@@ -27,15 +27,15 @@ export default {
 
     if (icon) {
       if (icon.indexOf('fa-') === 0) {
-        // 表示以“fa-”开头，使用font-awesome中的图标 margin-right: 16px 是因为svg-icon有16px的间隔
+        // 表示以“fa-”开头，使用font-awesome中的图标
         icon = 'fa ' + icon
-        vnodes.push(<div style='display: inline-block;overflow:hidden;'><i class={icon} style='margin-right: 16px;'/></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;overflow:hidden;'><svg-icon icon-class={icon}/></div>)
       } else {
         icon += ' svg-icon'
-        vnodes.push(<div style='display: inline-block;overflow:hidden;'><i class={icon} style='margin-right: 16px;'/></div>)
+        vnodes.push(<div style='display: inline-block;overflow:hidden;'><i class={icon}/></div>)
       }
     }
 
@@ -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

@@ -8,8 +8,8 @@
       </app-link>
     </template>
 
-    <el-submenu v-else :index="resolvePath(item.code,item.path,item.pageType)" :show-timeout="0" :hide-timeout="50" :popper-append-to-body="false" popper-class="sidebar-container-popper">
-      <template v-slot:title>
+    <el-submenu v-else :index="resolvePath(item.code,item.path,item.pageType)" :show-timeout="0" :hide-timeout="50" popper-class="sidebar-container-popper">
+      <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 },

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

@@ -1,17 +1,15 @@
 <template>
   <div>
     <el-scrollbar wrap-class="scrollbar-wrapper">
-      <keep-alive>
-        <el-menu
-          :show-timeout="200"
-          :default-active="getDefaultActive()"
-          :collapse="isCollapse"
-          mode="vertical"
-          @select="selectMenu"
-        >
-          <sidebar-item v-for="menu in menus" :key="menu.code" :item="menu" />
-        </el-menu>
-      </keep-alive>
+      <el-menu
+        :show-timeout="200"
+        :default-active="getDefaultActive()"
+        :collapse="isCollapse"
+        mode="vertical"
+        @select="selectMenu"
+      >
+        <sidebar-item v-for="menu in menus" :key="menu.code" :item="menu" />
+      </el-menu>
     </el-scrollbar>
     <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
   </div>
@@ -42,7 +40,7 @@ export default {
   data() {
     const menus = getMenus()
     return {
-      menus: Object.freeze(menus)
+      menus
     }
   },
   computed: {
@@ -57,14 +55,13 @@ export default {
     }
   },
   created() {
-    const a = new Date().getTime()
     this.firstLeafMenu = this.getMyFirstMenu(this.menus)
     if (this.firstLeafMenu && this.firstLeafMenu.fullPath) {
       // 跳转到第一个页面
       if (this.firstLeafMenu.pageType && this.firstLeafMenu.pageType === 'iframe') {
         const iframeSrc = this.firstLeafMenu.fullPath
-        const path = this.firstLeafMenu.path
-        const query = { src: iframeSrc, customSystem: this.systemCode, path: path, _menuCode: this.firstLeafMenu.code, _menuName: getI18nName(this.firstLeafMenu) }
+        const pageCode = this.firstLeafMenu.path
+        const query = { src: iframeSrc, customSystem: this.systemCode, pageCode: pageCode, _menuCode: this.firstLeafMenu.code, _menuName: getI18nName(this.firstLeafMenu) }
         this.addTabs(query, this.$store.state.tabContent.openTab, '/dsc/iframe-page', '/dsc/iframe-page')
         this.$router.push({ path: '/dsc-index/iframe-page', query: query })
       } else {
@@ -74,8 +71,6 @@ export default {
         this.$router.push({ path: '/dsc-index/page', query: query })
         // this.$router.push({ path: this.firstLeafMenu.fullPath })
       }
-      const b = new Date().getTime()
-      console.log('菜单组件==>created==>b-a', (b - a))
     }
   },
   methods: {
@@ -97,14 +92,11 @@ export default {
       Cookies.set('selectMenu', index)
     },
     getMyFirstMenu(menus) {
-      const a = new Date().getTime()
       if (menus && menus.length > 0) {
         let shouldSelectMenu = this.getFirstMenu(menus)
         if (!shouldSelectMenu) {
           shouldSelectMenu = this.getFirstMenuWithCookie(menus)
         }
-        const b = new Date().getTime()
-        console.log('菜单组件==>getMyFirstMenu==>b-a', (b - a))
         // 默认不展示第一个有权限的菜单了，可以去掉下面的代码
         // if (!shouldSelectMenu) {
         //   shouldSelectMenu = this.getSelectMenuWithFirstMenu(menus[0])

package/src/views/dsc-component/tabs/tab-content.vue

@@ -98,11 +98,7 @@ export default {
           path = src
         }
         if (params) {
-          if (path && path.indexOf('?') > 0) {
-            path += '&' + params
-          } else {
-            path += '?' + params
-          }
+          path += '?' + params
         }
       } else {
         // 表示页面跳转

package/src/views/layout/NewLayout.vue

@@ -1,77 +1,18 @@
 <template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
-    <menubar class="sidebar-container" />
-    <div class="main-container">
-      <breadcrumb v-if="showMenuRoute" />
+  <div class="app-wrapper">
+    <div class="tab-main-container">
+      <!-- <tab-content/> -->
       <app-main />
     </div>
   </div>
 </template>
-
 <script>
-import { Menubar, AppMain, Breadcrumb } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import { isShowMenuRoute } from '../../../src/utils/common-util'
-
+import { AppMain } from './components'
 export default {
-  name: 'Layout',
+  name: 'EmptyLayout',
   components: {
-    Menubar,
-    AppMain,
-    Breadcrumb
-  },
-  mixins: [ResizeMixin],
-  data() {
-    // 是否显示菜单路径，默认是不显示
-    const showMenuRoute = isShowMenuRoute()
-    return {
-      showMenuRoute
-    }
-  },
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    device() {
-      return this.$store.state.app.device
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('closeSidebar', { withoutAnimation: false })
-    }
+    AppMain
   }
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "../../styles/mixin.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-</style>

package/src/views/layout/components/Menubar/Item.vue

@@ -14,20 +14,28 @@ export default {
     hasChildren: {
       type: Boolean,
       default: false
+    },
+    isRoot: {
+      type: Boolean,
+      default: false
     }
   },
   render(h, context) {
+    const { title, hasChildren, isRoot } = context.props
     let icon = context.props.icon
-    const { title, hasChildren } = context.props
     const vnodes = []
-
     if (icon) {
       if (icon.indexOf('fa-') === 0) {
         // 表示以“fa-”开头，使用font-awesome中的图标
         icon = 'fa ' + icon
+        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;overflow:hidden;'><svg-icon icon-class={icon}/></div>)
+      } else {
+        icon += ' svg-icon'
+        vnodes.push(<div style='display: inline-block;overflow:hidden;'><i class={icon} /></div>)
       }
-      icon += ' svg-icon'
-      vnodes.push(<div style='display: inline-block;'><i class={icon}/></div>)
     }
 
     if (title) {
@@ -36,9 +44,17 @@ export default {
         // 当是父菜单时，为了使后面的三角能显示出来，需要将宽度设小点
         width = '100px'
       }
-      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>)
+      if (isRoot) {
+        // 是否是根目录，没有子菜单时
+        vnodes.push(<div 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>)
+      } else {
+        // 有子菜单时
+        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>)
+      }
     }
     return vnodes
   }

package/src/views/layout/components/Menubar/Link.vue

@@ -6,9 +6,12 @@
     <slot />
   </a> -->
 
-    <router-link :to="to">
+    <router-link v-if="!isOpenNewTab" :to="to">
       <slot />
     </router-link>
+    <div v-else>
+      <slot />
+    </div>
   </div>
 </template>
 
@@ -23,8 +26,14 @@ export default {
   },
   data() {
     const isExter = this.to.isExternal
+    const openWay = this.to.openWay
+    let isOpenNewTab = false
+    if (openWay && openWay === 'NEW_PAGE_OPEN') {
+      isOpenNewTab = true
+    }
     return {
-      isExter
+      isExter,
+      isOpenNewTab
     }
   }
 }