@lambo-design/pro-layout 1.0.0-beta.213 → 1.0.0-beta.215

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/pro-layout",
-  "version": "1.0.0-beta.213",
+  "version": "1.0.0-beta.215",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -10,8 +10,8 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@lambo-design/shared": "^1.0.0-beta.115",
-    "@lambo-design/core": "^4.7.1-beta.118"
+    "@lambo-design/core": "^4.7.1-beta.118",
+    "@lambo-design/shared": "^1.0.0-beta.115"
   },
   "scripts": {}
 }

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

@@ -79,6 +79,7 @@ export default {
         this.otherList = navList
       } else {
         this.topMenList = this.navList
+        this.otherList = []
       }
       if (this.topMenList.length > 0) {
         let appId = this.topMenList[0].appId

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">
@@ -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,24 @@ export default {
       }
       this.openedNames = this.getOpenedNamesByActiveName();
     },
+    selectMenu(name,menu) {
+      console.log("name=",name)
+      if (!menu) {
+        let res = this.originMenuList.filter(item => item.name == name)
+        if (res && res.length > 0) {
+          menu = res[0];
+        }
+      }
+      console.log("menu=",menu)
+      if (menu.appId && menu.appId != this.appId) {
+        let appInfo = this.navList.filter(app => app.appId === menu.appId);
+        console.log("appInfo=",appInfo)
+        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) {