@lxzy/code-snippet 0.0.12 → 0.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lxzy/code-snippet",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "files": [
     "*",
     "!dist",

package/routes/menu.ts

@@ -5,6 +5,12 @@ export default [
     component: 'home',
     icon: 'smile',
   },
+  {
+    path: '/login',
+    name: '登录',
+    component: 'login',
+    layout: false,
+  },
   {
     path: '/activityCenter',
     name: '活动中心',

package/src/layouts/index.tsx

@@ -1,9 +1,8 @@
-import React, { useState, useEffect } from 'react';
-import { Avatar, Dropdown, Menu, Space } from 'antd';
 import ProLayout from '@ant-design/pro-layout';
 import history from '@/umi';
 import menuRoutes from '../../routes/menu';
 import getIcon from '@/utils/getIcon';
+import { useLocation } from 'react-router-dom';
 
 const menuDataRender = (menuList) => {
   return menuList.map((item) => {
@@ -18,18 +17,28 @@ const menuDataRender = (menuList) => {
 
 const BasicLayout = (props) => {
   const { children } = props;
-  const [location, setLocation] = useState(history.location);
+  const location = useLocation();
 
-  useEffect(() => {
-    const unlisten = history.listen((location) => {
-      setLocation(location);
-    });
-    return () => unlisten();
-  }, []);
+  const isLayoutFalse = (routes, pathname) => {
+    for (const route of routes) {
+      if (pathname === route.path || pathname.startsWith(route.path + '/')) {
+        if (route.layout === false) return true;
+      }
+      if (route.routes) {
+        if (isLayoutFalse(route.routes, pathname)) return true;
+      }
+    }
+    return false;
+  };
+
+  if (isLayoutFalse(menuRoutes, location.pathname)) {
+    return <>{children}</>;
+  }
 
   return (
     <ProLayout
       title="管理平台"
+      // pure
       logo={false}
       layout="mix"
       fixSiderbar={false}

package/src/pages/login.tsx

@@ -0,0 +1,5 @@
+import React, { useState } from 'react';
+
+export default function Login() {
+  return <div>login</div>;
+}