@lambo-design/pro-layout 1.0.0-beta.431 → 1.0.0-beta.433

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/pro-layout",
-  "version": "1.0.0-beta.431",
+  "version": "1.0.0-beta.433",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -10,8 +10,8 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@lambo-design/shared": "^1.0.0-beta.351",
-    "@lambo-design/core": "^4.7.1-beta.176"
+    "@lambo-design/core": "^4.7.1-beta.176",
+    "@lambo-design/shared": "^1.0.0-beta.352"
   },
   "scripts": {
     "release-pro-layout": "pnpm release-beta && git push --follow-tags && pnpm re-publish",

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

@@ -3,7 +3,7 @@
     <ul class="top-menu" :style="layoutSize === 'default' ? {height: '64px'} : {height: '50px'}" ref="topNav">
       <template v-for="(item,index) in topMenList" >
         <li class="top-menu-item"
-            :class="{ 'active': notHomeIndex ? activeName === item.appId : 'backHome' === item.appId}"
+            :class="{ 'active': getIsActive(item) }"
             :key="item.appId"
             @click="selectApp(item.appId)">
           <div class="menu-item" :style="layoutSize === 'default' ? {paddingTop: '10px'} : {paddingTop: '2px'}">
@@ -20,6 +20,7 @@
 import Bus from '@lambo-design/shared/utils/bus'
 import { deepCopy } from '@lambo-design/shared/utils/assist'
 import _ from "lodash";
+import {getSessionStorage} from "@lambo-design/shared/utils/n";
 
 export default {
   props: {
@@ -266,6 +267,29 @@ export default {
           item.style.display = 'block';
         }
       });
+    },
+    getIsActive(item) {
+      // 如果不是首页模式，直接比较 appId
+      if (this.notHomeIndex) {
+        return this.activeName === item.appId;
+      }
+
+      // 如果是首页模式，检查当前 activeName 对应的应用是否隐藏了左侧菜单
+      const appList = getSessionStorage('appList');
+      if (appList && Array.isArray(appList) && appList.length > 0) {
+        // 查找当前 activeName 对应的应用
+        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;
+          if ((isHideLeftMenu === '1' || isHideLeftMenu === 1) && this.activeName === item.appId) {
+            return true;
+          }
+        }
+      }
+
+      // 否则只有 backHome 项应该是激活的
+      return 'backHome' === item.appId;
     }
   },
   watch: {

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

@@ -4,7 +4,7 @@
         ref="topNav"
         mode="horizontal"
         theme="dark"
-        :active-name="notHomeIndex ? activeName : 'backHome'"
+        :active-name="getActiveName()"
         @on-select="selectApp"
     >
       <template v-for="item in topMenList">
@@ -63,6 +63,7 @@ import Bus from "@lambo-design/shared/utils/bus";
 import { deepCopy } from "@lambo-design/shared/utils/assist";
 import { arraysEqual } from "@lambo-design/shared/utils/platform";
 import _ from "lodash";
+import {getSessionStorage} from "@lambo-design/shared/utils/n";
 
 export default {
   name: "pro-layout-nav",
@@ -434,6 +435,29 @@ export default {
       return {
         type:item.icon
       }
+    },
+    getActiveName() {
+      // 如果不是首页模式，直接返回 activeName
+      if (this.notHomeIndex) {
+        return this.activeName;
+      }
+
+      // 如果是首页模式，检查当前 activeName 对应的应用是否隐藏了左侧菜单
+      const appList = getSessionStorage('appList');
+      if (appList && Array.isArray(appList) && appList.length > 0) {
+        // 查找当前 activeName 对应的应用
+        const currentApp = appList.find(app => app.appId === this.activeName);
+        // 如果找到应用且隐藏了左侧菜单，返回 activeName
+        if (currentApp) {
+          const isHideLeftMenu = currentApp.extendProps?.is_hide_left_menu;
+          if (isHideLeftMenu === '1' || isHideLeftMenu === 1) {
+            return this.activeName;
+          }
+        }
+      }
+
+      // 否则返回首页
+      return 'backHome';
     }
   },
   watch: {

package/src/index.vue

@@ -341,12 +341,13 @@ export default {
       if(appInfo && appInfo.setting){
         appConfig=JSON.parse(appInfo.setting)
       }
-      // 优先使用传入的 showLeftMenu prop，其次使用 appConfig，最后使用默认值
-      if (this.showLeftMenu !== null) {
-        this.isHideLeftMenu = this.showLeftMenu;
-      } else if (appConfig && appConfig.is_hide_left_menu){
+
+      // 优先使用 appConfig，其次使用传入的 showLeftMenu prop，最后使用默认值
+      if (appConfig && appConfig.is_hide_left_menu){
         this.isHideLeftMenu=appConfig.is_hide_left_menu!='1'
-      }else{
+      } else if (this.showLeftMenu !== null) {
+        this.isHideLeftMenu = this.showLeftMenu;
+      } else{
         this.isHideLeftMenu=true
       }