fix: AdvancedProfile (#10)

* fix: AdvancedProfile

* fix: AdvancedProfile

 export default {
 export default {
   plugins: [
   plugins: [
-    ['umi-plugin-block-dev', {}],
+    ['umi-plugin-block-dev', {
+      layout: 'ant-design-pro',
+    }],
     ['umi-plugin-react', {
     ['umi-plugin-react', {
       dva: true,
       dva: true,
       locale: true,
       locale: true,

-import React, { PureComponent } from 'react';
-import { connect } from 'dva';
-import styles from './GridContent.less';
-
-class GridContent extends PureComponent {
-  render() {
-    const { contentWidth, children } = this.props;
-    let className = `${styles.main}`;
-    if (contentWidth === 'Fixed') {
-      className = `${styles.main} ${styles.wide}`;
-    }
-    return <div className={className}>{children}</div>;
-  }
-}
-
-export default connect(({ setting }) => ({
-  contentWidth: setting.contentWidth,
-}))(GridContent);

-.main {
-  width: 100%;
-  height: 100%;
-  min-height: 100%;
-  transition: 0.3s;
-  &.wide {
-    max-width: 1200px;
-    margin: 0 auto;
-  }
-}

@@ -11,16 +11,17 @@
     "url": "https://github.com/umijs/umi-blocks/advancedprofile"
     "url": "https://github.com/umijs/umi-blocks/advancedprofile"
   },
   },
   "dependencies": {
   "dependencies": {
-    "react": "^16.6.3",
-    "lodash-decorators": "^6.0.0",
-    "dva": "^2.4.0",
-    "classnames": "^2.2.6",
     "ant-design-pro": "^2.1.1",
     "ant-design-pro": "^2.1.1",
     "antd": "^3.10.9",
     "antd": "^3.10.9",
-    "qs": "^6.6.0",
+    "classnames": "^2.2.6",
+    "dva": "^2.4.0",
     "hash.js": "^1.1.5",
     "hash.js": "^1.1.5",
+    "lodash-decorators": "^6.0.0",
     "moment": "^2.22.2",
     "moment": "^2.22.2",
-    "nzh": "^1.0.3"
+    "nzh": "^1.0.3",
+    "qs": "^6.6.0",
+    "react": "^16.6.3",
+    "umi-request": "^1.0.0"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "umi": "^2.3.0-beta.1",
     "umi": "^2.3.0-beta.1",

@@ -2,10 +2,8 @@ import React from 'react';
 import { FormattedMessage } from 'umi/locale';
 import { FormattedMessage } from 'umi/locale';
 import Link from 'umi/link';
 import Link from 'umi/link';
 import PageHeader from 'ant-design-pro/lib/PageHeader';
 import PageHeader from 'ant-design-pro/lib/PageHeader';
-import { connect } from 'dva';
-import GridContent from './GridContent';
 import styles from './index.less';
 import styles from './index.less';
-import MenuContext from '@/layouts/MenuContext';
+import MenuContext from '../../layouts/MenuContext';
 
 
 const PageHeaderWrapper = ({ children, contentWidth, wrapperClassName, top, ...restProps }) => (
 const PageHeaderWrapper = ({ children, contentWidth, wrapperClassName, top, ...restProps }) => (
   <div style={{ margin: '-24px -24px 0' }} className={wrapperClassName}>
   <div style={{ margin: '-24px -24px 0' }} className={wrapperClassName}>
@@ -30,12 +28,10 @@ const PageHeaderWrapper = ({ children, contentWidth, wrapperClassName, top, ...r
     </MenuContext.Consumer>
     </MenuContext.Consumer>
     {children ? (
     {children ? (
       <div className={styles.content}>
       <div className={styles.content}>
-        <GridContent>{children}</GridContent>
+        {children}
       </div>
       </div>
     ) : null}
     ) : null}
   </div>
   </div>
 );
 );
 
 
-export default connect(({ setting }) => ({
-  contentWidth: setting.contentWidth,
-}))(PageHeaderWrapper);
+export default PageHeaderWrapper;

-module.exports = {
-  navTheme: 'dark', // theme for nav menu
-  primaryColor: '#1890FF', // primary color of ant design
-  layout: 'sidemenu', // nav menu position: sidemenu or topmenu
-  contentWidth: 'Fluid', // layout of content: Fluid or Fixed, only works when layout is topmenu
-  fixedHeader: false, // sticky header
-  autoHideHeader: false, // auto hide header
-  fixSiderbar: false, // sticky siderbar
-};

@@ -18,9 +18,10 @@ import {
   Divider,
   Divider,
 } from 'antd';
 } from 'antd';
 import classNames from 'classnames';
 import classNames from 'classnames';
-import DescriptionList from 'ant-design-pro/lib/DescriptionList';
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-import styles from './AdvancedProfile.less';
+import { DescriptionList } from 'ant-design-pro';
+import PageHeaderWrapper from './components/PageHeaderWrapper';
+import styles from './style.less';
+
 
 
 const { Step } = Steps;
 const { Step } = Steps;
 const { Description } = DescriptionList;
 const { Description } = DescriptionList;

-import { queryBasicProfile, queryAdvancedProfile } from '@/services/api';
+import { queryBasicProfile, queryAdvancedProfile } from '../services/api';
 
 
 export default {
 export default {
   namespace: 'profile',
   namespace: 'profile',

-import { message } from 'antd';
-import defaultSettings from '../defaultSettings';
-
-let lessNodesAppended;
-const updateTheme = primaryColor => {
-  // Don't compile less in production!
-  if (APP_TYPE !== 'site') {
-    return;
-  }
-  // Determine if the component is remounted
-  if (!primaryColor) {
-    return;
-  }
-  const hideMessage = message.loading('正在编译主题！', 0);
-  function buildIt() {
-    if (!window.less) {
-      return;
-    }
-    setTimeout(() => {
-      window.less
-        .modifyVars({
-          '@primary-color': primaryColor,
-        })
-        .then(() => {
-          hideMessage();
-        })
-        .catch(() => {
-          message.error('Failed to update theme');
-          hideMessage();
-        });
-    }, 200);
-  }
-  if (!lessNodesAppended) {
-    // insert less.js and color.less
-    const lessStyleNode = document.createElement('link');
-    const lessConfigNode = document.createElement('script');
-    const lessScriptNode = document.createElement('script');
-    lessStyleNode.setAttribute('rel', 'stylesheet/less');
-    lessStyleNode.setAttribute('href', '/color.less');
-    lessConfigNode.innerHTML = `
-      window.less = {
-        async: true,
-        env: 'production',
-        javascriptEnabled: true
-      };
-    `;
-    lessScriptNode.src = 'https://gw.alipayobjects.com/os/lib/less.js/3.8.1/less.min.js';
-    lessScriptNode.async = true;
-    lessScriptNode.onload = () => {
-      buildIt();
-      lessScriptNode.onload = null;
-    };
-    document.body.appendChild(lessStyleNode);
-    document.body.appendChild(lessConfigNode);
-    document.body.appendChild(lessScriptNode);
-    lessNodesAppended = true;
-  } else {
-    buildIt();
-  }
-};
-
-const updateColorWeak = colorWeak => {
-  document.body.className = colorWeak ? 'colorWeak' : '';
-};
-
-export default {
-  namespace: 'setting',
-  state: defaultSettings,
-  reducers: {
-    getSetting(state) {
-      const setting = {};
-      const urlParams = new URL(window.location.href);
-      Object.keys(state).forEach(key => {
-        if (urlParams.searchParams.has(key)) {
-          const value = urlParams.searchParams.get(key);
-          setting[key] = value === '1' ? true : value;
-        }
-      });
-      const { primaryColor, colorWeak } = setting;
-      if (state.primaryColor !== primaryColor) {
-        updateTheme(primaryColor);
-      }
-      updateColorWeak(colorWeak);
-      return {
-        ...state,
-        ...setting,
-      };
-    },
-    changeSetting(state, { payload }) {
-      const urlParams = new URL(window.location.href);
-      Object.keys(defaultSettings).forEach(key => {
-        if (urlParams.searchParams.has(key)) {
-          urlParams.searchParams.delete(key);
-        }
-      });
-      Object.keys(payload).forEach(key => {
-        if (key === 'collapse') {
-          return;
-        }
-        let value = payload[key];
-        if (value === true) {
-          value = 1;
-        }
-        if (defaultSettings[key] !== value) {
-          urlParams.searchParams.set(key, value);
-        }
-      });
-      const { primaryColor, colorWeak, contentWidth } = payload;
-      if (state.primaryColor !== primaryColor) {
-        updateTheme(primaryColor);
-      }
-      if (state.contentWidth !== contentWidth && window.dispatchEvent) {
-        window.dispatchEvent(new Event('resize'));
-      }
-      updateColorWeak(colorWeak);
-      window.history.replaceState(null, 'setting', urlParams.href);
-      return {
-        ...state,
-        ...payload,
-      };
-    },
-  },
-};

 import { stringify } from 'qs';
 import { stringify } from 'qs';
-import request from '@/utils/request';
+import request from '../utils/request';
 
 
 export async function queryProjectNotice() {
 export async function queryProjectNotice() {
   return request('/api/project/notice');
   return request('/api/project/notice');

-import fetch from 'dva/fetch';
+import request from 'umi-request';
 import { notification } from 'antd';
 import { notification } from 'antd';
 import router from 'umi/router';
 import router from 'umi/router';
 import hash from 'hash.js';
 import hash from 'hash.js';
@@ -63,7 +63,7 @@ const cachedSave = (response, hashcode) => {
  * @param  {object} [option] The options we want to pass to "fetch"
  * @param  {object} [option] The options we want to pass to "fetch"
  * @return {object}           An object containing either "data" or "err"
  * @return {object}           An object containing either "data" or "err"
  */
  */
-export default function request(url, option) {
+export default function (url, option) {
   const options = {
   const options = {
     expirys: isAntdPro(),
     expirys: isAntdPro(),
     ...option,
     ...option,