@lambo-design/pro-layout 1.0.0-beta.430 → 1.0.0-beta.432

package/package.json

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

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'}">
@@ -19,6 +19,8 @@
 <script>
 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: {
@@ -89,13 +91,27 @@ export default {
       }
     },
     initNav(data) {
-      if (data.toString() === this.navList.toString() && this.topMenuNum === this.lastTopMenuNum) {
+      // 过滤掉首页项，获取真实的业务数据
+      const realData = data.filter(item => item.appId !== 'backHome');
+      if (realData.toString() === this.navList.toString() && this.topMenuNum === this.lastTopMenuNum) {
         return
       }
-      this.navList = data
+      this.navList = realData
       this.lastTopMenuNum = this.topMenuNum
 
-      this.topMenList = data
+      let dataClone = _.cloneDeep(realData);
+      // 如果配置了显示首页且显示样式是应用式，在列表最前面添加首页项
+      if (dataClone && dataClone.length > 0 && this.systemInfo.backToHome && this.systemInfo.backToHomeStyle === "app") {
+        const homeItem = {
+          appId: 'backHome',
+          name: this.systemInfo.backToHomeText || '首页',
+          icon: 'ios-home',
+          selected: false
+        };
+        dataClone.unshift(homeItem);
+      }
+
+      this.topMenList = dataClone
       this.$emit('topMen-list', this.topMenList);
 
       // 计算可以显示的菜单数量
@@ -103,6 +119,9 @@ export default {
 
       if (this.topMenList.length > 0) {
         let appId = this.topMenList[0].appId
+        if (this.systemInfo.backToHome && this.systemInfo.backToHomeStyle === "app") {
+          appId = this.topMenList[1].appId;
+        }
         for (let i = 0; i < this.topMenList.length; i++) {
           if (this.topMenList[i].selected == true) {
             appId = this.topMenList[i].appId
@@ -145,7 +164,7 @@ export default {
         let accumulatedWidth = 0;
         const reservedWidth = 40; // 预留一些边距
 
-        this.navList.forEach((item, index) => {
+        this.topMenList.forEach((item, index) => {
           const estimatedWidth = this.estimateMenuItemWidth(item);
           if (accumulatedWidth + estimatedWidth <= this.availableWidth - reservedWidth) {
             accumulatedWidth += estimatedWidth;
@@ -208,6 +227,13 @@ export default {
 
     selectApp(appId) {
       if (appId) {
+        if (appId === 'backHome') {
+          Bus.$emit("change-app", {
+            appId,
+            appInfo: {}
+          });
+          return;
+        }
         this.activeName = appId
         let res = this.navList.filter(app => app.appId == appId)
         Bus.$emit('change-app', { appId, appInfo: res[0] })
@@ -241,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;
+          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
       }