feats

src/layouts/BasicLayout.jsx

@@ -62,20 +62,6 @@ const BasicLayout = (props) => {
       pathname: '/',
     },
   } = props;
-  /**
-   * constructor
-   */
-
-  // useEffect(() => {
-  //   if (dispatch) {
-  //     dispatch({
-  //       type: 'user/fetchCurrent',
-  //     });
-  //   }
-  // }, []);
-  /**
-   * init variables
-   */
 
   const handleMenuCollapse = (payload) => {
     if (dispatch) {
@@ -89,6 +75,7 @@ const BasicLayout = (props) => {
   const authorized = getAuthorityFromRouter(props.route.routes, location.pathname || '/') || {
     authority: undefined,
   };
+
   return (
     <ProLayout
       logo={logo}

src/layouts/BlankLayout.jsx

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

src/layouts/SecurityLayout.jsx

@@ -7,22 +7,20 @@ import { stringify } from 'querystring';
 const SecurityLayout = (props) => {
   const [isReady, setIsReady] = useState(false)
 
-  useEffect(() => {
-    setIsReady(true)
-    props.dispatch({
-      type: 'user/fetchCurrent',
-    });
-  }, [])
-
   const { children, loading, currentUser, history } = props;
 
-  console.log('--------->', history)
-
   const isLogin = currentUser && currentUser.userId;
 
   const queryString = stringify({
     redirect: window.location.href,
   });
+  
+  useEffect(() => {
+    setIsReady(true)
+    props.dispatch({
+      type: 'user/fetchCurrent',
+    });
+  }, [])
 
   if (loading || !isReady) {
     return <PageLoading />;

src/models/global.js

@@ -101,7 +101,7 @@ const GlobalModel = {
     },
   },
   subscriptions: {
-    setup({ history }) {
+    setup({ history, dispatch }) {
       // Subscribe history(url) change, trigger `load` action if pathname is `/`
       history.listen(({ pathname, search }) => {
         if (typeof window.ga !== 'undefined') {

src/pages/Admin.jsx

@@ -1,7 +1,11 @@
 import React from 'react';
 import { Card, Typography, Alert, Icon } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-export default () => (
+export default () => {
+  
+  console.log('--------admin-----')
+
+  return (
   <PageHeaderWrapper content=" 这个页面只有 admin 权限才能查看">
     <Card>
       <Alert
@@ -37,4 +41,4 @@ export default () => (
       。
     </p>
   </PageHeaderWrapper>
-);
+)};

src/pages/Welcome.jsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import { Card, Typography, Alert } from 'antd';
@@ -12,55 +12,62 @@ const CodePreview = ({ children }) => (
   </pre>
 );
 
-export default () => (
-  <PageHeaderWrapper>
-    <Card>
-      <Alert
-        message="umi ui 现已发布，点击右下角 umi 图标即可使用"
-        type="success"
-        showIcon
-        banner
-        style={{
-          margin: -12,
-          marginBottom: 24,
-        }}
-      />
-      <Typography.Text strong>
-        <a target="_blank" rel="noopener noreferrer" href="https://pro.ant.design/docs/block">
-          <FormattedMessage
-            id="app.welcome.link.block-list"
-            defaultMessage="基于 block 开发，快速构建标准页面"
-          />
-        </a>
-      </Typography.Text>
-      <CodePreview> npm run ui</CodePreview>
-      <Typography.Text
-        strong
+export default (props) => {
+  console.log('--------welcome-----', JSON.stringify(props))
+  useEffect(() => {
+    console.log('------useEffect-------')
+  }, [])
+  
+  return (
+    <PageHeaderWrapper>
+      <Card>
+        <Alert
+          message="umi ui 现已发布，点击右下角 umi 图标即可使用"
+          type="success"
+          showIcon
+          banner
+          style={{
+            margin: -12,
+            marginBottom: 24,
+          }}
+        />
+        <Typography.Text strong>
+          <a target="_blank" rel="noopener noreferrer" href="https://pro.ant.design/docs/block">
+            <FormattedMessage
+              id="app.welcome.link.block-list"
+              defaultMessage="基于 block 开发，快速构建标准页面"
+            />
+          </a>
+        </Typography.Text>
+        <CodePreview> npm run ui</CodePreview>
+        <Typography.Text
+          strong
+          style={{
+            marginBottom: 12,
+          }}
+        >
+          <a
+            target="_blank"
+            rel="noopener noreferrer"
+            href="https://pro.ant.design/docs/available-script#npm-run-fetchblocks"
+          >
+            <FormattedMessage id="app.welcome.link.fetch-blocks" defaultMessage="获取全部区块" />
+          </a>
+        </Typography.Text>
+        <CodePreview> npm run fetch:blocks</CodePreview>
+      </Card>
+      <p
         style={{
-          marginBottom: 12,
+          textAlign: 'center',
+          marginTop: 24,
         }}
       >
-        <a
-          target="_blank"
-          rel="noopener noreferrer"
-          href="https://pro.ant.design/docs/available-script#npm-run-fetchblocks"
-        >
-          <FormattedMessage id="app.welcome.link.fetch-blocks" defaultMessage="获取全部区块" />
+        Want to add more pages? Please refer to{' '}
+        <a href="https://pro.ant.design/docs/block-cn" target="_blank" rel="noopener noreferrer">
+          use block
         </a>
-      </Typography.Text>
-      <CodePreview> npm run fetch:blocks</CodePreview>
-    </Card>
-    <p
-      style={{
-        textAlign: 'center',
-        marginTop: 24,
-      }}
-    >
-      Want to add more pages? Please refer to{' '}
-      <a href="https://pro.ant.design/docs/block-cn" target="_blank" rel="noopener noreferrer">
-        use block
-      </a>
-      。
-    </p>
-  </PageHeaderWrapper>
-);
+        。
+      </p>
+    </PageHeaderWrapper>
+  )
+};