@lambo-design/pro-layout 1.0.0-beta.428 → 1.0.0-beta.429

package/package.json

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

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

@@ -7,18 +7,19 @@
     </div>
     <div class="logo-box">
       <slot name="pro-layout-logo">
-        <LamboProLogo></LamboProLogo>
+        <LamboProLogo :show-back-to-home="hideMenuLogo"></LamboProLogo>
       </slot>
     </div>
     <div class="nav-box" v-show="!systemInfo || !systemInfo.navType || systemInfo.navType == 'dropdown'">
       <slot name="pro-layout-nav">
         <LamboProNav
             :available-width="availableWidth"
+            :not-home-index="hideMenuLogo"
         ></LamboProNav>
       </slot>
     </div>
     <div class="tools-box">
-      <LamboProTools>
+      <LamboProTools :show-tools-quick-icons="hideMenuLogo">
         <template slot = "pro-layout-icons">
           <slot name="pro-layout-icons"></slot>
         </template>
@@ -38,6 +39,7 @@
     <div class="nav-slide-container" v-show="systemInfo && systemInfo.navType && systemInfo.navType == 'slide'" ref="slideContainer">
       <LamboProNavSilde
           :available-width="availableWidth"
+          :not-home-index="hideMenuLogo"
           @width-change="handleSlideWidthChange"
       ></LamboProNavSilde>
     </div>

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

@@ -10,7 +10,7 @@
       <Col>
         <div class="system-name" :style="nameStyle">{{systemName}}</div>
       </Col>
-      <Col v-if="'1' === systemInfo.backToHome && 'button' === systemInfo.backToHomeStyle">
+      <Col v-if="'1' === systemInfo.backToHome && 'button' === systemInfo.backToHomeStyle && showBackToHome">
         <Button class="home-btn" shape="circle" icon="ios-home">{{ systemInfo.backToHomeText || '返回工作台' }}</Button>
       </Col>
     </Row>
@@ -25,8 +25,14 @@ export default {
   name: "pro-layout-logo",
   mixins: [Locale],
   props:{
-    routeName:String,
-    default:''
+    routeName: {
+      type: String,
+      default: ''
+    },
+    showBackToHome: {
+      type: Boolean,
+      default: true
+    }
   },
   data(){
     return {

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

@@ -33,6 +33,10 @@ export default {
     availableWidth: {
       type: Number,
       default: 800
+    },
+    notHomeIndex: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -107,7 +111,9 @@ export default {
         if (this.activeName) {
           appId = this.activeName
         }
-        this.selectApp(appId)
+        if (this.notHomeIndex) {
+          this.selectApp(appId)
+        }
       }
     },
     // 计算可以显示的菜单数量

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

@@ -2,6 +2,7 @@
   <div class="pro-layout-nav-slide-wrapper" ref="slideWrapper">
     <div class="nav-box-slide" ref="navBox" :style="{ width: availableWidth + 'px' }">
       <LamboProNavSlideMenu
+          :not-home-index="notHomeIndex"
           :accept-int="pointer"
           :available-width="availableWidth"
           @topMen-list="handleCustomEvent"
@@ -45,6 +46,10 @@ export default {
     autoCalculateWidth: {
       type: Boolean,
       default: true
+    },
+    notHomeIndex: {
+      type: Boolean,
+      default: true
     }
   },
   data(){

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

@@ -4,7 +4,7 @@
         ref="topNav"
         mode="horizontal"
         theme="dark"
-        :active-name="activeName"
+        :active-name="notHomeIndex ? activeName : 'backHome'"
         @on-select="selectApp"
     >
       <template v-for="item in topMenList">
@@ -70,6 +70,10 @@ export default {
     availableWidth: {
       type: Number,
       default: 800
+    },
+    notHomeIndex: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -124,7 +128,7 @@ export default {
         this.systemInfo = data;
         this.topMenuNum = Number.isInteger(data.topMenu) ? data.topMenu : 4;
         this.acceptAppId = data.acceptAppId ? data.acceptAppId : "";
-        if (!this.activeName) {
+        if (!this.activeName && this.notHomeIndex) {
           this.activeName = this.acceptAppId;
         }
         this.initNav(this.navList);
@@ -215,7 +219,11 @@ export default {
         if (this.activeName) {
           appId = this.activeName;
         }
-        this.selectApp(appId);
+        if (this.notHomeIndex) {
+          this.selectApp(appId);
+        } else if (this.systemInfo.backToHome === "1" && this.systemInfo.backToHomeStyle === "app") {
+          this.activeName = 'backHome'
+        }
       }
       setTimeout(() => {
         this.calcTopMenus();

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

@@ -1,7 +1,7 @@
 <template>
   <div class="pro-layout-tools-wrapper">
     <slot name="pro-layout-icons">
-      <LamboProLayoutToolsQuickIcons>
+      <LamboProLayoutToolsQuickIcons v-show="showToolsQuickIcons">
         <template slot="pro-layout-custom-icons">
             <slot name="pro-layout-custom-icons"></slot>
         </template>
@@ -21,7 +21,13 @@ export default {
   components: {
     LamboProLayoutToolsQuickIcons,
     LamboProLayoutToolsUser
-  }
+  },
+  props: {
+    showToolsQuickIcons: {
+      type: Boolean,
+      default: true
+    }
+  },
 }
 </script>
 

package/src/index.vue

@@ -76,6 +76,10 @@ import Locale from '@lambo-design/core/src/mixins/locale';
 export default {
   mixins: [Locale],
   props:{
+    showLeftMenu: {
+      type: Boolean,
+      default: null
+    },
     systemInfo: {
       type: Object,
       default: () => {
@@ -188,6 +192,14 @@ export default {
       immediate: true,
       deep: true
     },
+    showLeftMenu: {
+      handler(val) {
+        if (val !== null) {
+          this.isHideLeftMenu = val;
+        }
+      },
+      immediate: true
+    },
     collapsed(val) {
       if (val) {
         this.siderWidth = 64
@@ -329,7 +341,10 @@ export default {
       if(appInfo && appInfo.setting){
         appConfig=JSON.parse(appInfo.setting)
       }
-      if(appConfig && appConfig.is_hide_left_menu){
+      // 优先使用传入的 showLeftMenu prop，其次使用 appConfig，最后使用默认值
+      if (this.showLeftMenu !== null) {
+        this.isHideLeftMenu = this.showLeftMenu;
+      } else if (appConfig && appConfig.is_hide_left_menu){
         this.isHideLeftMenu=appConfig.is_hide_left_menu!='1'
       }else{
         this.isHideLeftMenu=true
@@ -411,6 +426,7 @@ export default {
     if (savedWidth) {
       this.siderWidth = parseInt(savedWidth)
     }
+    this.initEmit();
   },
   created(){
     this.initListener();