@lambo-design/pro-layout 1.0.0-beta.352 → 1.0.0-beta.354

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/pro-layout",
-  "version": "1.0.0-beta.352",
+  "version": "1.0.0-beta.354",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -10,7 +10,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@lambo-design/shared": "^1.0.0-beta.228",
+    "@lambo-design/shared": "^1.0.0-beta.236",
     "@lambo-design/core": "^4.7.1-beta.147"
   },
   "scripts": {

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

@@ -70,9 +70,10 @@
 <script>
 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 {getAllElements, getSessionStorage} from '@lambo-design/shared/utils/platform'
 import { mapActions } from 'vuex'
 import config from '@/config/config'
+import generatorMenuList from "@lambo-design/shared/utils/menu";
 
 export default {
   name: 'pro-layout-tools-quick-search',
@@ -116,15 +117,16 @@ export default {
       'getNoticeListData'
     ]),
     initListener() {
-      Bus.$on('menu-list', (data) => {
-        this.initMenu(data);
-      })
       Bus.$on('other-datas',(data)=>{
         this.initNoticeAndMessage(data)
       });
+      Bus.$on('origin-all-menu-list',(data)=>{
+        this.initCanSearchMenu(data)
+      })
     },
     destroyListener() {
-      Bus.$off('menu-list')
+      Bus.$off('other-datas')
+      Bus.$off('origin-all-menu-list')
     },
     initNoticeAndMessage(data){
       if (data){
@@ -136,11 +138,22 @@ export default {
         }
       }
     },
-    initMenu(data){
-      let self = this
-      var appList = getSessionStorage('appList')
-      let permissionStoreKey = config.routerBase+'-permission'
-      var menuList = getSessionStorage(permissionStoreKey)
+    initCanSearchMenu(data){
+      let appList = getSessionStorage('appList')
+      let appIds = '';
+      let appIdList = [];
+      if (appList && appList.length > 0) {
+        for(let app of appList) {
+          appIdList.push(app.appId);
+        }
+        appIds = appIdList.join(",");
+      }
+      let treeMenuList = generatorMenuList(data,appIds,'menu');
+      let result = []
+      getAllElements(treeMenuList,result)
+      this.menuList = data.filter(menuItem => menuItem.type == '2' && menuItem.permissionId && result.includes(menuItem.permissionId))
+    },
+    filterMenu(){
       if (this.searchTopText){
         const regex = new RegExp(this.searchTopText, "i");
         this.menuData = this.menuList.filter(menuItem => {
@@ -148,26 +161,12 @@ export default {
         });
         return
       }
-      self.menuData = menuList.filter(item => {
-        let app = appList.find(app => app.appId === item.appId)
-        //判断每个菜单的名字是否包含搜索内容 && 菜单类型是否为2 && 菜单的appId是否在appList中
-        if (item.type == '2' && app) {
-          return true
-        }
-        return false
-      })
-      self.menuList = self.menuData
-
     },
     async handleTopInput(){
       this.searchTopModal = true
       this.spinShowTop = true
       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;
-        });
+        this.filterMenu()
       }
       this.spinShowTop = false
     },
@@ -219,7 +218,7 @@ export default {
     async tabLabel(e){
       this.tab = e
       if (e === 'menu') {
-        this.initMenu(null)
+        this.filterMenu()
       }
     },
   },

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

@@ -39,6 +39,7 @@
 import Bus from "@lambo-design/shared/utils/bus";
 import {deepCopy} from "@lambo-design/shared/utils/assist";
 import {getThemeVarByKey} from "@lambo-design/shared/utils/theme";
+import {getAllElements} from "@lambo-design/shared/utils/platform"
 export default {
   name: "FastSearch",
   props: {
@@ -81,6 +82,14 @@ export default {
       return '';
     }
   },
+  watch:{
+    treeMenuList(){
+      this.filterMenu();
+    },
+    originMenuList(){
+      this.filterMenu();
+    }
+  },
   methods:{
     initListener(){
       Bus.$on('system-info',(data)=>{
@@ -89,17 +98,28 @@ export default {
       Bus.$on('menu-list',(data)=>{
         this.initMenu(data)
       });
+      Bus.$on('tree-menu-list',(data)=>{
+        this.initTreeMenu(data);
+      })
     },
     destroyListener(){
       Bus.$off('system-info')
       Bus.$off('menu-list')
+      Bus.$off('tree-menu-list')
     },
     initSystemInfo(data){
       this.systemInfo = deepCopy(data)
     },
     initMenu(data){
       this.originMenuList = deepCopy(data);
-      this.searchMenuList = this.originMenuList.filter(menuItem => menuItem.type === 2)
+    },
+    initTreeMenu(data){
+      this.treeMenuList = deepCopy(data);
+    },
+    filterMenu(){
+      let result = []
+      getAllElements(this.treeMenuList,result)
+      this.searchMenuList = this.originMenuList.filter(menuItem => menuItem.type === 2 && menuItem.permissionId && result.includes(menuItem.permissionId))
           .map(menuItem => {
             // 检查menuItem对象的icon属性是否为'icon'或'1'
             if (!menuItem.icon) {

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

@@ -237,6 +237,7 @@ export default {
       } else {
         this.menuList = [];
       }
+      Bus.$emit('tree-menu-list',this.menuList)
       this.openedNames = this.getOpenedNamesByActiveName();
     },
     selectMenu(name,menu) {