@lambo-design/pro-layout 1.0.0-beta.333 → 1.0.0-beta.334

package/CHANGELOG.md

@@ -1,4 +1,6 @@
 # Changelog
+## [1.0.0-beta.334](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design/pro-layout@1.0.0-beta.333...@lambo-design/pro-layout@1.0.0-beta.334) (2024-05-24)
+
 ## [1.0.0-beta.333](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design/pro-layout@1.0.0-beta.327...@lambo-design/pro-layout@1.0.0-beta.333) (2024-05-24)
 
 ## [1.0.0-beta.327](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design/pro-layout@1.0.0-beta.326...@lambo-design/pro-layout@1.0.0-beta.327) (2024-05-14)

package/package.json

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

package/src/components/pro-layout-sider/components/pro-layout-sider-search.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="search-fast-con">
+  <div class="search-fast-con" :class="tabsHeight != 46 ? 'custom-tabs' : ''">
     <div class="search-fast-con-side" >
       <div class="sideInput" @click="handleSideClick">
         <Input v-if="searchType === 0" v-model="searchText" clearable placeholder="搜索菜单" font-size="8px"
@@ -38,6 +38,7 @@
 <script>
 import Bus from "@lambo-design/shared/utils/bus";
 import {deepCopy} from "@lambo-design/shared/utils/assist";
+import {getThemeVarByKey} from "@lambo-design/shared/utils/theme";
 export default {
   name: "FastSearch",
   props: {
@@ -63,7 +64,8 @@ export default {
       spinShow:false,
       systemInfo: {},
       originMenuList: [],
-      searchMenuList: []
+      searchMenuList: [],
+      tabsHeight: 46
     }
   },
   computed:{
@@ -155,10 +157,18 @@ export default {
           "--scroll-duration": `0s`,
         }
       }
+    },
+    loadingCustomStyle(){
+      let themeKey = localStorage.getItem("theme") ? localStorage.getItem("theme") : "default"
+      let tabsHeight = getThemeVarByKey(themeKey,'--layout-tabs-height');
+      if (tabsHeight) {
+        this.tabsHeight = tabsHeight;
+      }
     }
   },
   created(){
     this.initListener();
+    this.loadingCustomStyle();
   },
   beforeDestroy(){
     this.destroyListener();
@@ -203,6 +213,20 @@ export default {
       line-height: 1.6
     }
   }
+  &.custom-tabs{
+    .search-fast-con-side{
+      .sideInput {
+        height: 23px;
+        .ivu-icon{
+          height: 28px;
+          line-height: 28px;
+        }
+        .ivu-input-prefix{
+          top: -1.5px
+        }
+      }
+    }
+  }
 }
 .search-fast-con-side-modal {
   .search-spin-icon-load{
@@ -276,6 +300,11 @@ export default {
       margin-top  : 28px;
     }
   }
+  &.custom-tabs{
+    .ivu-modal {
+      margin-top  : 0px;
+    }
+  }
 }
 
 .v-transfer-dom ::-webkit-scrollbar {

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

@@ -1,5 +1,6 @@
 <template>
-  <div ref="listenWidth" class="pro-layout-sider-wrapper" :class="[collapsed ? 'menu-has-collapsed' : '']">
+  <div ref="listenWidth" class="pro-layout-sider-wrapper"
+       :class="[collapsed ? 'menu-has-collapsed' : '',tabsHeight != 46 ? 'custom-tabs' : '']">
     <Menu v-show="!collapsed" ref="menu"
           :accordion="accordion" :active-name="activeName"
           :open-names="openedNames" theme="dark"
@@ -103,6 +104,7 @@ import {
   isOpenBlank, buildSinglePermission,arraysEqual
 } from "@lambo-design/shared/utils/platform";
 import config from "@lambo-design/shared/config/config";
+import {getThemeVarByKey} from "@lambo-design/shared/utils/theme";
 
 export default {
   name: "pro-layout-sider",
@@ -142,7 +144,8 @@ export default {
       tagList: [],
       collectMenuList: [],
       isCollected: {},
-      systemInfo:{}
+      systemInfo:{},
+      tabsHeight: 46
     }
   },
   mixins:[sider],
@@ -384,6 +387,13 @@ export default {
         item: item
       }
     },
+    loadingCustomStyle(){
+      let themeKey = localStorage.getItem("theme") ? localStorage.getItem("theme") : "default"
+      let tabsHeight = getThemeVarByKey(themeKey,'--layout-tabs-height');
+      if (tabsHeight) {
+        this.tabsHeight = tabsHeight;
+      }
+    }
   },
   watch:{
     activeName(){
@@ -399,6 +409,7 @@ export default {
   mounted() {
     window.addEventListener('resize', this.handleResize); // 监听窗口大小变化事件
     this.handleResize(); // 初始化时获取一次宽度
+    this.loadingCustomStyle();
   },
   created(){
     this.initListener();
@@ -431,5 +442,8 @@ export default {
   &.menu-has-collapsed{
     padding-top: 0px;
   }
+  &.custom-tabs{
+    padding-top: 30px;
+  }
 }
 </style>

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

@@ -269,7 +269,6 @@ export default {
       let tabsHeight = getThemeVarByKey(themeKey,'--layout-tabs-height');
       if (tabsHeight) {
         this.tabsHeight = tabsHeight;
-        console.log("tabsHeight=",tabsHeight)
       }
     }
   },