@lambo-design/pro-layout 1.0.0-beta.413 → 1.0.0-beta.417

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/pro-layout",
-  "version": "1.0.0-beta.413",
+  "version": "1.0.0-beta.417",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@lambo-design/core": "^4.7.1-beta.171",
-    "@lambo-design/shared": "^1.0.0-beta.303"
+    "@lambo-design/shared": "^1.0.0-beta.318"
   },
   "scripts": {
     "release-pro-layout": "pnpm release-beta && git push --follow-tags && pnpm re-publish",

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

@@ -30,6 +30,11 @@
         </template>
       </LamboProTools>
     </div>
+    <div class="slogan-box" style="display: none;">
+      <slot name="pro-layout-slogan">
+        <LamboProSlogan></LamboProSlogan>
+      </slot>
+    </div>
     <div class="nav-slide-container" v-show="systemInfo && systemInfo.navType && systemInfo.navType == 'slide'" ref="slideContainer">
       <LamboProNavSilde
           :available-width="availableWidth"
@@ -44,6 +49,7 @@ import LamboProTrigger from './pro-layout-trigger'
 import LamboProLogo from './pro-layout-logo'
 import LamboProNav from './pro-layout-nav'
 import LamboProNavSilde from './pro-layout-nav/index-slide'
+import LamboProSlogan from './pro-layout-slogan/index'
 import LamboProTools from './pro-layout-tools'
 import Bus from "@lambo-design/shared/utils/bus";
 
@@ -71,6 +77,7 @@ export default {
     LamboProLogo,
     LamboProNav,
     LamboProNavSilde,
+    LamboProSlogan,
     LamboProTools
   },
   computed:{
@@ -199,6 +206,9 @@ export default {
     flex: 1;
     overflow: hidden;
   }
+  .slogan-box {
+    float: right;
+  }
   .tools-box{
     float: right;
   }

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

@@ -76,7 +76,7 @@ export default {
       if (data) {
         this.systemInfo = data
         this.layoutSize = data.layoutSize ? data.layoutSize : 'default';
-        this.topMenuNum = data.topMenu ? data.topMenu : 4;
+        this.topMenuNum =  Number.isInteger(data.topMenu) ? data.topMenu : 4;
         this.acceptAppId = data.acceptAppId ? data.acceptAppId : '';
         if (!this.activeName) {
           this.activeName = this.acceptAppId
@@ -166,7 +166,7 @@ export default {
 
         // this.displayMenuNum = Math.max(1, displayCount);
         // 判断是否需要显示箭头
-        const needArrows = this.topMenList.length > this.displayMenuNum;
+        const needArrows = this.topMenList.length > this.displayMenuNum && this.displayMenuNum > 0;
         this.$emit('topMen-num', this.displayMenuNum);
         this.$emit('topMen-true', needArrows);
 

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

@@ -122,7 +122,7 @@ export default {
     initSystemInfo(data) {
       if (data) {
         this.systemInfo = data;
-        this.topMenuNum = data.topMenu ? data.topMenu : 4;
+        this.topMenuNum = Number.isInteger(data.topMenu) ? data.topMenu : 4;
         this.acceptAppId = data.acceptAppId ? data.acceptAppId : "";
         if (!this.activeName) {
           this.activeName = this.acceptAppId;

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

@@ -0,0 +1,40 @@
+<template>
+  <div class="pro-layout-slogan-wrapper">
+    <div class="slogan-content">正直豁达 智慧精微</div>
+  </div>
+</template>
+
+<script>
+import Locale from '@lambo-design/core/src/mixins/locale';
+
+export default {
+  name: "pro-layout-slogan",
+  mixins: [Locale],
+  props:{
+    default:''
+  },
+  data(){
+    return {
+
+    }
+  },
+  computed:{
+  },
+  methods: {
+  },
+  created(){
+  },
+  beforeDestroy(){
+  }
+}
+</script>
+
+<style scoped lang="less">
+@import "@lambo-design/core/src/styles/default";
+.pro-layout-slogan-wrapper{
+  overflow: hidden;
+  .slogan-content{
+    font-size: 16px;
+  }
+}
+</style>