agilebuilder-ui 1.0.39 → 1.0.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.0.39",
+  "version": "1.0.40",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/src/views/layout/components/Menubar/index.vue

@@ -63,12 +63,14 @@ export default {
 				systemName = systemNameObj[language]
 			}
 		}
+		const isSelectFirst = window.$vueApp.config.globalProperties.showFirstMenu === undefined ||  window.$vueApp.config.globalProperties.showFirstMenu === null? true : window.$vueApp.config.globalProperties.showFirstMenu
 		const menus = getMenus()
 		return {
 			firstLeafMenu: null, // 第一个有权限的叶子菜单，用于默认展开第一个父菜单
 			systemName,
 			defaultActive: '',
 			menus,
+			isSelectFirst
 		}
 	},
 	computed: {
@@ -144,67 +146,47 @@ export default {
 			Cookies.set('selectMenu', index)
 		},
 		getFirstMenu(menus) {
-			if (menus && menus.length > 0) {
+			const currentMenuCode = this.$route.query
+					? this.$route.query._menuCode
+					: null
+			if(currentMenuCode){
+				// 表示需要选中指定的菜单
+				this.isSelectFirst = true
+			}
+			if (this.isSelectFirst && menus && menus.length > 0) {
 				let shouldSelectMenu
 				for (let i = 0; i < menus.length; i++) {
 					const menu = menus[i]
-					shouldSelectMenu = this.getShouldSelectMenu(menu)
+					shouldSelectMenu = this.getShouldSelectMenu(menu, currentMenuCode)
 					if (shouldSelectMenu) {
 						// 表示获得到了应该选中的菜单
 						break
 					}
 				}
-				// if (!shouldSelectMenu) {
-				//   // 如果没有获得默认选中的菜单，则默认选中第一个菜单
-				//   shouldSelectMenu = this.getSelectMenuWithFirstMenu(menus[0])
-				// }
-				return shouldSelectMenu
-			}
-		},
-		getShouldSelectMenu(menu) {
-			const currentMenuCode = this.$route.query
-					? this.$route.query._menuCode
-					: null
-			if (menu && currentMenuCode) {
-				let shouldSelectMenu
-				const children = menu.children
-				if (children && children.length > 0) {
-					shouldSelectMenu = this.getFirstMenu(children)
-				} else if (menu.code && menu.code === currentMenuCode) {
-					shouldSelectMenu = menu
-				}
 				return shouldSelectMenu
 			}
-			// if (menu) {
-			//   const cookieMenu = Cookies.get('selectMenu')
-			//   let currentRoute = this.$route.path
-			//   if (cookieMenu && cookieMenu.indexOf('~~') > 0) {
-			//     // cookie中记录了选中的菜单路径
-			//     const path = cookieMenu.substring(0, cookieMenu.lastIndexOf('~~'))
-			//     currentRoute = path
-			//   }
-			//   let shouldSelectMenu
-			//   const children = menu.children
-			//   if (children && children.length > 0) {
-			//     shouldSelectMenu = this.getFirstMenu(children)
-			//   } else if (menu.fullPath && menu.fullPath === currentRoute) {
-			//     shouldSelectMenu = menu
-			//   }
-			//   return shouldSelectMenu
-			// }
 		},
-		getSelectMenuWithFirstMenu(menu) {
+		getShouldSelectMenu(menu, currentMenuCode) {
 			if (menu) {
 				let shouldSelectMenu
-				const children = menu.children
-				if (children && children.length > 0) {
-					shouldSelectMenu = this.getFirstMenu(children)
+				if(currentMenuCode){
+					const children = menu.children
+					if (children && children.length > 0) {
+						shouldSelectMenu = this.getFirstMenu(children)
+					} else if (menu.code && menu.code === currentMenuCode) {
+						shouldSelectMenu = menu
+					}
 				} else {
-					shouldSelectMenu = menu
+					const children = menu.children
+					if (children && children.length > 0) {
+						shouldSelectMenu = this.getFirstMenu(children)
+					} else {
+						shouldSelectMenu = menu
+					}
 				}
 				return shouldSelectMenu
 			}
-		},
+		}
 	},
 }
 </script>