improve analysis block

-import moment from 'moment';
-import React from 'react';
-import nzh from 'nzh/cn';
-import { parse, stringify } from 'qs';
-
-export function fixedZero(val) {
-  return val * 1 < 10 ? `0${val}` : val;
-}
-
-export function getTimeDistance(type) {
-  const now = new Date();
-  const oneDay = 1000 * 60 * 60 * 24;
-
-  if (type === 'today') {
-    now.setHours(0);
-    now.setMinutes(0);
-    now.setSeconds(0);
-    return [moment(now), moment(now.getTime() + (oneDay - 1000))];
-  }
-
-  if (type === 'week') {
-    let day = now.getDay();
-    now.setHours(0);
-    now.setMinutes(0);
-    now.setSeconds(0);
-
-    if (day === 0) {
-      day = 6;
-    } else {
-      day -= 1;
-    }
-
-    const beginTime = now.getTime() - day * oneDay;
-
-    return [moment(beginTime), moment(beginTime + (7 * oneDay - 1000))];
-  }
-
-  if (type === 'month') {
-    const year = now.getFullYear();
-    const month = now.getMonth();
-    const nextDate = moment(now).add(1, 'months');
-    const nextYear = nextDate.year();
-    const nextMonth = nextDate.month();
-
-    return [
-      moment(`${year}-${fixedZero(month + 1)}-01 00:00:00`),
-      moment(moment(`${nextYear}-${fixedZero(nextMonth + 1)}-01 00:00:00`).valueOf() - 1000),
-    ];
-  }
-
-  const year = now.getFullYear();
-  return [moment(`${year}-01-01 00:00:00`), moment(`${year}-12-31 23:59:59`)];
-}
-
-export function getPlainNode(nodeList, parentPath = '') {
-  const arr = [];
-  nodeList.forEach(node => {
-    const item = node;
-    item.path = `${parentPath}/${item.path || ''}`.replace(/\/+/g, '/');
-    item.exact = true;
-    if (item.children && !item.component) {
-      arr.push(...getPlainNode(item.children, item.path));
-    } else {
-      if (item.children && item.component) {
-        item.exact = false;
-      }
-      arr.push(item);
-    }
-  });
-  return arr;
-}
-
-export function digitUppercase(n) {
-  return nzh.toMoney(n);
-}
-
-function getRelation(str1, str2) {
-  if (str1 === str2) {
-    console.warn('Two path are equal!'); // eslint-disable-line
-  }
-  const arr1 = str1.split('/');
-  const arr2 = str2.split('/');
-  if (arr2.every((item, index) => item === arr1[index])) {
-    return 1;
-  }
-  if (arr1.every((item, index) => item === arr2[index])) {
-    return 2;
-  }
-  return 3;
-}
-
-function getRenderArr(routes) {
-  let renderArr = [];
-  renderArr.push(routes[0]);
-  for (let i = 1; i < routes.length; i += 1) {
-    // 去重
-    renderArr = renderArr.filter(item => getRelation(item, routes[i]) !== 1);
-    // 是否包含
-    const isAdd = renderArr.every(item => getRelation(item, routes[i]) === 3);
-    if (isAdd) {
-      renderArr.push(routes[i]);
-    }
-  }
-  return renderArr;
-}
-
-/**
- * Get router routing configuration
- * { path:{name,...param}}=>Array<{name,path ...param}>
- * @param {string} path
- * @param {routerData} routerData
- */
-export function getRoutes(path, routerData) {
-  let routes = Object.keys(routerData).filter(
-    routePath => routePath.indexOf(path) === 0 && routePath !== path
-  );
-  // Replace path to '' eg. path='user' /user/name => name
-  routes = routes.map(item => item.replace(path, ''));
-  // Get the route to be rendered to remove the deep rendering
-  const renderArr = getRenderArr(routes);
-  // Conversion and stitching parameters
-  const renderRoutes = renderArr.map(item => {
-    const exact = !routes.some(route => route !== item && getRelation(route, item) === 1);
-    return {
-      exact,
-      ...routerData[`${path}${item}`],
-      key: `${path}${item}`,
-      path: `${path}${item}`,
-    };
-  });
-  return renderRoutes;
-}
-
-export function getPageQuery() {
-  return parse(window.location.href.split('?')[1]);
-}
-
-export function getQueryPath(path = '', query = {}) {
-  const search = stringify(query);
-  if (search.length) {
-    return `${path}?${search}`;
-  }
-  return path;
-}
-
-/* eslint no-useless-escape:0 */
-const reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)$/;
-
-export function isUrl(path) {
-  return reg.test(path);
-}
-
-export function formatWan(val) {
-  const v = val * 1;
-  if (!v || Number.isNaN(v)) return '';
-
-  let result = val;
-  if (val > 10000) {
-    result = Math.floor(val / 10000);
-    result = (
-      <span>
-        {result}
-        <span
-          style={{
-            position: 'relative',
-            top: -2,
-            fontSize: 14,
-            fontStyle: 'normal',
-            marginLeft: 2,
-          }}
-        >
-          万
-        </span>
-      </span>
-    );
-  }
-  return result;
-}
-
-// 给官方演示站点用，用于关闭真实开发环境不需要使用的特性
-export function isAntdPro() {
-  return window.location.hostname === 'preview.pro.ant.design';
-}

@@ -15,11 +15,9 @@
     "dva": "^2.4.0",
     "dva": "^2.4.0",
     "antd": "^3.10.9",
     "antd": "^3.10.9",
     "moment": "^2.22.2",
     "moment": "^2.22.2",
-    "nzh": "^1.0.3",
     "umi-request": "^1.0.0",
     "umi-request": "^1.0.0",
     "ant-design-pro": "^2.1.1",
     "ant-design-pro": "^2.1.1",
-    "numeral": "^2.0.6",
-    "hash.js": "^1.1.5"
+    "numeral": "^2.0.6"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "umi": "^2.3.0-beta.1",
     "umi": "^2.3.0-beta.1",

@@ -192,5 +192,5 @@ const getFakeChartData = {
 };
 };
 
 
 export default {
 export default {
-  'GET /api/fake_chart_data': getFakeChartData,
+  'GET /api/BLOCK_NAME/fake_chart_data': getFakeChartData,
 };
 };

 import React, { memo } from 'react';
 import React, { memo } from 'react';
 import { Row, Col, Icon, Tooltip } from 'antd';
 import { Row, Col, Icon, Tooltip } from 'antd';
 import { FormattedMessage } from 'umi/locale';
 import { FormattedMessage } from 'umi/locale';
-import styles from '../style.less';
-import { Charts } from 'ant-design-pro';
-import { Trend } from 'ant-design-pro';
+import { Charts, Trend } from 'ant-design-pro';
 import numeral from 'numeral';
 import numeral from 'numeral';
-import Yuan from '@/utils/Yuan';
+import styles from '../style.less';
+import Yuan from '../utils/Yuan';
 
 
 const { ChartCard, MiniArea, MiniBar, MiniProgress, Field } = Charts;
 const { ChartCard, MiniArea, MiniBar, MiniProgress, Field } = Charts;
 
 

 import React, { memo } from 'react';
 import React, { memo } from 'react';
 import { Card, Tabs, Row, Col } from 'antd';
 import { Card, Tabs, Row, Col } from 'antd';
 import { formatMessage, FormattedMessage } from 'umi/locale';
 import { formatMessage, FormattedMessage } from 'umi/locale';
-import { Charts } from 'ant-design-pro';
-import { NumberInfo } from 'ant-design-pro';
+import { Charts, NumberInfo } from 'ant-design-pro';
 import styles from '../style.less';
 import styles from '../style.less';
 
 
 const { TimelineChart, Pie } = Charts;
 const { TimelineChart, Pie } = Charts;

 import React, { memo } from 'react';
 import React, { memo } from 'react';
 import { Card, Radio } from 'antd';
 import { Card, Radio } from 'antd';
+import { Charts } from 'ant-design-pro';
 import { FormattedMessage } from 'umi/locale';
 import { FormattedMessage } from 'umi/locale';
 import styles from '../style.less';
 import styles from '../style.less';
-import { Charts } from 'ant-design-pro';
-import Yuan from '@/utils/Yuan';
+import Yuan from '../utils/Yuan';
 
 
 const { Pie } = Charts;
 const { Pie } = Charts;
 
 

@@ -2,10 +2,10 @@ import React, { Component, Suspense } from 'react';
 import { connect } from 'dva';
 import { connect } from 'dva';
 import { Row, Col, Icon, Menu, Dropdown } from 'antd';
 import { Row, Col, Icon, Menu, Dropdown } from 'antd';
 
 
-import { getTimeDistance } from '@/utils/utils';
+import { getTimeDistance } from './utils/utils';
 
 
 import styles from './style.less';
 import styles from './style.less';
-import PageLoading from '@/components/PageLoading';
+import PageLoading from './components/PageLoading';
 
 
 const IntroduceRow = React.lazy(() => import('./components/IntroduceRow'));
 const IntroduceRow = React.lazy(() => import('./components/IntroduceRow'));
 const SalesCard = React.lazy(() => import('./components/SalesCard'));
 const SalesCard = React.lazy(() => import('./components/SalesCard'));
@@ -13,11 +13,11 @@ const TopSearch = React.lazy(() => import('./components/TopSearch'));
 const ProportionSales = React.lazy(() => import('./components/ProportionSales'));
 const ProportionSales = React.lazy(() => import('./components/ProportionSales'));
 const OfflineData = React.lazy(() => import('./components/OfflineData'));
 const OfflineData = React.lazy(() => import('./components/OfflineData'));
 
 
-@connect(({ chart, loading }) => ({
-  chart,
-  loading: loading.effects['chart/fetch'],
+@connect(({ BLOCK_NAME, loading }) => ({
+  BLOCK_NAME,
+  loading: loading.effects['BLOCK_NAME/fetch'],
 }))
 }))
-class Analysis extends Component {
+class PAGE_NAME_UPPER_CAMEL_CASE extends Component {
   state = {
   state = {
     salesType: 'all',
     salesType: 'all',
     currentTabKey: '',
     currentTabKey: '',
@@ -28,7 +28,7 @@ class Analysis extends Component {
     const { dispatch } = this.props;
     const { dispatch } = this.props;
     this.reqRef = requestAnimationFrame(() => {
     this.reqRef = requestAnimationFrame(() => {
       dispatch({
       dispatch({
-        type: 'chart/fetch',
+        type: 'BLOCK_NAME/fetch',
       });
       });
     });
     });
   }
   }
@@ -36,7 +36,7 @@ class Analysis extends Component {
   componentWillUnmount() {
   componentWillUnmount() {
     const { dispatch } = this.props;
     const { dispatch } = this.props;
     dispatch({
     dispatch({
-      type: 'chart/clear',
+      type: 'BLOCK_NAME/clear',
     });
     });
     cancelAnimationFrame(this.reqRef);
     cancelAnimationFrame(this.reqRef);
     clearTimeout(this.timeoutId);
     clearTimeout(this.timeoutId);
@@ -61,7 +61,7 @@ class Analysis extends Component {
     });
     });
 
 
     dispatch({
     dispatch({
-      type: 'chart/fetchSalesData',
+      type: 'BLOCK_NAME/fetchSalesData',
     });
     });
   };
   };
 
 
@@ -72,7 +72,7 @@ class Analysis extends Component {
     });
     });
 
 
     dispatch({
     dispatch({
-      type: 'chart/fetchSalesData',
+      type: 'BLOCK_NAME/fetchSalesData',
     });
     });
   };
   };
 
 
@@ -93,7 +93,7 @@ class Analysis extends Component {
 
 
   render() {
   render() {
     const { rangePickerValue, salesType, currentTabKey } = this.state;
     const { rangePickerValue, salesType, currentTabKey } = this.state;
-    const { chart, loading } = this.props;
+    const { BLOCK_NAME, loading } = this.props;
     const {
     const {
       visitData,
       visitData,
       visitData2,
       visitData2,
@@ -104,7 +104,7 @@ class Analysis extends Component {
       salesTypeData,
       salesTypeData,
       salesTypeDataOnline,
       salesTypeDataOnline,
       salesTypeDataOffline,
       salesTypeDataOffline,
-    } = chart;
+    } = BLOCK_NAME;
     let salesPieData;
     let salesPieData;
     if (salesType === 'all') {
     if (salesType === 'all') {
       salesPieData = salesTypeData;
       salesPieData = salesTypeData;
@@ -181,4 +181,4 @@ class Analysis extends Component {
   }
   }
 }
 }
 
 
-export default Analysis;
+export default PAGE_NAME_UPPER_CAMEL_CASE;

 import { fakeChartData } from './service';
 import { fakeChartData } from './service';
 
 
 export default {
 export default {
-  namespace: 'chart',
+  namespace: 'BLOCK_NAME',
 
 
   state: {
   state: {
     visitData: [],
     visitData: [],

 import request from 'umi-request';
 import request from 'umi-request';
 
 
 export async function fakeChartData() {
 export async function fakeChartData() {
-  return request('/api/fake_chart_data');
+  return request('/api/BLOCK_NAME/fake_chart_data');
 }
 }

 @import '~antd/lib/style/themes/default.less';
 @import '~antd/lib/style/themes/default.less';
-@import '~@/utils/utils.less';
+@import './utils/utils.less';
 
 
 .iconGroup {
 .iconGroup {
   i {
   i {

+import moment from 'moment';
+
+export function fixedZero(val) {
+  return val * 1 < 10 ? `0${val}` : val;
+}
+
+export function getTimeDistance(type) {
+  const now = new Date();
+  const oneDay = 1000 * 60 * 60 * 24;
+
+  if (type === 'today') {
+    now.setHours(0);
+    now.setMinutes(0);
+    now.setSeconds(0);
+    return [moment(now), moment(now.getTime() + (oneDay - 1000))];
+  }
+
+  if (type === 'week') {
+    let day = now.getDay();
+    now.setHours(0);
+    now.setMinutes(0);
+    now.setSeconds(0);
+
+    if (day === 0) {
+      day = 6;
+    } else {
+      day -= 1;
+    }
+
+    const beginTime = now.getTime() - day * oneDay;
+
+    return [moment(beginTime), moment(beginTime + (7 * oneDay - 1000))];
+  }
+
+  if (type === 'month') {
+    const year = now.getFullYear();
+    const month = now.getMonth();
+    const nextDate = moment(now).add(1, 'months');
+    const nextYear = nextDate.year();
+    const nextMonth = nextDate.month();
+
+    return [
+      moment(`${year}-${fixedZero(month + 1)}-01 00:00:00`),
+      moment(moment(`${nextYear}-${fixedZero(nextMonth + 1)}-01 00:00:00`).valueOf() - 1000),
+    ];
+  }
+
+  const year = now.getFullYear();
+  return [moment(`${year}-01-01 00:00:00`), moment(`${year}-12-31 23:59:59`)];
+}