feats

src/layouts/BasicLayout.jsx

@@ -35,45 +35,21 @@ const menuDataRender = (menuList) =>
     return Authorized.check(item.authority, localItem, null);
   });
 
-const copyright = `${(new Date()).getFullYear()} 云致科技`
-
-const defaultFooterDom = (
-  <DefaultFooter
-    copyright="2019 蚂蚁金服体验技术部出品"
-    links={[
-      // {
-      //   key: 'Ant Design Pro',
-      //   title: 'Ant Design Pro',
-      //   href: 'https://pro.ant.design',
-      //   blankTarget: true,
-      // },
-    ]}
-  />
-);
-
 const footerRender = () => {
-  if (!isAntDesignPro()) {
-    return defaultFooterDom;
-  }
+  const copyright = `${(new Date()).getFullYear()} 云致科技`
 
   return (
-    <>
-      {defaultFooterDom}
-      <div
-        style={{
-          padding: '0px 24px 24px',
-          textAlign: 'center',
-        }}
-      >
-        <a href="https://www.netlify.com" target="_blank" rel="noopener noreferrer">
-          <img
-            src="https://www.netlify.com/img/global/badges/netlify-color-bg.svg"
-            width="82px"
-            alt="netlify logo"
-          />
-        </a>
-      </div>
-    </>
+    <DefaultFooter
+      copyright={copyright}
+      links={[
+        // {
+        //   key: 'Ant Design Pro',
+        //   title: 'Ant Design Pro',
+        //   href: 'https://pro.ant.design',
+        //   blankTarget: true,
+        // },
+      ]}
+    />
   );
 };
 

src/layouts/BlankLayout.jsx

@@ -2,6 +2,8 @@ import React, { useState, useEffect } from 'react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 
 const Layout = ({ history, children }) => {
+  console.log('-------->', history)
+
   return (
     <>{children}</>
   );

src/layouts/SecurityLayout.jsx

@@ -1,47 +1,38 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import { connect } from 'dva';
 import { PageLoading } from '@ant-design/pro-layout';
 import { Redirect } from 'umi';
 import { stringify } from 'querystring';
 
-class SecurityLayout extends React.Component {
-  state = {
-    isReady: false,
-  };
+const SecurityLayout = (props) => {
+  const [isReady, setIsReady] = useState(false)
 
-  componentDidMount() {
-    this.setState({
-      isReady: true,
+  useEffect(() => {
+    setIsReady(true)
+    props.dispatch({
+      type: 'user/fetchCurrent',
     });
-    const { dispatch } = this.props;
+  }, [])
 
-    if (dispatch) {
-      dispatch({
-        type: 'user/fetchCurrent',
-      });
-    }
-  }
+  const { children, loading, currentUser, history } = props;
 
-  render() {
-    const { isReady } = this.state;
-    const { children, loading, currentUser } = this.props; // You can replace it to your authentication rule (such as check token exists)
-    // 你可以把它替换成你自己的登录认证规则（比如判断 token 是否存在）
+  console.log('--------->', history)
 
-    const isLogin = currentUser && currentUser.userId;
-    const queryString = stringify({
-      redirect: window.location.href,
-    });
+  const isLogin = currentUser && currentUser.userId;
 
-    if ((!isLogin && loading) || !isReady) {
-      return <PageLoading />;
-    }
+  const queryString = stringify({
+    redirect: window.location.href,
+  });
 
-    if (!isLogin && window.location.pathname !== '/user/login') {
-      return <Redirect to={`/user/login?${queryString}`} />;
-    }
+  if (loading || !isReady) {
+    return <PageLoading />;
+  }
 
-    return children;
+  if (!isLogin) {
+    return <Redirect to={`/user/login?${queryString}`} />;
   }
+
+  return children;
 }
 
 export default connect(({ user, loading }) => ({