菜单配置封装及优化

PC/InterFace.Dash/public/config.js

@@ -7,4 +7,5 @@ window.SITE_CONFIG['columnsApiNamesZh'] = 'Z'
 window.SITE_CONFIG['isAutoLogin'] = true
 window.SITE_CONFIG['isSinglePage'] = false
 window.SITE_CONFIG['userNameOrEmailAddress'] = 'admin'
-window.SITE_CONFIG['client_secret'] = '1q2w3E*'
+window.SITE_CONFIG['client_secret'] = '1q2w3E*'
+window.SITE_CONFIG['menuHiddenConfig'] = ['AsnDet','PoDet','ReceiptDet','ReturnDet','SodDet']

PC/InterFace.Dash/src/App.vue

@@ -15,6 +15,8 @@ localStorage.setItem('isAutoLogin',window.SITE_CONFIG['isAutoLogin'])
 localStorage.setItem('isSinglePage',window.SITE_CONFIG['isSinglePage'])
 localStorage.setItem('userNameOrEmailAddress',window.SITE_CONFIG['userNameOrEmailAddress'])
 localStorage.setItem('client_secret',window.SITE_CONFIG['client_secret'])
+localStorage.setItem('menuHiddenConfig',window.SITE_CONFIG['menuHiddenConfig'])
+
 // localStorage.setItem('user',window.SITE_CONFIG['user'])
 // localStorage.setItem('print',window.SITE_CONFIG['print'])
 // localStorage.setItem('warehouseCode',window.SITE_CONFIG['warehouseCode'])

PC/InterFace.Dash/src/store/modules/permission.js

@@ -178,63 +178,70 @@ const actions = {
             _menuList.push(item.substring(item.indexOf('.') + 1,item.length))
           }          
         }
-        let _noShowMenus = ['Z.AsnDet']//不显示的菜单
+        // todo-new:接口获取 接口没有走配置文件
+        let _noShowMenus = null//不显示的菜单
+        _noShowMenus = localStorage.getItem('menuHiddenConfig').split(',')
         // 去掉不显示的菜单后全部显示的菜单
-        let _showMenus = _menuList.filter(item1 => !_noShowMenus.some(item2 => item2 === item1))
+        let _showMenus = _noShowMenus && _noShowMenus.length > 0 ? _menuList.filter(item1 => !_noShowMenus.some(item2 => item2 === item1)) : _menuList
-        // 数据模拟，todo:接口获取
+        // 数据模拟，todo-new:接口获取
-        let _treeMenusAll = [
+        let _treeMenusAll = null//树形菜单
-          {name:"aaaaaaa"},
+        // _treeMenusAll = [
-          {name:"ExportCustomUserSetting"
+        //   {name:"aaaaaaa"},
-            // ,children:[
+        //   {name:"ExportCustomUserSetting"
-            //   {name:'OutgoingDataHistory',children:[
+        //     // ,children:[
-            //     {name:'IncomingData',children:[
+        //     //   {name:'OutgoingDataHistory',children:[
-            //       {name:'OutgoingDataHistory'},
+        //     //     {name:'IncomingData',children:[
-            //       {name:'IncomingData'},
+        //     //       {name:'OutgoingDataHistory'},
-            //       {name:'333333'},
+        //     //       {name:'IncomingData'},
-            //     ]},
+        //     //       {name:'333333'},
-            //     {name:'eee1111-bbb',children:[
+        //     //     ]},
-            //       {name:'ExportCustomUserSetting'},
+        //     //     {name:'eee1111-bbb',children:[
-            //       {name:'MessageReceive'},
+        //     //       {name:'ExportCustomUserSetting'},
-            //     ]},
+        //     //       {name:'MessageReceive'},
-            //   ]},
+        //     //     ]},
-            //   {name:'eee222'},
+        //     //   ]},
-            //   {name:'eee333'},
+        //     //   {name:'eee222'},
-            //   {name:'eee444'},
+        //     //   {name:'eee333'},
-            //   {name:'eee555'},
+        //     //   {name:'eee444'},
-            // ]
+        //     //   {name:'eee555'},
-          },
+        //     // ]
-          {name:"OutgoingDataHistory"},
+        //   },
-          {name:"IncomingData"},
+        //   {name:"OutgoingDataHistory"},
-          {name:"IncomingDataHistory"},
+        //   {name:"IncomingData"},
-          {name:"MesProductL7PartsNote"},
+        //   {name:"IncomingDataHistory"},
-          {name:"MessageReceive"},
+        //   {name:"MesProductL7PartsNote"},
-          {name:"OutgoingData"},
+        //   {name:"MessageReceive"},
-          {name:"AsnDet"},
+        //   {name:"OutgoingData"},
-          {name:"AsnMstr"},
+        //   {name:"AsnDet"},
-          {name:"Bom"},
+        //   {name:"AsnMstr"},
-          {name:"CustPart"},
+        //   {name:"Bom"},
-          {name:"Cust"},
+        //   {name:"CustPart"},
-          {name:"Inventory"},
+        //   {name:"Cust"},
-          {name:"Loc"},
+        //   {name:"Inventory"},
-          {name:"Part"},
+        //   {name:"Loc"},
-          {name:"PoDet"},
+        //   {name:"Part"},
-          {name:"PoMstr"},
+        //   {name:"PoDet"},
-          {name:"PrhHist"},
+        //   {name:"PoMstr"},
-          {name:"ProdLine"},
+        //   {name:"PrhHist"},
-          {name:"ReceiptDet"},
+        //   {name:"ProdLine"},
-          {name:"ReceiptMstr"},
+        //   {name:"ReceiptDet"},
-          {name:"ReturnDet"},
+        //   {name:"ReceiptMstr"},
-          {name:"ReturnMstr"},
+        //   {name:"ReturnDet"},
-          {name:"SodDet"},
+        //   {name:"ReturnMstr"},
-          {name:"VendPart"},
+        //   {name:"SodDet"},
-          {name:"Vend"},
+        //   {name:"VendPart"},
-        ]
+        //   {name:"Vend"},
+        // ]
         
         let _initTreeMenus = []
         if(_treeMenusAll && _treeMenusAll.length > 0){
           _initTreeMenus = initTreeMenusHandle(_treeMenusAll,_showMenus,_zh,true)
         }else{
-          _initTreeMenus = _showMenus
+          let _data = []
+          for(let i in _showMenus){
+            _data.push({name:_showMenus[i]})
+          }
+          _initTreeMenus = initTreeMenusHandle(_data,_showMenus,_zh,true)
         }
         // 最后查重+层级查重后的菜单
         let _initEndMenus = generaMenu(asyncRoutes, _initTreeMenus,true)