Merge branch 'fix0618-menu' into 'v2-220618'

src/layouts/components/OuterSide.tsx

@@ -34,7 +34,7 @@ const OuterSider: React.FC<OuterSiderProps> = observer((props) => {
     const subHeadMenus: Array<any> = []
     menuData.forEach(item => {
       // 为适配pass菜单自由组合变更， 使用code进行高亮显示
-      const code = currentRouter.relationParentCode
+      const code = currentRouter?.relationParentCode
       // console.log(code, item.relationParentCode)
       if (code && code === item.relationParentCode) {
         defaultSelectedKeys = item.relationParentCode

src/layouts/index.tsx

@@ -143,7 +143,7 @@ const BasicLayout: React.FC<any> = (props) => {
       minWidth: '1280px',
     }
     : {}
-  return currentRouter.noLayout ? props.children : (
+  return currentRouter?.noLayout ? props.children : (
     <ProLayout
       pageTitleRender={() => currentRouter ? currentRouter.name : window.location.href}
       // contentStyle={{minWidth: '1280px'}}