@lambo-design/shared 1.0.0-beta.227 → 1.0.0-beta.228

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/shared",
-  "version": "1.0.0-beta.227",
+  "version": "1.0.0-beta.228",
   "description": "",
   "main": "index.js",
   "author": "lambo",

package/utils/menu/index.js

@@ -44,8 +44,8 @@ export const hasRoutePath = ($router, path) => {
  * @param permissionList
  * @returns []
  */
-export const generatorMenuList = (permissionList,appId) => {
-    let menuRouter = generatorMenuRouter(permissionList,appId);
+export const generatorMenuList = (permissionList,appId,generateType = 'router') => {
+    let menuRouter = generatorMenuRouter(permissionList,appId,generateType);
     return menuRouter && menuRouter.menuData ? menuRouter.menuData : [];
 };
 /**
@@ -53,7 +53,7 @@ export const generatorMenuList = (permissionList,appId) => {
  * @param generatorMenuRouter
  * @returns []
  */
-export const generatorMenuRouter = (permissionList,appId) => {
+export const generatorMenuRouter = (permissionList,appId,generateType = 'router') => {
     let menuData = [],
         pageNode = {
             path: "/page",
@@ -65,7 +65,7 @@ export const generatorMenuRouter = (permissionList,appId) => {
             component: "Main",
             children: []
         };
-    listToMenuTree(permissionList, menuData, pageNode, "0", [], true,appId);
+    listToMenuTree(permissionList, menuData, pageNode, "0", [], true,appId,generateType);
     return {menuData,pageNode};
 };
 
@@ -73,15 +73,15 @@ export const generatorMenuRouter = (permissionList,appId) => {
 /**
  * 数组转树形结构
  */
-const listToMenuTree = (list, menuTree, pageNode, parentId, crumbs, root, appId) => {
+const listToMenuTree = (list, menuTree, pageNode, parentId, crumbs, root, appId,generateType = 'router') => {
     if (list == null) {
         return;
     }
     list.forEach(item => {
-        if (!appId //没有appId表示渲染全部菜单
-            || (item.appId == appId && (!item.hasOwnProperty("hideInMenu") || (item.hasOwnProperty("hideInMenu") && !item.hideInMenu))) //默认加载某一个app的菜单
-            || appId.indexOf(item.appId) > -1 // 渲染指定appId的菜单
-        ){
+        let appIdCondition = !appId || item.appId == appId || appId.indexOf(item.appId) > -1;//过滤是否要求的应用
+        let hideInMenuCondition = !(item.hasOwnProperty("hideInMenu") && item.hideInMenu);//过滤是否隐藏的菜单
+        if ((generateType && generateType == 'router' && appIdCondition) ||
+            (generateType == 'menu' && appIdCondition && hideInMenuCondition)) {
             // 判断是否为父级菜单
             if (item.pid === parentId) {
                 if (item.type === 1 || item.type === 2) {
@@ -171,8 +171,8 @@ const listToMenuTree = (list, menuTree, pageNode, parentId, crumbs, root, appId)
  * @param generatorMenuRouter
  * @returns []
  */
-export const generatorDynamicRouter = (permissionList,constantRouterComponents,appIds = null) => {
-    let allMenu = generatorMenuRouter(permissionList, appIds);
+export const generatorDynamicRouter = (permissionList,constantRouterComponents,appIds = null,generateType = 'router') => {
+    let allMenu = generatorMenuRouter(permissionList, appIds,generateType);
     let menuData = allMenu.menuData;
     let pageNode = allMenu.pageNode;
     if (menuData && pageNode && pageNode.children.length > 0) {

package/utils/platform.js

@@ -830,10 +830,11 @@ export const isCenterApp = (app) => {
  * @param appType
  * @returns {*[]}
  */
-export const buildNavListByMenu = (permissionList,appInfo,appType) => {
+export const buildNavListByMenu = (permissionList,appInfo,appType,defaultHideName = '') => {
   let navList = []
   if (permissionList && appInfo && appInfo.appId) {
-    let permissions = permissionList.filter(item => item.hasOwnProperty('pid') && item.pid == '0' && item.appId == appInfo.appId)
+    let permissions = permissionList.filter(item => item.hasOwnProperty('pid')
+        && item.pid == '0' && item.appId == appInfo.appId && item.name != defaultHideName)
     for (let per of permissions) {
       if (appType && appType == 'sc') {
         let nav = {
@@ -895,7 +896,7 @@ export const buildNavListByMenu = (permissionList,appInfo,appType) => {
           "basepath": appInfo.basepath,
           "status": 1,
           "name": per.name,
-          "title": per.type,
+          "title": per.title,
           "type": "00",
           "setting": "",
           "description": per.description,