@lambo-design/pro-layout 1.0.0-beta.172 → 1.0.0-beta.175

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/pro-layout",
-  "version": "1.0.0-beta.172",
+  "version": "1.0.0-beta.175",
   "description": "",
   "main": "index.js",
   "scripts": {},

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

@@ -12,17 +12,18 @@
     <div class="tools-box">
       <LamboProTools></LamboProTools>
     </div>
-
-    <!--    <FastSearch-->
-    <!--      style="margin-right: 10px"-->
-    <!--      :searchType="1"-->
-    <!--      @on-select="handleSelect"-->
-    <!--    ></FastSearch>-->
-    <Menu ref="menu"
-          :active-name="activeName"
-          :open-names="openedNames"
-          @on-select="handleSelect">
-    </Menu>
+<!--    <div class="search-box" v-if="isShowSearch === '1'" >-->
+<!--      <FastSearch-->
+<!--          style="margin-right: 10px"-->
+<!--          :searchType="1"-->
+<!--          @on-select="handleSelect"-->
+<!--      ></FastSearch>-->
+<!--    </div>-->
+<!--    <Menu ref="menu"-->
+<!--          :active-name="activeName"-->
+<!--          :open-names="openedNames"-->
+<!--          @on-select="handleSelect">-->
+<!--    </Menu>-->
   </div>
 </template>
 
@@ -47,6 +48,8 @@ export default {
   },
   data(){
     return {
+      systemInfo: {},
+      isShowSearch:'1',
       navList: [],
       originMenuList:[],
       menuList: [],
@@ -75,10 +78,14 @@ export default {
     FastSearch
   },
   methods:{
+
     handleClick(){
       this.$emit('clickLogo')
     },
     initListener(){
+      Bus.$on('system-info',(data)=>{
+        this.initSystem(data)
+      });
       Bus.$on('nav-list',(data)=>{
         this.initNav(data)
       });
@@ -105,9 +112,25 @@ export default {
       Bus.$off('change-app')
       Bus.$off('tag-list')
       Bus.$off('menu-click')
+      Bus.$off('system-info')
+    },
+    initSystem(data){
+      if (data) {
+        this.systemInfo = data;
+        if (data.isShowSearch) {
+          //console.log('head中的isShowSearch',data.isShowSearch)
+          this.isShowSearch = data.isShowSearch;
+        }
+      }
+    },
+    initNav(data){
+      if (data.toString() === this.navList.toString()) {
+        return;
+      }
+      this.navList = data;
     },
     handleSelect(name,uri,pid){
-     // console.log('head中的handleSelect',name,uri,pid)
+      //console.log('head中的handleSelect',name,uri,pid)
       let menu = null;
       if (name.indexOf("isTurnByHref_") > -1) {
         name = name.replace("isTurnByHref_","");
@@ -145,7 +168,7 @@ export default {
           this.activeName = menu.name; // 设置当前菜单为激活状态
         }
       }
-      //console.log("nextTick之前，openedNames:", this.openedNames);
+     // console.log("nextTick之前，openedNames:", this.openedNames);
 
       this.$nextTick(() => {
        // console.log("nextTick内部，openedNames:", JSON.parse(JSON.stringify(this.openedNames)));

package/src/components/search-fast.vue

@@ -52,10 +52,10 @@
 
     <div class="search-fast-con-side" >
       <div class="sideInput" @click="handleSideClick">
-        <Input v-if="searchType === 0" v-model="searchText" clearable id="modalInput"  placeholder="搜索菜单"
+        <Input v-if="searchType === 0" v-model="searchText" clearable id="modalInput"  placeholder="搜索菜单" font-size="8px"
                @on-change="handleInput" :border="false" @on-blur="searchSideModal= false">
           <template #prefix>
-            <Icon type="ios-search"  size="22"/>
+            <Icon type="ios-search"  size="23"/>
           </template>
         </Input>
       </div>
@@ -360,20 +360,24 @@ export default {
   //background: #22262f;
 }
 .search-fast-con-side .ivu-input{
-  font-size: 15px;
+  font-size: 9.5px;
   width: 228.5px;
+  height: 40px;
   font-family: Microsoft YaHei;
   font-weight: 400;
   border: none;
   background-color: rgba(2,55,133);
-  text-align: center; /* 确保文本默认左对齐 */
+  text-align:left; /* 确保文本默认左对齐 */
   color: rgba(42, 97 ,200);
   padding-right: 90px;
+  padding-left: 50px;
 }
 .search-fast-con-side-modal .ivu-modal-body .modal1-content {
   padding-top: 6px;
+  padding-left: 10px;
   height: 270px;
-  width: 203px;
+  width: 211px;
+  margin-left: -13px;
   overflow-x: hidden;
   overflow-y: auto;
   background-color: rgba(0, 44, 107);
@@ -411,6 +415,7 @@ search-fast-con-side-modal .ivu-modal-body{
 .search-fast-con-side .ivu-icon-ios-search:before {
   margin-right: -30px; /* 向右移动10像素 */
   color: rgba(42, 97 ,200);
+  line-height: 1.6
 }
 .search-fast-con-top .ivu-icon-ios-search-outline:before {
   //margin-right: -1000px;