@lambo-design/pro-layout 1.0.0-beta.214 → 1.0.0-beta.216

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/pro-layout",
-  "version": "1.0.0-beta.214",
+  "version": "1.0.0-beta.216",
   "description": "",
   "main": "index.js",
   "author": "lambo",

package/src/components/pro-layout-header.vue

@@ -138,7 +138,6 @@ export default {
         if (pid === 0) {
           // 如果 pid 为 0，表示是最外层菜单
           parentName = this.getNameOrHref(menu);
-          //console.log('parentName',parentName)
           this.openedNames = [parentName]; // 设置最外层父菜单为展开状态
         } else {
           // 如果 pid 不等于 0，查找并打开对应的最外层父菜单

package/src/components/pro-layout-other-menu.vue

@@ -113,7 +113,7 @@ export default {
     },
     handleClick(item) {
       this.drawer.model = false
-      this.$emit('menu-click', item.name)
+      this.$emit('select-menu', item.name, item)
     },
     handleHistoryDelete(item) {
       Bus.$emit('delete-history-menu',item)

package/src/components/pro-layout-sider-search.vue

@@ -89,7 +89,7 @@ export default {
           });
     },
     handleSelect(item){
-      this.$emit('on-select', item.name,item.uri,item.pid)
+      this.$emit('select-menu', item.name,item)
       this.searchSideModal = false
     },
     handleInput() {

package/src/components/pro-layout-sider.vue

@@ -32,12 +32,12 @@
       </template>
     </Menu>
 
-    <ProLayoutOtherMenu :collapsed="collapsed" @menu-click="handleSelect"></ProLayoutOtherMenu>
+    <ProLayoutOtherMenu :collapsed="collapsed" @select-menu="selectMenu"></ProLayoutOtherMenu>
     <ProLayoutSiderSearch
         v-show="!collapsed"
         style="margin-right: 35px; margin-left: 1px; padding-top: 1px"
         :searchType="0"
-        @on-select="handleSelect"
+        @select-menu="selectMenu"
     ></ProLayoutSiderSearch>
     <div v-show="collapsed" :list="menuList" class="menu-collapsed" >
       <template v-for="item in menuList">
@@ -74,7 +74,7 @@ import ProLayoutSiderMenuItem from './pro-layout-sider-menu-item'
 import ProLayoutSiderCollapsedMenu from './pro-layout-sider-collapsed-menu'
 import {
   filterMenuName,
-  filterMenuUri, routeEqual,
+  filterMenuUri,
   tagExists,isOpenBlank
 } from "@lambo-design/shared/utils/platform";
 import config from "@lambo-design/shared/config/config";
@@ -175,9 +175,6 @@ export default {
         this.isCollected[menu.name] = true
       })
     },
-    selectHandle(name){
-      this.$emit('on-select', name)
-    },
     changeApp(appId,appInfo){
       this.appId = appId;
       this.changeMenu()
@@ -191,6 +188,21 @@ export default {
       }
       this.openedNames = this.getOpenedNamesByActiveName();
     },
+    selectMenu(name,menu) {
+      if (!menu) {
+        let res = this.originMenuList.filter(item => item.name == name)
+        if (res && res.length > 0) {
+          menu = res[0];
+        }
+      }
+      if (menu.appId && menu.appId != this.appId) {
+        let appInfo = this.navList.filter(app => app.appId === menu.appId);
+        Bus.$emit('change-app', {appId:menu.appId,appInfo:appInfo[0]})
+      }
+      setTimeout(()=>{
+        this.handleSelect(name)
+      },100)
+    },
     handleSelect(name,uri,pid){
       let menu = null;
       if (name.indexOf("isTurnByHref_") > -1) {
@@ -212,7 +224,6 @@ export default {
       }
       if (menu.meta && Array.isArray(menu.meta.crumbs)) {
         let parentMenu = menu.meta.crumbs[0]
-        //console.log('parentMenu',parentMenu)
         this.$set(this, 'selectedTopParent', parentMenu.name);
       } else {
         // 处理没有父菜单的情况
@@ -236,7 +247,6 @@ export default {
       return menu.parent ? this.getTopParent(menu.parent) : menu.name;
     },
     activeIconBackground(item) {
-      // console.log('activeBack')
       // 如果当前菜单项是激活的，返回一个颜色值，否则返回空
       return this.selectedMenuParent=== item.parent ? '#ff0000' : '';
     },