@lambo-design/pro-layout 1.0.0-beta.461 → 1.0.0-beta.462

package/package.json

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

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

@@ -2,12 +2,12 @@
   <div class="pro-layout-header-wrapper">
     <div class="trigger-box" :style="menuScalingStyle">
       <slot name="pro-layout-trigger">
-        <LamboProTrigger v-if="systemInfo.menuScaling === '1'" :menu-scaling-status="systemInfo.menuScalingStatus" :hide-menu-logo="hideMenuLogo"></LamboProTrigger>
+        <LamboProTrigger v-if="systemInfo.menuScaling === '1'" :menu-scaling-status="systemInfo.menuScalingStatus" :is-show="!isHome && isShowLeftMenu"></LamboProTrigger>
       </slot>
     </div>
     <div class="logo-box">
       <slot name="pro-layout-logo">
-        <LamboProLogo :show-back-to-home="hideMenuLogo"></LamboProLogo>
+        <LamboProLogo :is-home="isHome"></LamboProLogo>
       </slot>
     </div>
     <div class="nav-box" v-show="!systemInfo || !systemInfo.navType || systemInfo.navType == 'dropdown'">
@@ -15,7 +15,7 @@
         <LamboProNav
             ref="nav"
             :available-width="availableWidth"
-            :not-home-index="hideMenuLogo"
+            :is-home="isHome"
         ></LamboProNav>
       </slot>
     </div>
@@ -41,7 +41,7 @@
       <LamboProNavSilde
           ref="sildeNav"
           :available-width="availableWidth"
-          :not-home-index="hideMenuLogo"
+          :is-home="isHome"
           @width-change="handleSlideWidthChange"
       ></LamboProNavSilde>
     </div>
@@ -64,7 +64,11 @@ export default {
       type: String,
       default:''
     },
-    hideMenuLogo: {
+    isHome: {
+      type: Boolean,
+      default:true
+    },
+    isShowLeftMenu: {
       type: Boolean,
       default:true
     }

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 && showBackToHome">
+      <Col v-if="'1' === systemInfo.backToHome && 'button' === systemInfo.backToHomeStyle && !isHome">
         <Button class="home-btn" shape="circle" icon="ios-home">{{ systemInfo.backToHomeText || '返回工作台' }}</Button>
       </Col>
     </Row>
@@ -29,7 +29,7 @@ export default {
       type: String,
       default: ''
     },
-    showBackToHome: {
+    isHome: {
       type: Boolean,
       default: true
     }

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

@@ -36,7 +36,7 @@ export default {
       type: Number,
       default: 800
     },
-    notHomeIndex: {
+    isHome: {
       type: Boolean,
       default: true
     }
@@ -84,7 +84,7 @@ export default {
         this.layoutSize = data.layoutSize ? data.layoutSize : 'default';
         this.topMenuNum =  Number.isInteger(data.topMenu) ? data.topMenu : 4;
         this.acceptAppId = data.acceptAppId ? data.acceptAppId : '';
-        if (!this.activeName && this.notHomeIndex) {
+        if (!this.activeName && !this.isHome) {
           this.activeName = this.acceptAppId
         }
         this.initNav(this.navList)
@@ -130,7 +130,7 @@ export default {
         if (this.activeName) {
           appId = this.activeName
         }
-        if (this.notHomeIndex) {
+        if (!this.isHome) {
           this.selectApp(appId)
         } else if (this.systemInfo.backToHome === "1" && this.systemInfo.backToHomeStyle === "app") {
           this.activeName = 'backHome'
@@ -270,7 +270,7 @@ export default {
     },
     getIsActive(item) {
       // 如果不是首页模式，直接比较 appId
-      if (this.notHomeIndex) {
+      if (!this.isHome) {
         return this.activeName === item.appId;
       }
 

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

@@ -2,7 +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"
+          :is-home="isHome"
           :accept-int="pointer"
           :available-width="availableWidth"
           @topMen-list="handleCustomEvent"
@@ -48,7 +48,7 @@ export default {
       type: Boolean,
       default: true
     },
-    notHomeIndex: {
+    isHome: {
       type: Boolean,
       default: true
     }

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

@@ -72,7 +72,7 @@ export default {
       type: Number,
       default: 800
     },
-    notHomeIndex: {
+    isHome: {
       type: Boolean,
       default: true
     }
@@ -129,7 +129,7 @@ export default {
         this.systemInfo = data;
         this.topMenuNum = Number.isInteger(data.topMenu) ? data.topMenu : 4;
         this.acceptAppId = data.acceptAppId ? data.acceptAppId : "";
-        if (!this.activeName && this.notHomeIndex) {
+        if (!this.activeName && !this.isHome) {
           this.activeName = this.acceptAppId;
         }
         this.initNav(this.navList);
@@ -220,7 +220,7 @@ export default {
         if (this.activeName) {
           appId = this.activeName;
         }
-        if (this.notHomeIndex) {
+        if (!this.isHome) {
           this.selectApp(appId);
         } else if (this.systemInfo.backToHome === "1" && this.systemInfo.backToHomeStyle === "app") {
           this.activeName = 'backHome'
@@ -438,7 +438,7 @@ export default {
     },
     getActiveName() {
       // 如果不是首页模式，直接返回 activeName
-      if (this.notHomeIndex) {
+      if (!this.isHome) {
         return this.activeName;
       }
 

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

@@ -1,6 +1,6 @@
 <template>
   <a @click="handleChange" type="text" :class="['sider-trigger-a', collapsed ? 'collapsed' : '']">
-    <Icon type="md-menu" size="26" v-show="hideMenuLogo" />
+    <Icon type="md-menu" size="26" v-show="isShow" />
   </a>
 </template>
 
@@ -9,7 +9,7 @@ import Bus from '@lambo-design/shared/utils/bus'
 export default {
   name: "pro-layout-trigger",
   props:{
-    hideMenuLogo: {
+    isShow: {
       type: Boolean,
       default:true
     },

package/src/index.vue

@@ -1,7 +1,7 @@
 <template>
   <i-layout class="pro-layout" :class="layoutClass">
     <i-header class="pro-layout-header" :style="systemInfo.headBackground ? headBackgroundStyle : ''">
-      <LamboProLayoutHeader :hide-menu-logo="isHideLeftMenu" ref="header">
+      <LamboProLayoutHeader :is-home="isHome" :is-show-left-menu="isShowLeftMenu" ref="header">
         <template slot = "pro-layout-trigger">
           <slot name="pro-layout-trigger"></slot>
         </template>
@@ -24,7 +24,7 @@
     </i-header>
     <i-layout>
       <i-sider
-          v-show="isHideLeftMenu"
+          v-show="isShowLeftMenu"
           class="pro-layout-sider"
           hide-trigger
           collapsible
@@ -34,14 +34,14 @@
         <LamboProLayoutSider ref="sider"></LamboProLayoutSider>
         <!-- 拖拽条 -->
         <div
-            v-show="isHideLeftMenu"
+            v-show="isShowLeftMenu"
             class="sider-resize-bar"
             @mousedown.stop.prevent="startResize"
         ></div>
       </i-sider>
       <i-content class="pro-layout-content">
         <i-layout class="pro-layout-content-layout">
-          <div class="pro-layout-tabs" v-show="isHideLeftMenu">
+          <div class="pro-layout-tabs" v-show="isShowLeftMenu">
             <LamboProLayoutTabs ref="tabs" :not-single-app="notSingleApp"></LamboProLayoutTabs>
           </div>
           <i-content class="pro-layout-page">
@@ -80,7 +80,7 @@ export default {
       type: Boolean,
       default: true
     },
-    showLeftMenu: {
+    isHome: {
       type: Boolean,
       default: false
     },
@@ -143,7 +143,7 @@ export default {
       appId: '',
       activeName: '',
       tagList: [],
-      isHideLeftMenu: true,
+      isShowLeftMenu: true,
       siderWidth: 220,
       isResizing: false,
       minWidth: 180,
@@ -196,14 +196,6 @@ export default {
       immediate: true,
       deep: true
     },
-    showLeftMenu: {
-      handler(val) {
-        if (val === false) {
-          this.isHideLeftMenu = val;
-        }
-      },
-      immediate: true
-    },
     collapsed(val) {
       if (val) {
         this.siderWidth = 64
@@ -347,13 +339,11 @@ export default {
         appConfig=JSON.parse(appInfo.setting)
       }
 
-      // 优先使用 appConfig，其次使用传入的 showLeftMenu prop，最后使用默认值
+      // 优先使用 appConfig最后使用默认值
       if (appConfig && appConfig.hasOwnProperty("is_hide_left_menu")){
-        this.isHideLeftMenu = appConfig.is_hide_left_menu != '1'
-      } else if (this.showLeftMenu !== null) {
-        this.isHideLeftMenu = this.showLeftMenu;
-      } else{
-        this.isHideLeftMenu = true
+        this.isShowLeftMenu = appConfig.is_hide_left_menu != '1'
+      } else {
+        this.isShowLeftMenu = true
       }
 
       this.appId = appId;