From 7d96fb168edf4e5b0540726a4b11ad434465f488 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期日, 15 八月 2021 08:44:16 +0800 Subject: [PATCH] 2021-08-15 --- src/components/header/index.jsx | 24 ++++-------------------- 1 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx index 23b1052..9ba0be0 100644 --- a/src/components/header/index.jsx +++ b/src/components/header/index.jsx @@ -49,7 +49,7 @@ oriVersion: '', newVersion: '', debug: sessionStorage.getItem('debug') === 'true', - navBar: ['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar) ? 'topmenu' : '', + navBar: ['linkage_navigation', 'linkage', 'menu_board', 'menu_board_navigation'].includes(window.GLOB.navBar) ? 'topmenu' : '', menuType: window.GLOB.navBar } @@ -673,7 +673,7 @@ } else if (menu.OpenType === 'blank') { menu.selected = true this.props.modifyTabview([menu]) - } else if (this.state.navBar === 'topmenu') { + } else if (this.state.navBar === 'topmenu' && this.state.menuType !== 'menu_board_navigation') { menu.selected = true this.props.modifyTabview([menu]) } else { @@ -742,7 +742,7 @@ })} </ul> : null } - {navBar === 'topmenu' && menuType !== 'menu_board' && menulist ? + {navBar === 'topmenu' && menuType !== 'menu_board' && menuType !== 'menu_board_navigation' && menulist ? <ul className="header-menu vertical-menu">{ menulist.map(item => { if (item.children && item.children.length > 0) { @@ -785,7 +785,7 @@ })} </ul> : null } - {navBar === 'topmenu' && menuType === 'menu_board' && menulist ? + {navBar === 'topmenu' && (menuType === 'menu_board' || menuType === 'menu_board_navigation') && menulist ? <ul className="header-menu vertical-menu">{ menulist.map(item => { if (item.children && item.children.length > 0) { @@ -807,22 +807,6 @@ ) })} </div> - // <Menu mode="horizontal"> - // {item.children.map(cell => { - // return ( - // <Menu.Item key={cell.MenuID}> - // <div>{cell.MenuName}</div> - // <div> - // {cell.children && cell.children.map(m => ( - // <Menu.Item key={m.MenuID} onClick={() => {this.changeVerMenu(m)}}> - // {m.MenuName} - // </Menu.Item> - // ))} - // </div> - // </Menu.Item> - // ) - // })} - // </Menu> }> <li> <span>{item.MenuName}</span> -- Gitblit v1.8.0