fix: 修复首页路由匹配

src/layouts/BasicLayout1.js

@@ -271,6 +271,7 @@ const BasicLayout = props => {
   // 处理隐藏菜单
 
   let currentRoutes = props.route.routes.filter(item => !item.hideInMenu)[props.currentMenuIndex];
+  console.log(props.route)
   //props.currentMenuIndex
   useEffect(() => {
     const initSelectRoute = findPathByLeafId(
@@ -330,7 +331,7 @@ const BasicLayout = props => {
   useEffect(() => {
     siteAction.setGlobalConfig(props.global);
     if (!Cookies.get('token')) {
-      let client = props.global.get('client');
+      let client = props.global && props.global.client;
       client =  client !== 'undefined' || !_.isNull(client) || !_.isUndefined(client)  ? client: 'city';
       history.replace(`/user/login?client=${client}`);
       props.logout();

src/utils/routes.js

@@ -87,6 +87,7 @@ const generRotes = (widgets, parent, level = 0) => {
         url = item.url
       }
       url = transformURL(url);
+      url = url.replace(/[(\\|)|(&)]widget=[0-9]*/, '')
       const convertURL = item.icon && transformURL(item.icon.replace(/\s*/g, ''));
       const icon = (item && item.icon && item.icon !== null &&
         isAbsoluteURL(convertURL) ? convertURL: /(\\|\/)/.test(convertURL) ?

src/utils/utils.js

@@ -87,6 +87,8 @@ export function findPathByLeafId(leafId, nodes, path, key, clear) {
 }
 
 export function transformURL(path) {
+  //civweb4/
+  path = path.replace(/[(\\|)|(&)]widget=[0-9]*/, '');
   const el = document.createElement('input');
   el.value = path;
   String.fromCharCode(92);