@lambo-design/pro-layout 1.0.0-beta.331 → 1.0.0-beta.332

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/pro-layout",
-  "version": "1.0.0-beta.331",
+  "version": "1.0.0-beta.332",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -10,8 +10,8 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@lambo-design/core": "^4.7.1-beta.136",
-    "@lambo-design/shared": "^1.0.0-beta.177"
+    "@lambo-design/shared": "^1.0.0-beta.177",
+    "@lambo-design/core": "^4.7.1-beta.136"
   },
   "scripts": {
     "release-pro-layout": "pnpm release-beta && git push --follow-tags && pnpm re-publish",

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

@@ -23,12 +23,39 @@
         </Spin>
       </div>
       <div v-else class="modal-content">
-        <div v-for="(item,index) in menuData" :key="index">
-          <div class="menu-style" @click="handleMenuClick(item)">
-            <Icon :type="item.icon"/>
-            <span class="label-style">{{ item.label }}</span>
-          </div>
-        </div>
+        <Tabs value="menu" :animated="false" @on-click="tabLabel" style="width:100%;height:100%">
+          <TabPane label="菜单" name="menu">
+            <div v-if="tab==='menu'">
+              <div v-for="(item,index) in menuData" :key="index">
+                <div class="menu-style" @click="handleMenuClick(item)">
+                  <Icon :type="item.icon"/>
+                  <span class="label-style">{{ item.label }}</span>
+                </div>
+              </div>
+            </div>
+          </TabPane>
+          <TabPane label="公告" name="notice">
+            <div v-if="tab==='notice'">
+              <div v-for="(item,index) in noticeData" :key="index">
+                <div class="menu-style" @click="handleNoticeClick(item)">
+                  <Icon :type="item.icon"/>
+                  <span class="label-style">{{ item.noticeTitle }}</span>
+                </div>
+              </div>
+            </div>
+          </TabPane>
+          <TabPane label="消息" name="message">
+            <div v-if="tab==='message'">
+              <div v-for="(item,index) in noticeData" :key="index">
+                <div class="menu-style" @click="handleMessageClick(item)">
+                  <Icon :type="item.icon"/>
+                  <span class="label-style">{{ item.noticeTitle }}</span>
+                </div>
+              </div>
+            </div>
+          </TabPane>
+        </Tabs>
+
         <Row type="flex" align="middle" justify="center" class="more" >
           <Col><a @click="searchMore">更多</a></Col>
         </Row>
@@ -44,6 +71,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'
 
 export default {
   name: 'pro-layout-tools-quick-search',
@@ -55,10 +83,17 @@ export default {
       searchTopText:'',
       showTopInput:false,
       spinShowTop:false,
-      menuData:[]
+      menuData:[],
+      tab:'menu',
+      noticeData:[]
     }
   },
+  watch:{
+  },
   methods: {
+    ...mapActions([
+      'getNoticeListData'
+    ]),
     initListener() {
       Bus.$on('menu-list', (data) => {
         this.initMenu(data);
@@ -71,6 +106,13 @@ export default {
       let self = this
       var appList = getSessionStorage('appList')
       var menuList = getSessionStorage('ibp-permission') ? getSessionStorage('ibp-permission') :getSessionStorage('ibp-sc-permission')
+      if (this.searchTopText){
+        const regex = new RegExp(this.searchTopText, "i");
+        this.menuData = this.menuList.filter(menuItem => {
+          return menuItem.label.match(regex) && menuItem.type === 2;
+        });
+        return
+      }
       self.menuData = menuList.filter(item => {
         let app = appList.find(app => app.appId === item.appId)
         //判断每个菜单的名字是否包含搜索内容 && 菜单类型是否为2 && 菜单的appId是否在appList中
@@ -80,15 +122,30 @@ export default {
         return false
       })
       self.menuList = self.menuData
+
     },
-    handleTopInput(){
+    async handleTopInput(){
       this.searchTopModal = true
       this.spinShowTop = true
-      // 使用 filter 方法找到所有匹配的菜单项
-      const regex = new RegExp(this.searchTopText, "i");
-      this.menuData = this.menuList.filter(menuItem => {
-        return menuItem.label.match(regex) && menuItem.type === 2;
-      });
+      this.noticeData = []
+      if (this.tab === 'menu'){
+        // 使用 filter 方法找到所有匹配的菜单项
+        const regex = new RegExp(this.searchTopText, "i");
+        this.menuData = this.menuList.filter(menuItem => {
+          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(){
@@ -122,12 +179,34 @@ export default {
     handleMenuClick(item){
       Bus.$emit('select-menu',item.name,item)
     },
+    handleNoticeClick(item){
+      Bus.$emit('other-operate','select-notice',item.noticeId)
+    },
+    handleMessageClick(item){
+      Bus.$emit('other-operate','select-message',item.noticeId)
+    },
     searchMore(){
       this.searchTopModal = false
       this.showTopInput = false
       this.showSearchIcon = true
       Bus.$emit('other-operate','search-more',this.searchTopText)
-    }
+    },
+    async tabLabel(e){
+      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
+        })
+      }
+    },
   },
   created() {
     this.initListener()