@lambo-design/pro-layout 1.0.0-beta.434 → 1.0.0-beta.436

package/package.json

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

package/src/components/pro-layout-header/pro-layout-nav/components/pro-layout-nav-slide-menu.vue

@@ -281,7 +281,21 @@ export default {
         const currentApp = appList.find(app => app.appId === this.activeName);
         // 如果找到应用且隐藏了左侧菜单，该应用应该保持激活状态
         if (currentApp) {
-          const isHideLeftMenu = currentApp.extendProps?.is_hide_left_menu || currentApp.setting?.is_hide_left_menu;
+          let isHideLeftMenu;
+          if (currentApp.extendProps) {
+            if (typeof currentApp.extendProps === 'string') {
+              isHideLeftMenu = JSON.parse(currentApp.extendProps)?.is_hide_left_menu;
+            } else {
+              isHideLeftMenu = currentApp.extendProps.is_hide_left_menu;
+            }
+          }
+          if (!isHideLeftMenu && currentApp.setting) {
+            if (typeof currentApp.setting === 'string') {
+              isHideLeftMenu = JSON.parse(currentApp.setting)?.is_hide_left_menu;
+            } else {
+              isHideLeftMenu = currentApp.setting.is_hide_left_menu;
+            }
+          }
           if ((isHideLeftMenu === '1' || isHideLeftMenu === 1) && this.activeName === item.appId) {
             return true;
           }

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

@@ -449,7 +449,21 @@ export default {
         const currentApp = appList.find(app => app.appId === this.activeName);
         // 如果找到应用且隐藏了左侧菜单，返回 activeName
         if (currentApp) {
-          const isHideLeftMenu = currentApp.extendProps?.is_hide_left_menu || currentApp.setting?.is_hide_left_menu;
+          let isHideLeftMenu;
+          if (currentApp.extendProps) {
+            if (typeof currentApp.extendProps === 'string') {
+              isHideLeftMenu = JSON.parse(currentApp.extendProps)?.is_hide_left_menu;
+            } else {
+              isHideLeftMenu = currentApp.extendProps.is_hide_left_menu;
+            }
+          }
+          if (!isHideLeftMenu && currentApp.setting) {
+            if (typeof currentApp.setting === 'string') {
+              isHideLeftMenu = JSON.parse(currentApp.setting)?.is_hide_left_menu;
+            } else {
+              isHideLeftMenu = currentApp.setting.is_hide_left_menu;
+            }
+          }
           if (isHideLeftMenu === '1' || isHideLeftMenu === 1) {
             return this.activeName;
           }

package/src/components/pro-layout-tabs/index.vue

@@ -46,7 +46,7 @@ import {
   getPreviousTagIndex,
   getDelTagIndex,
   setTagNavListInLocalstorage,
-  showTitle
+  showTitle, getRootPermission
 } from '@lambo-design/shared/utils/platform'
 import beforeClose from '@lambo-design/shared/utils/menu/before-close'
 import Bus from "@lambo-design/shared/utils/bus";
@@ -81,6 +81,12 @@ export default {
       tabsHeight: 46
     }
   },
+  props: {
+    notSingleApp: {
+      type: Boolean,
+      default: true
+    }
+  },
   methods: {
     initListener(){
       Bus.$on('system-info',(data)=>{
@@ -233,14 +239,29 @@ export default {
       this.emitTags(res, value);
     },
     handleClick(item) {
-      if (item.meta && item.meta.appId
-          && item.meta.appId != this.appId
-          && item.meta.appId != config.homeRouter.meta.appId) {
-        let appInfo = this.navList.filter(app => app.appId === item.meta.appId);
-        if (appInfo && appInfo.length > 0) {
-          Bus.$emit('change-app', {appId:appInfo[0].appId,appInfo:appInfo[0]})
-        } else {
-          Bus.$emit('change-app', {appId:item.meta.appId,appInfo:null})
+      if (item.meta && item.meta.appId && item.meta.appId != config.homeRouter.meta.appId) {
+        let appIdInner = item.meta.appId;
+        if (!this.notSingleApp) {
+          // 如果是单应用模式，根据permissionId找到最上层目录（即导航栏中的应用）的permissionId
+          const permissionList = this.$store.getters.getOriginalPermissionList;
+          if (permissionList && permissionList.length > 0) {
+            const permission = {
+              pid: item.pid,
+              appId: item.meta ? item.meta.appId : item.appId
+            }
+            const rootPermission = getRootPermission(permissionList, permission);
+            if (rootPermission && rootPermission.permissionId) {
+              appIdInner = rootPermission.permissionId
+            }
+          }
+        }
+        if (appIdInner != this.appId) {
+          let appInfo = this.navList.filter(app => app.appId === appIdInner);
+          if (appInfo && appInfo.length > 0) {
+            Bus.$emit('change-app', {appId: appInfo[0].appId, appInfo: appInfo[0]})
+          } else {
+            Bus.$emit('change-app', {appId: appIdInner, appInfo: null})
+          }
         }
       }
       this.value = item.name

package/src/index.vue

@@ -42,7 +42,7 @@
       <i-content class="pro-layout-content">
         <i-layout class="pro-layout-content-layout">
           <div class="pro-layout-tabs" v-show="isHideLeftMenu">
-            <LamboProLayoutTabs></LamboProLayoutTabs>
+            <LamboProLayoutTabs :not-single-app="notSingleApp"></LamboProLayoutTabs>
           </div>
           <i-content class="pro-layout-page">
             <slot>
@@ -76,6 +76,10 @@ import Locale from '@lambo-design/core/src/mixins/locale';
 export default {
   mixins: [Locale],
   props:{
+    notSingleApp: {
+      type: Boolean,
+      default: true
+    },
     showLeftMenu: {
       type: Boolean,
       default: null