improve step form code

-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';
-}

 {
 {
-  "name": "@umi-block/stepform",
+  "name": "@umi-block/step-form",
   "version": "0.0.1",
   "version": "0.0.1",
   "description": "StepForm",
   "description": "StepForm",
   "main": "src/index.js",
   "main": "src/index.js",
@@ -14,9 +14,9 @@
     "ant-design-pro": "^2.1.1",
     "ant-design-pro": "^2.1.1",
     "antd": "^3.10.9",
     "antd": "^3.10.9",
     "dva": "^2.4.0",
     "dva": "^2.4.0",
-    "mockjs": "*",
     "react": "^16.6.3",
     "react": "^16.6.3",
-    "umi-request": "^1.0.0"
+    "umi-request": "^1.0.0",
+    "nzh": "^1.0.3"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "umi": "^2.3.0-beta.1",
     "umi": "^2.3.0-beta.1",

 export default {
 export default {
-  'POST /api/forms': (req, res) => {
+  'POST /api/BLOCK_NAME/forms': (req, res) => {
     res.send({ message: 'Ok' });
     res.send({ message: 'Ok' });
   },
   },
 };
 };

@@ -15,8 +15,8 @@ const formItemLayout = {
   },
   },
 };
 };
 
 
-@connect(({ form }) => ({
-  data: form.step,
+@connect(({ BLOCK_NAME_CAMEL_CASE }) => ({
+  data: BLOCK_NAME_CAMEL_CASE.step,
 }))
 }))
 @Form.create()
 @Form.create()
 class Step1 extends React.PureComponent {
 class Step1 extends React.PureComponent {
@@ -27,7 +27,7 @@ class Step1 extends React.PureComponent {
       validateFields((err, values) => {
       validateFields((err, values) => {
         if (!err) {
         if (!err) {
           dispatch({
           dispatch({
-            type: 'form/saveStepFormData',
+            type: 'BLOCK_NAME_CAMEL_CASE/saveStepFormData',
             payload: values,
             payload: values,
           });
           });
           router.push('/confirm');
           router.push('/confirm');

@@ -2,7 +2,7 @@ import React from 'react';
 import { connect } from 'dva';
 import { connect } from 'dva';
 import { Form, Input, Button, Alert, Divider } from 'antd';
 import { Form, Input, Button, Alert, Divider } from 'antd';
 import router from 'umi/router';
 import router from 'umi/router';
-import { digitUppercase } from '@/utils/utils';
+import { digitUppercase } from '../../utils/utils';
 import styles from './index.less';
 import styles from './index.less';
 
 
 const formItemLayout = {
 const formItemLayout = {
@@ -14,9 +14,9 @@ const formItemLayout = {
   },
   },
 };
 };
 
 
-@connect(({ form, loading }) => ({
-  submitting: loading.effects['form/submitStepForm'],
-  data: form.step,
+@connect(({ BLOCK_NAME_CAMEL_CASE, loading }) => ({
+  submitting: loading.effects['BLOCK_NAME_CAMEL_CASE/submitStepForm'],
+  data: BLOCK_NAME_CAMEL_CASE.step,
 }))
 }))
 @Form.create()
 @Form.create()
 class Step2 extends React.PureComponent {
 class Step2 extends React.PureComponent {
@@ -31,7 +31,7 @@ class Step2 extends React.PureComponent {
       validateFields((err, values) => {
       validateFields((err, values) => {
         if (!err) {
         if (!err) {
           dispatch({
           dispatch({
-            type: 'form/submitStepForm',
+            type: 'BLOCK_NAME_CAMEL_CASE/submitStepForm',
             payload: {
             payload: {
               ...data,
               ...data,
               ...values,
               ...values,

@@ -5,8 +5,8 @@ import router from 'umi/router';
 import { Result } from 'ant-design-pro';
 import { Result } from 'ant-design-pro';
 import styles from './index.less';
 import styles from './index.less';
 
 
-@connect(({ form }) => ({
-  data: form.step,
+@connect(({ BLOCK_NAME_CAMEL_CASE }) => ({
+  data: BLOCK_NAME_CAMEL_CASE.step,
 }))
 }))
 class Step3 extends React.PureComponent {
 class Step3 extends React.PureComponent {
   render() {
   render() {

@@ -4,7 +4,7 @@ import PageHeaderWrapper from './components/PageHeaderWrapper';
 import Step1 from './components/Step1';
 import Step1 from './components/Step1';
 import Step2 from './components/Step2';
 import Step2 from './components/Step2';
 import Step3 from './components/Step3';
 import Step3 from './components/Step3';
-import styles from '../style.less';
+import styles from './style.less';
 
 
 const { Step } = Steps;
 const { Step } = Steps;
 
 
@@ -28,6 +28,14 @@ export default class StepForm extends PureComponent {
   render() {
   render() {
     const { location } = this.props;
     const { location } = this.props;
     const { pathname } = location;
     const { pathname } = location;
+    let currentStep = null;
+    if (/confirm\/?$/.test(pathname)) {
+      currentStep = <Step2 />;
+    } else if (/result\/?$/.test(pathname)) {
+      currentStep =  <Step3 />;
+    } else {
+      currentStep = <Step1 />;
+    }
     return (
     return (
       <PageHeaderWrapper
       <PageHeaderWrapper
         title="分步表单"
         title="分步表单"
@@ -41,13 +49,7 @@ export default class StepForm extends PureComponent {
               <Step title="确认转账信息" />
               <Step title="确认转账信息" />
               <Step title="完成" />
               <Step title="完成" />
             </Steps>
             </Steps>
-            {/confirm\/?$/.test(pathname) ? (
-              <Step2 />
-            ) : /result\/?$/.test(pathname) ? (
-              <Step3 />
-            ) : (
-              <Step1 />
-            )}
+            {currentStep}
           </Fragment>
           </Fragment>
         </Card>
         </Card>
       </PageHeaderWrapper>
       </PageHeaderWrapper>

 import { routerRedux } from 'dva/router';
 import { routerRedux } from 'dva/router';
-import { message } from 'antd';
 import { fakeSubmitForm } from './service';
 import { fakeSubmitForm } from './service';
 
 
 export default {
 export default {
-  namespace: 'form',
+  namespace: 'BLOCK_NAME_CAMEL_CASE',
 
 
   state: {
   state: {
     step: {
     step: {

 import request from 'umi-request';
 import request from 'umi-request';
 
 
 export async function fakeSubmitForm(params) {
 export async function fakeSubmitForm(params) {
-  return request('/api/forms', {
+  return request('/api/BLOCK_NAME/forms', {
     method: 'POST',
     method: 'POST',
     body: params,
     body: params,
   });
   });

+
+import nzh from 'nzh/cn';
+
+export function digitUppercase(n) {
+  return nzh.toMoney(n);
+}