imatrix-ui 2.8.21-dw → 2.8.21

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])

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)
@@ -94,7 +98,11 @@ export default {
           path = src
         }
         if (params) {
-          path += '?' + params
+          if (path && path.indexOf('?') > 0) {
+            path += '&' + params
+          } else {
+            path += '?' + params
+          }
         }
       } else {
         // 表示页面跳转
@@ -109,6 +117,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/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() {