imatrix-ui 2.8.39-dw → 2.8.39-pvtmp

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

@@ -1,12 +1,14 @@
-import sessionStorage from 'sessionstorage'
 import Vue from 'vue'
 
 const permissionKey = 'PERMISSION-'
 const permissionMenuKey = 'PERMISSION_MENU-'
+const permissionAllSystemKey = 'PERMISSION_All_SYSTSEM_KEY'
 export function getSystemCode() {
   let systemCode
   if (Vue.prototype.customSystem) {
     systemCode = Vue.prototype.customSystem
+  } else if (Vue.prototype.currentSystem) {
+    systemCode = Vue.prototype.currentSystem
   } else {
     systemCode = Vue.prototype.systemCode
   }
@@ -19,7 +21,7 @@ export function getSystemCode() {
 
 export function getPermissions() {
   const systemCode = getSystemCode()
-  const permissions = sessionStorage.getItem(permissionKey + systemCode)
+  const permissions = localStorage.getItem(permissionKey + systemCode)
   if (permissions) {
     return JSON.parse(permissions)
   }
@@ -33,26 +35,17 @@ export function setPermissions(permissions) {
     const permission = permissions[i].replace(/\./g, '__')
     permissionObjs[permission] = true
   }
-  sessionStorage.setItem(permissionKey + systemCode, JSON.stringify(permissionObjs))
+  const key = permissionKey + systemCode
+  localStorage.setItem(key, JSON.stringify(permissionObjs))
+  setPermissionAllSystemKey(key)
   return permissionObjs
 }
 
-export function removePermissions() {
-  const systemCode = getSystemCode()
-  sessionStorage.removeItem(permissionKey + systemCode)
-  for (var i = 0; i < sessionStorage.length; i++) {
-    var key = sessionStorage.key(i)
-    if (key.indexOf(permissionKey) >= 0) {
-      sessionStorage.removeItem(key)
-    }
-  }
-}
-
 export function getMenus(systemCode) {
   if (!systemCode) {
     systemCode = getSystemCode()
   }
-  const permissions = sessionStorage.getItem(permissionMenuKey + systemCode)
+  const permissions = localStorage.getItem(permissionMenuKey + systemCode)
   if (permissions) {
     return JSON.parse(permissions)
   }
@@ -64,21 +57,49 @@ export function setMenus(menus, systemCode) {
     if (!systemCode) {
       systemCode = getSystemCode()
     }
-    sessionStorage.setItem(permissionMenuKey + systemCode, JSON.stringify(menus))
+    const key = permissionMenuKey + systemCode
+    localStorage.setItem(key, JSON.stringify(menus))
+    setPermissionAllSystemKey(key)
     return menus
   }
 }
 
-export function removeMenus(systemCode) {
-  if (!systemCode) {
-    systemCode = getSystemCode()
+function setPermissionAllSystemKey(systemPermissionKey) {
+  const permissionAllSystems = getPermissionAllSystemKey()
+  if (permissionAllSystems.indexOf(systemPermissionKey) < 0) {
+    permissionAllSystems.push(systemPermissionKey)
   }
-  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)
-    }
+  localStorage.setItem(permissionAllSystemKey, permissionAllSystems.join(','))
+}
+
+function getPermissionAllSystemKey() {
+  let permissionAllSystems = localStorage.getItem(permissionAllSystemKey)
+  if (permissionAllSystems) {
+    permissionAllSystems = permissionAllSystems.split(',')
+  }
+  if (!permissionAllSystems) {
+    permissionAllSystems = []
   }
+  return permissionAllSystems
+}
+
+function removePermissionSystemKey() {
+  localStorage.removeItem(permissionAllSystemKey)
 }
 
+function rtrim(str) { // 删除右边的空格
+  return str.replace(/(\s*$)/g, '')
+}
+
+// 删除缓存的资源和菜单
+export function removeAllSystemPermissions() {
+  const systemCode = getSystemCode()
+  localStorage.removeItem(permissionKey + systemCode)
+  localStorage.removeItem(permissionMenuKey + systemCode)
+  const permissionAllSystems = getPermissionAllSystemKey()
+  permissionAllSystems.forEach(key => {
+    key = rtrim(key)
+    localStorage.removeItem(key)
+  })
+  removePermissionSystemKey()
+}

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 请根据实际情况自行修改
@@ -80,13 +83,54 @@ service.interceptors.response.use(
         }
       } else if (error.response.status === 403) {
         // ForbiddenException(403) 403没权限
+        // 您没有权限访问
         const message = getI18n().t('imatrixUIMessage.forbiddenException')
-        Message({
-          showClose: true,
-          message: message,
-          type: 'error',
-          duration: 5 * 1000
-        })
+        let vnode
+        if (Vue.prototype.forbiddenUser || Vue.prototype.forbiddenLinkUrl) {
+          vnode = '<p><span>' + message + '</span>'
+          // 请点击进行权限申请
+          const forbiddenExceptionLinkUrlMsg = getI18n().t('imatrixUIMessage.forbiddenExceptionLinkUrl')
+          if (Vue.prototype.forbiddenLinkUrl) {
+            vnode += ',<a href="#" style="color: #1800ff;font-weight: bold;text-decoration:underline" onclick="window.open(\'' + Vue.prototype.forbiddenLinkUrl + '\')">' + forbiddenExceptionLinkUrlMsg + '</a>'
+          }
+          if (Vue.prototype.forbiddenUser) {
+            // 如有疑问请联系
+            const forbiddenExceptionLinkUserMsg = getI18n().t('imatrixUIMessage.forbiddenExceptionLinkUser')
+            vnode += '<span>'
+            const forbiddenUserHtml = ',' + forbiddenExceptionLinkUserMsg + '<span style="color: #1800ff;"> ' + Vue.prototype.forbiddenUser + '</span>'
+            let contactUrlHtml
+            if (!window._clickForbiddenUser) {
+              contactUrlHtml = forbiddenUserHtml
+            } else {
+              // index.html中添加如下代码，绑定用户点击事件
+            //   <script>
+            //   window._clickForbiddenUser=function(linkUser) {
+            //     alert(linkUser)
+            //   }
+            // </script>
+              contactUrlHtml = '<a href="#"  onclick="window._clickForbiddenUser(\'' + Vue.prototype.forbiddenUser + '\');return false">' + forbiddenUserHtml + '</a>'
+            }
+            vnode += '</span>'
+            vnode += contactUrlHtml
+          }
+          vnode += '</p>'
+        }
+        if (vnode) {
+          Message({
+            showClose: true,
+            dangerouslyUseHTMLString: true,
+            message: vnode,
+            type: 'error',
+            duration: 10 * 1000
+          })
+        } else {
+          Message({
+            showClose: true,
+            message: message,
+            type: 'error',
+            duration: 5 * 1000
+          })
+        }
         return Promise.reject(error)
       } else if (error.response.status === 400 || error.response.status === 406 || error.response.status === 404) {
         // BadRequestException(400) || BusinessException(406)  || ResourceNotFoundException(404)
@@ -112,6 +156,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 +172,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

@@ -3,6 +3,7 @@ import Vue from 'vue'
 import {
   executeExpression
 } from './calculator/calculator-util'
+import { getLangByShort } from './common-util'
 export function getI18n() {
   if (!window.$locale) {
     i18n.locale = 'cn'
@@ -13,12 +14,11 @@ export function getI18n() {
 }
 
 export function getLanguageWithLocale() {
-  const currentLocale = window.$locale
-  if (currentLocale && currentLocale === 'en') {
-    return 'en_US'
-  } else {
-    return 'zh_CN'
+  let currentLocale = window.$locale
+  if (!currentLocale || currentLocale === 'zh') {
+    currentLocale = 'cn'
   }
+  return getLangByShort(currentLocale)
 }
 /**
  * 根据动态数据源获得下拉选的选项集合
@@ -27,9 +27,9 @@ export function getLanguageWithLocale() {
  * @param {*} entity 实体信息
  * @returns
  */
-export function findOptionsByDynamicDataSource(dynamicSourceCode, searchText, entity, additionalParameterStr) {
+export function findOptionsByDynamicDataSource(dynamicSourceCode, searchText, entity, additionalParameterStr, searchParam) {
   return new Promise((resolve, reject) => {
-    findDynamicDataSourceByCode(dynamicSourceCode, searchText, entity, additionalParameterStr).then(dynamicDataSourceDto => {
+    findDynamicDataSourceByCode(dynamicSourceCode, searchText, entity, additionalParameterStr, searchParam).then(dynamicDataSourceDto => {
       let options = []
       if (dynamicDataSourceDto && dynamicDataSourceDto.options) {
         const setOptions = dynamicDataSourceDto.options
@@ -68,26 +68,70 @@ export function findOptionsByDynamicDataSource(dynamicSourceCode, searchText, en
  * @param {*} entity 实体信息
  * @returns
  */
-export function findDynamicDataSourceByCode(dynamicSourceCode, searchText, entity, additionalParameterStr) {
-  return new Promise((resolve, reject) => {
-    if (searchText === undefined || searchText === null) {
-      searchText = ''
-    }
-    const params = {
-      searchText
-    }
-    // const additionalParameterStr = sessionStorage.getItem('additionalParamMap')
-    if (additionalParameterStr) {
-      params.additionalParamMap = JSON.parse(additionalParameterStr)
+export function findDynamicDataSourceByCode(dynamicSourceCode, searchText, entity, additionalParameterStr, searchParam) {
+  let watchAttrValue
+  let parentEntity
+  let listCode
+  let formCode
+  let tableName
+  if (searchParam) {
+    watchAttrValue = searchParam.watchAttrValue
+    if (watchAttrValue === undefined || watchAttrValue === null) {
+      watchAttrValue = ''
     }
-    if (entity && entity !== null) {
-      params.entity = entity
+    parentEntity = searchParam.parent
+    listCode = searchParam._listCode
+    formCode = searchParam._formCode
+    tableName = searchParam._tableName
+  }
+  const params = {
+    searchText,
+    watchAttrValue,
+    parent: parentEntity
+
+  }
+  if (additionalParameterStr && typeof (additionalParameterStr) === 'object') {
+    params.additionalParamMap = additionalParameterStr
+  } else if (additionalParameterStr && typeof (additionalParameterStr) === 'string') {
+    params.additionalParamMap = JSON.parse(additionalParameterStr)
+  }
+  if (params.additionalParamMap === undefined) {
+    params.additionalParamMap = {}
+  }
+  if (listCode) {
+    params.additionalParamMap._listCode = listCode
+  }
+  if (formCode) {
+    params.additionalParamMap._formCode = formCode
+  }
+  if (tableName) {
+    params.additionalParamMap._tableName = tableName
+  }
+  if (entity && entity !== null) {
+    params.entity = entity
+  }
+  const backendUrl = Vue.prototype.baseURL
+
+  return new Promise((resolve, reject) => {
+    // 页面设计不请求动态数据源
+    if (Vue.prototype.systemCode !== undefined && Vue.prototype.systemCode === 'iMatrix') {
+      resolve()
+    } else {
+      Vue.prototype.$http.post(backendUrl + '/common/dynamic-data-source/' + dynamicSourceCode, params).then(result => {
+        if (result.backendUrl) {
+          // result.backendUrl表示需要使用动态数据源所属的系统路径重新获得一次数据
+          Vue.prototype.$http.post(result.backendUrl + '/common/dynamic-data-source/' + dynamicSourceCode, params).then(finallyResult => {
+            resolve(finallyResult)
+          }).catch(error => {
+            reject(error)
+          })
+        } else {
+          resolve(result)
+        }
+      }).catch(error => {
+        reject(error)
+      })
     }
-    Vue.prototype.$http.post(Vue.prototype.baseURL + '/common/dynamic-data-source/' + dynamicSourceCode, params).then(dynamicDataSourceDto => {
-      resolve(dynamicDataSourceDto)
-    }).catch(error => {
-      reject(error)
-    })
   })
 }
 
@@ -218,7 +262,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(' ')
@@ -236,9 +280,13 @@ function parseCondition(entity, conditionList, isSql, tableName, additionalParam
       }
     }
   }
-  console.log('parseCondition----conditions=', conditions)
-  // eslint-disable-next-line no-eval
-  return eval('(' + conditions + ')')
+  // console.log('parseCondition----conditions=', conditions)
+  if (conditions) {
+    // eslint-disable-next-line no-eval
+    return eval('(' + conditions + ')')
+  } else {
+    return true
+  }
 }
 const REPLACE_DOT = '__'
 

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

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

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

@@ -3,14 +3,14 @@
     <template v-if="!item.children || item.children.lenght === 0">
       <app-link :to="toPath(item)" @click.native="clickMenu(toPath(item))">
         <el-menu-item :index="resolvePath(item.code,item.path,item.pageType)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item :icon="item.iconName" :title="item.i18nValue" :is-root="true" />
+          <item :icon="item.iconName" :title="getI18nName(item)" :is-root="true" />
         </el-menu-item>
       </app-link>
     </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 slot="title">
-        <item :icon="item.iconName" :title="item.i18nValue" :has-children="item.children.length > 0?true:false" />
+    <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>
+        <item :icon="item.iconName" :title="getI18nName(item)" :has-children="item.children.length > 0?true:false" />
       </template>
 
       <template v-for="child in item.children">
@@ -23,7 +23,7 @@
         />
         <app-link v-else :key="child.code" :to="toPath(child)" @click.native="clickMenu(toPath(child))">
           <el-menu-item :index="resolvePath(child.code,child.path,child.pageType)">
-            <item :icon="child.iconName" :title="child.i18nValue" />
+            <item :icon="child.iconName" :title="getI18nName(child)" />
           </el-menu-item>
         </app-link>
       </template>
@@ -37,6 +37,8 @@ import Item from './Item'
 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 },
@@ -90,23 +92,17 @@ export default {
     toPath(menu) {
       const toPathObj = {}
       const routePath = menu.path
+      toPathObj.openWay = menu.openWay
       if (this.isExternalLink(menu.pageType)) {
         toPathObj.path = '/dsc-index/iframe-page'
         toPathObj.tabPath = '/dsc/iframe-page'
         toPathObj.query = {}
         toPathObj.query.src = routePath
         toPathObj.isExternal = true
-        if (!this.isHasCustomSystem(routePath)) {
-          // 如果路径中没有拼系统编码，才需要把系统编码放到参数中
-          toPathObj.query.customSystem = Vue.prototype.customSystem
-        }
-
+        // 如果路径中没有拼系统编码，才需要把系统编码放到参数中
+        toPathObj.query.customSystem = Vue.prototype.customSystem
         toPathObj.query._menuCode = menu.code
-        if (menu.i18nValue) {
-          toPathObj.query._menuName = menu.i18nValue
-        } else {
-          toPathObj.query._menuName = menu.name
-        }
+        toPathObj.query._menuName = getI18nName(menu)
       } else {
         const pageCode = routePath
         toPathObj.path = '/dsc-index/page'
@@ -115,11 +111,7 @@ export default {
         toPathObj.query.pageCode = pageCode
         toPathObj.query.customSystem = Vue.prototype.customSystem
         toPathObj.query._menuCode = menu.code
-        if (menu.i18nValue) {
-          toPathObj.query._menuName = menu.i18nValue
-        } else {
-          toPathObj.query._menuName = menu.name
-        }
+        toPathObj.query._menuName = getI18nName(menu)
       }
       return toPathObj
     },
@@ -140,13 +132,37 @@ export default {
     },
     clickMenu(toPathObj) {
       // console.log('clickMenu----toPathObj=', toPathObj)
-      this.addTabs(toPathObj.query, this.$store.state.tabContent.openTab, toPathObj.tabPath)
+      if (toPathObj.openWay && toPathObj.openWay === 'NEW_PAGE_OPEN' && toPathObj.query) {
+        // 新页签打开菜单
+        let url = toPathObj.query.src
+        if (url && url.indexOf('?') > 0) {
+          url += '&'
+        } else {
+          url += '?'
+        }
+        if (toPathObj.query.customSystem) {
+          url += 'customSystem=' + toPathObj.query.customSystem
+        }
+        if (toPathObj.query._menuCode) {
+          url += '_menuCode=' + toPathObj.query._menuCode
+        }
+        if (toPathObj.query._menuCode) {
+          url += '_menuName=' + toPathObj.query._menuName
+        }
+        window.open(url, toPathObj.query._menuCode)
+      } else {
+        // 刷新页签打开菜单
+        this.addTabs(toPathObj.query, this.$store.state.tabContent.openTab, toPathObj.tabPath)
+      }
     },
     isExternalLink(pageType) {
       if (pageType && pageType === 'iframe') {
         return true
       }
       return false
+    },
+    getI18nName(menu) {
+      return getI18nName(menu)
     }
   }
 }

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

@@ -1,15 +1,17 @@
 <template>
   <div>
     <el-scrollbar wrap-class="scrollbar-wrapper">
-      <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>
+      </keep-alive>
     </el-scrollbar>
     <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
   </div>
@@ -21,6 +23,7 @@ import SidebarItem from './SidebarItem'
 import Cookies from 'js-cookie'
 import tabJs from '../../../api/tab'
 import { getMenus } from '../../../utils/permissionAuth'
+import { getI18nName } from '../../../utils/menu'
 export default {
   name: 'Sidebar',
   components: {
@@ -39,7 +42,7 @@ export default {
   data() {
     const menus = getMenus()
     return {
-      menus
+      menus: Object.freeze(menus)
     }
   },
   computed: {
@@ -54,19 +57,25 @@ 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
-        this.$router.push({ path: '/dsc-index/iframe-page', query: { src: iframeSrc }})
+        const path = this.firstLeafMenu.path
+        const query = { src: iframeSrc, customSystem: this.systemCode, path: path, _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 {
         const pageCode = this.firstLeafMenu.path
-        const query = { customSystem: this.systemCode, pageCode: pageCode, _menuCode: this.firstLeafMenu.code, _menuName: this.firstLeafMenu.name }
+        const query = { customSystem: this.systemCode, pageCode: pageCode, _menuCode: this.firstLeafMenu.code, _menuName: getI18nName(this.firstLeafMenu) }
         this.addTabs(query, this.$store.state.tabContent.openTab, '/dsc/page', '/dsc/page')
         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: {
@@ -88,11 +97,14 @@ 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])