@lambo-design/pro-layout 1.0.0-beta.336 → 1.0.0-beta.339

package/CHANGELOG.md

@@ -1,4 +1,6 @@
 # Changelog
+## [1.0.0-beta.339](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design/pro-layout@1.0.0-beta.335...@lambo-design/pro-layout@1.0.0-beta.339) (2024-05-31)
+
 ## [1.0.0-beta.335](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design/pro-layout@1.0.0-beta.334...@lambo-design/pro-layout@1.0.0-beta.335) (2024-05-24)
 
 ## [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)

package/package.json

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

package/src/components/pro-layout-header/pro-layout-tools/components/pro-layout-tools-quick-search.vue

@@ -46,7 +46,7 @@
           </TabPane>
           <TabPane label="消息" name="message">
             <div v-if="tab==='message'">
-              <div v-for="(item,index) in noticeData" :key="index">
+              <div v-for="(item,index) in messageData" :key="index">
                 <div class="menu-style" @click="handleMessageClick(item)">
                   <Icon :type="item.icon"/>
                   <span class="label-style">{{ item.noticeTitle }}</span>
@@ -72,6 +72,7 @@ import Bus from '@lambo-design/shared/utils/bus'
 import { deepCopy } from '@lambo-design/shared/utils/assist'
 import {getSessionStorage} from '@lambo-design/shared/utils/platform'
 import { mapActions } from 'vuex'
+import config from '@/config/config'
 
 export default {
   name: 'pro-layout-tools-quick-search',
@@ -85,10 +86,30 @@ export default {
       spinShowTop:false,
       menuData:[],
       tab:'menu',
-      noticeData:[]
+      noticeData:[],
+      messageData:[],
+      perSearchMap:new Map()
     }
   },
   watch:{
+    searchTopText(keyword){
+      if (this.tab === 'notice'){
+        this.perSearchMap.set('notice',keyword)
+        Bus.$emit('change-search-keyword',keyword,this.tab)
+      }else if (this.tab === 'message'){
+        Bus.$emit('change-search-keyword',keyword,this.tab)
+        this.perSearchMap.set('message',keyword)
+      }
+    },
+    tab(val){
+      if (val === 'notice' && this.perSearchMap.get('notice') !== this.searchTopText){
+        this.perSearchMap.set('notice',this.searchTopText)
+        Bus.$emit('change-search-tab',this.searchTopText,val)
+      }else if (val === 'message' && this.perSearchMap.get('message') !== this.searchTopText){
+        Bus.$emit('change-search-tab',this.searchTopText,val)
+        this.perSearchMap.set('message',this.searchTopText)
+      }
+    }
   },
   methods: {
     ...mapActions([
@@ -98,14 +119,22 @@ export default {
       Bus.$on('menu-list', (data) => {
         this.initMenu(data);
       })
+      Bus.$on('other-datas',(data)=>{
+        this.initNoticeAndMessage(data)
+      });
     },
     destroyListener() {
       Bus.$off('menu-list')
     },
+    initNoticeAndMessage(data){
+      this.noticeData = data.noticeList
+      this.messageData = data.messageList
+    },
     initMenu(data){
       let self = this
       var appList = getSessionStorage('appList')
-      var menuList = getSessionStorage('ibp-permission') ? getSessionStorage('ibp-permission') :getSessionStorage('ibp-sc-permission')
+      let permissionStoreKey = config.routerBase+'-permission'
+      var menuList = getSessionStorage(permissionStoreKey)
       if (this.searchTopText){
         const regex = new RegExp(this.searchTopText, "i");
         this.menuData = this.menuList.filter(menuItem => {
@@ -127,7 +156,6 @@ export default {
     async handleTopInput(){
       this.searchTopModal = true
       this.spinShowTop = true
-      this.noticeData = []
       if (this.tab === 'menu'){
         // 使用 filter 方法找到所有匹配的菜单项
         const regex = new RegExp(this.searchTopText, "i");
@@ -135,17 +163,6 @@ export default {
           return menuItem.label.match(regex) && menuItem.type === 2;
         });
       }
-      else if (this.tab ==='notice'){
-        this.noticeData = await this.getNoticeListData({
-          noticeType:'10',
-          noticeTitle:this.searchTopText
-        })
-      }else if (this.tab ==='message'){
-        this.noticeData = await this.getNoticeListData({
-          noticeType:'20',
-          noticeTitle:this.searchTopText
-        })
-      }
       this.spinShowTop = false
     },
     handleTopBlur(){
@@ -197,16 +214,6 @@ export default {
       this.tab = e
       if (e === 'menu') {
         this.initMenu(null)
-      } else if (e === 'notice') {
-        this.noticeData = await this.getNoticeListData({
-          noticeType:'10',
-          noticeTitle:this.searchTopText
-        })
-      } else if (e === 'message') {
-        this.noticeData = await this.getNoticeListData({
-          noticeType:'20',
-          noticeTitle:this.searchTopText
-        })
       }
     },
   },

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

@@ -216,14 +216,14 @@ export default {
   &.custom-tabs{
     .search-fast-con-side{
       .sideInput {
-        height: 23px;
+        height: 30px;
         /deep/.ivu-icon{
-          height: 28px;
-          line-height: 28px;
+          height: 36px;
+          line-height: 36px;
         }
       }
       /deep/.ivu-input{
-        height: 28px;
+        height: 36px;
       }
     }
   }
@@ -302,7 +302,7 @@ export default {
   }
   &.custom-tabs{
     .ivu-modal {
-      margin-top  : 0px;
+      margin-top  : 5px;
     }
   }
 }

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

@@ -443,7 +443,7 @@ export default {
     padding-top: 0px;
   }
   &.custom-tabs{
-    padding-top: 30px;
+    padding-top: 36px;
   }
 }
 </style>

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

@@ -411,29 +411,29 @@ export default {
     }
   }
   &.custom-tabs{
-    height: 30px;
-    line-height: 26px;
+    height: 36px;
+    line-height: 30px;
     .close-con{
       .btn-close{
-        margin-top: 3px;
+        margin-top: 5px;
       }
     }
     .btn-con{
-      padding: 3px 0px;
+      padding: 5px 0px;
     }
     .scroll-outer{
       left: 8px;
       right: 51px;
       .scroll-body{
         /deep/.ivu-tag-dot{
-          height: 20px;
-          line-height: 20px;
-          padding: 0 4px;
+          height: 28px;
+          line-height: 28px;
+          padding: 0 8px;
           .ivu-tag-dot-inner{
-            width: 8px;
-            height: 8px;
+            width: 10px;
+            height: 10px;
             margin-right: 2px;
-            top: 0px;
+            top: 1px;
           }
         }
         /deep/.ivu-tag{

package/src/index.vue

@@ -196,6 +196,18 @@ export default {
       Bus.$on('other-operate',(type,data)=>{
         this.otherOperate(type,data);
       })
+      Bus.$on('change-search-keyword',(keyword,tab)=>{
+        this.$emit('other-operate','search-keyword',{
+          keyword:keyword,
+          tab:tab
+        })
+      })
+      Bus.$on('change-search-tab',(keyword,tab)=>{
+        this.$emit('other-operate','search-keyword',{
+          keyword:keyword,
+          tab:tab
+        })
+      })
     },
     destroyListener(){
       Bus.$off('trigger-change')
@@ -208,6 +220,8 @@ export default {
       Bus.$off('toggle-collect-menu')
       Bus.$off('click-logo')
       Bus.$off('other-operate')
+      Bus.$off('change-keyword')
+      Bus.$off('change-tab')
     },
     initEmit(){
       //在这里改this.menuList