imatrix-ui 2.8.2-dw → 2.8.2

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)" popper-class="sidebar-container-popper">
+    <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" />
+        <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,7 @@ import Item from './Item'
 import AppLink from './Link'
 import Vue from 'vue'
 import tabJs from '../../../api/tab'
+import { getI18nName } from '../../../utils/menu'
 export default {
   name: 'SidebarItem',
   components: { Item, AppLink },
@@ -90,23 +91,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 +110,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
     },
@@ -139,14 +130,38 @@ export default {
       return false
     },
     clickMenu(toPathObj) {
-      console.log('clickMenu----toPathObj=', toPathObj)
-      this.addTabs(toPathObj.query, this.$store.state.tabContent.openTab, toPathObj.tabPath)
+      // console.log('clickMenu----toPathObj=', toPathObj)
+      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

@@ -20,6 +20,8 @@ import { mapGetters } from 'vuex'
 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: {
@@ -36,13 +38,14 @@ export default {
     }
   },
   data() {
+    const menus = getMenus()
     return {
+      menus
     }
   },
   computed: {
     ...mapGetters([
-      'sidebar',
-      'menus'
+      'sidebar'
     ]),
     isCollapse() {
       if (this.collapse === false) {
@@ -57,10 +60,13 @@ export default {
       // 跳转到第一个页面
       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 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 {
         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 })
@@ -83,7 +89,6 @@ export default {
       this.$store.dispatch('toggleSidebar')
     },
     selectMenu(index, indexPath) {
-      console.log('selectMenu----indexPath=', indexPath, 'index=', index)
       Cookies.set('selectMenu', index)
     },
     getMyFirstMenu(menus) {
@@ -114,7 +119,7 @@ export default {
       }
     },
     getShouldSelectMenu(menu) {
-      console.log('dsc--getShouldSelectMenu--this.$route=', this.$route)
+      // console.log('dsc--getShouldSelectMenu--this.$route=', this.$route)
       const currentMenuCode = this.$route.query ? this.$route.query._menuCode : null
       if (menu && currentMenuCode) {
         let shouldSelectMenu
@@ -162,7 +167,7 @@ export default {
     },
     getShouldSelectMenuWithCookie(menu, menuCode) {
       if (menu) {
-        console.log('dsc--getShouldSelectMenuWithCookie--this.$route=', this.$route)
+        // console.log('dsc--getShouldSelectMenuWithCookie--this.$route=', this.$route)
         let shouldSelectMenu
         const children = menu.children
         if (children && children.length > 0) {

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

@@ -57,6 +57,10 @@ export default {
       }
     }
   },
+  created() {
+    // 登录超时，给父iframe发送信号
+    window.addEventListener('message', this.recieveMessage)
+  },
   methods: {
     closeSelectedTag(tagName) {
       const index = this.$store.state.tabContent.openTab.findIndex((item) => item.code === tagName)
@@ -109,6 +113,13 @@ export default {
         path = path.substring(0, path.lastIndexOf('&'))
       }
       return path
+    },
+    recieveMessage(event) {
+      if (event && typeof event.data === 'string' && event.data.indexOf('loginTimeout') >= 0) {
+        // 表示iframe中的页面发送了登录超时的信号，将信号传给最外层window
+        console.log('tab-content-接收到登录超时的信息---event.data=', event.data)
+        window.parent.postMessage(event.data, '*')
+      }
     }
   }
 }

package/src/views/error-page/404.vue

@@ -8,7 +8,7 @@
         <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">
@@ -16,16 +16,16 @@
           <a class="link-type" href="https://wallstreetcn.com" target="_blank">
             华尔街见闻
           </a>
-        </div>
+        </div> -->
         <div class="bullshit__headline">
           {{ message }}
         </div>
         <div class="bullshit__info">
-          请检查您输入的网址是否正确，请点击以下按钮返回主页或者发送错误报告
+          请检查您输入的网址是否正确
         </div>
-        <a href="" class="bullshit__return-home">
+        <!-- <a href="" class="bullshit__return-home">
           返回首页
-        </a>
+        </a> -->
       </div>
     </div>
   </div>
@@ -37,7 +37,7 @@ export default {
   name: 'Page404',
   computed: {
     message() {
-      return '网管说这个页面你不能进......'
+      return '页面不存在'
     }
   }
 }

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

@@ -25,6 +25,7 @@ import Vue from 'vue'
 import { getLanguageWithLocale } from '../../../../utils/util'
 import { isShowSystemMenu } from '../../../../utils/common-util'
 import Cookies from 'js-cookie'
+import { getMenus } from '../../../../utils/permissionAuth'
 export default {
   name: 'Menubar',
   components: {
@@ -39,16 +40,17 @@ export default {
         systemName = systemNameObj[language]
       }
     }
+    const menus = getMenus()
     return {
       firstLeafMenu: null, // 第一个有权限的叶子菜单，用于默认展开第一个父菜单
       systemName,
-      defaultActive: ''
+      defaultActive: '',
+      menus
     }
   },
   computed: {
     ...mapGetters([
-      'sidebar',
-      'menus'
+      'sidebar'
     ]),
     isCollapse() {
       return !this.sidebar.opened

package/src/views/login/index.vue

@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import { Message } from '@gcommon/gcommon-ui'
+import { Message } from 'element-ui'
 export default {
   name: 'Login',
   data() {