Merge remote-tracking branch 'origin/master-blocks' into master-kim-1

# Conflicts:
#	.eslintrc.js
#	config/config.ts
#	package.json

.eslintrc.js

-const fabric = require('@umijs/fabric');
+const fabric = require('@duanledexian/umi-config');
 
 module.exports = {
   ...fabric.default,
   rules: {
     ...fabric.default.rules,
-    'import/no-extraneous-dependencies': [
-      2,
-      {
-        optionalDependencies: true,
-        devDependencies: ['**/tests/**.js', '/mock/**/**.js', '**/**.test.js', '**/**._mock.js'],
-      },
-    ],
-    'import/no-named-as-default': 0,
-  },
-  settings: {
-    ...fabric.default.settings,
-    // support import modules from TypeScript files in JavaScript files
-    'import/resolver': {
-      node: { extensions: ['.js', '.ts', '.tsx'] },
-      alias: {
-        map: [['@', './src'], ['utils', './src/utils'], ['config', './config']],
-        extensions: ['.ts', '.js', '.jsx', '.json'],
-      },
-    },
   },
   globals: {
     ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: true,

.npmrc

+puppeteer_download_host = https://npm.taobao.org/mirrors
\ No newline at end of file

.prettierrc.js

-const fabric = require('@umijs/fabric');
+const fabric = require('@duanledexian/umi-config');
 
 module.exports = {
   ...fabric.prettier,

.stylelintrc.js

-const fabric = require('@umijs/fabric');
+const fabric = require('@duanledexian/umi-config');
 
 module.exports = {
   ...fabric.stylelint,

config/config.ts

 import { IConfig, IPlugin } from 'umi-types';
 import defaultSettings from './defaultSettings'; // https://umijs.org/config/
-import theme from './theme.config';
-
-import os from 'os';
 import slash from 'slash2';
 import webpackPlugin from './plugin.config';
 const path = require('path');
 
 const { pwa } = defaultSettings; // preview.pro.ant.design only do not use in your production ;
 // preview.pro.ant.design 专用环境变量，请不要在你的项目中使用它。
+const { ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION } = process.env;
+
+const isAntDesignProPreview = ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION === 'site';
 
-const { ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION, TEST, NODE_ENV } = process.env;
 const plugins: IPlugin[] = [
   [
     'umi-plugin-react',
@@ -40,15 +39,10 @@ const plugins: IPlugin[] = [
             },
           }
         : false,
-      ...(!TEST && os.platform() === 'darwin'
-        ? {
       dll: {
         include: ['dva', 'dva/router', 'dva/saga', 'dva/fetch'],
         exclude: ['@babel/runtime', 'netlify-lambda'],
       },
-            hardSource: false,
-          }
-        : {}),
     },
   ],
   [
@@ -60,10 +54,10 @@ const plugins: IPlugin[] = [
       autoAddMenu: true,
     },
   ],
-]; // 针对 preview.pro.ant.design 的 GA 统计代码
-// preview.pro.ant.design only do not use in your production ; preview.pro.ant.design 专用环境变量，请不要在你的项目中使用它。
+];
 
-if (ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION === 'site') {
+// 针对 preview.pro.ant.design 的 GA 统计代码
+if (isAntDesignProPreview) {
   plugins.push([
     'umi-plugin-ga',
     {
@@ -72,34 +66,17 @@ if (ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION === 'site') {
   ]);
 }
 
-const uglifyJSOptions =
-  NODE_ENV === 'production'
-    ? {
-        uglifyOptions: {
-          // remove console.* except console.error
-          compress: {
-            drop_console: true,
-            pure_funcs: ['console.error'],
-          },
-        },
-      }
-    : {};
 export default {
-  // add for transfer to umi
   plugins,
-  define: {
-    ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION:
-      ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION || '', // preview.pro.ant.design only do not use in your production ; preview.pro.ant.design 专用环境变量，请不要在你的项目中使用它。
-  },
   block: {
     defaultGitUrl: 'https://github.com/ant-design/pro-blocks',
   },
-  treeShaking: true,
+  hash: true,
   targets: {
     ie: 11,
   },
-  devtool: ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION ? 'source-map' : false,
-  // 路由配置
+  devtool: isAntDesignProPreview ? 'source-map' : false,
+  // umi routes: https://umijs.org/zh/guide/router.html
   routes: [
     {
       path: '/',
@@ -336,8 +313,14 @@ export default {
             },
           ],
         },
+        {
+          component: './404',
+        },
       ],
     },
+    {
+      component: './404',
+    },
   ],
   // Theme for antd
   // https://ant.design/docs/react/customize-theme-cn
@@ -349,6 +332,14 @@ export default {
   //     pathRewrite: { '^/server': '' },
   //   },
   // },
+  // Theme for antd: https://ant.design/docs/react/customize-theme-cn
+  theme: {
+    'primary-color': primaryColor,
+  },
+  define: {
+    ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION:
+      ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION || '', // preview.pro.ant.design only do not use in your production ; preview.pro.ant.design 专用环境变量，请不要在你的项目中使用它。
+  },
   ignoreMomentLocale: true,
   lessLoaderOptions: {
     javascriptEnabled: true,
@@ -360,7 +351,7 @@ export default {
       context: {
         resourcePath: string;
       },
-      localIdentName: string,
+      _: string,
       localName: string,
     ) => {
       if (
@@ -400,4 +391,13 @@ export default {
     config: path.join(__dirname, '../src', '../config'),
     public: path.join(__dirname, '../public'),
   },
+  /*
+  proxy: {
+    '/server/api/': {
+      target: 'https://preview.pro.ant.design/',
+      changeOrigin: true,
+      pathRewrite: { '^/server': '' },
+    },
+  },
+  */
 } as IConfig;

jest.config.js

@@ -3,6 +3,6 @@ module.exports = {
   preset: 'jest-puppeteer',
   extraSetupFiles: ['./tests/setupTests.js'],
   globals: {
-    ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: false, // preview.pro.ant.design only do not use in your production ; preview.pro.ant.design 专用环境变量，请不要在你的项目中使用它。
+    ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: false,
   },
 };

package.json

@@ -34,7 +34,7 @@
   },
   "husky": {
     "hooks": {
-     
+      "pre-commit": "npm run lint-staged"
     }
   },
   "lint-staged": {
@@ -94,16 +94,18 @@
   },
   "devDependencies": {
     "@ant-design/colors": "^3.1.0",
+    "@duanledexian/umi-config": "^1.0.10",
     "@types/classnames": "^2.2.7",
     "@types/history": "^4.7.2",
     "@types/jest": "^24.0.13",
     "@types/lodash": "^4.14.134",
+    "@types/mockjs": "^1.0.2",
+    "@types/numeral": "^0.0.25",
     "@types/qs": "^6.5.3",
     "@types/react": "^16.8.19",
     "@types/react-document-title": "^2.0.3",
     "@types/react-dom": "^16.8.4",
     "@types/numeral":"^0.0.25",
-    "@umijs/fabric": "^1.0.5",
     "babel-eslint": "^10.0.1",
     "chalk": "^2.4.2",
     "check-prettier": "^1.0.3",
@@ -129,8 +131,7 @@
     "stylelint": "^10.1.0",
     "webpack-theme-color-replacer": "^1.1.5",
     "mockjs": "^1.0.1-beta3",
-    "@types/mockjs":"^1.0.2",
-    "eslint-import-resolver-alias": "^1.1.2"
+    "@types/mockjs":"^1.0.2"
   },
   "optionalDependencies": {
     "puppeteer": "^1.17.0"

scripts/fetch-blocks.js

@@ -41,6 +41,9 @@ const findAllInstallRouter = router => {
 const filterParentRouter = (router, layout) => {
   return [...router]
     .map(item => {
+      if (!item.path && item.component === '404') {
+        return item;
+      }
       if (item.routes && (!router.component || layout)) {
         return { ...item, routes: filterParentRouter(item.routes, false) };
       }

src/components/NoticeIcon/NoticeList.tsx

@@ -19,6 +19,7 @@ export interface NoticeIconTabProps {
   emptyText?: string;
   clearText?: string;
   viewMoreText?: string;
+  list: NoticeIconData[];
   onViewMore?: (e: any) => void;
 }
 const NoticeList: React.SFC<NoticeIconTabProps> = ({

src/components/NoticeIcon/index.tsx

@@ -117,7 +117,7 @@ export default class NoticeIcon extends Component<NoticeIconProps> {
       },
     );
     return (
-      <Spin spinning={loading} delay={0}>
+      <Spin spinning={loading} delay={300}>
         <Tabs className={styles.tabs} onChange={this.onTabChange}>
           {panes}
         </Tabs>

src/models/global.ts

@@ -7,6 +7,7 @@ import { queryNotices } from '@/services/user';
 export interface NoticeItem extends NoticeIconData {
   id: string;
   type: string;
+  status: string;
 }
 
 export interface GlobalModelState {

src/pages/404.tsx

+import React from 'react';
+import { Button } from 'antd';
+import router from 'umi/router';
+
+// 这里应该使用 antd 的 404 result 组件，
+// 但是还没发布，先来个简单的。
+
+const NoFoundPage: React.FC<{}> = () => (
+  <div
+    style={{
+      height: '100vh',
+      padding: 80,
+      textAlign: 'center',
+    }}
+  >
+    <img src="https://gw.alipayobjects.com/zos/antfincdn/wsE2Pw%243%26L/noFound.svg" alt="404" />
+    <br />
+    <br />
+    <h1>404</h1>
+    <p>Sorry, the page you visited does not exist.</p>
+    <Button type="primary" onClick={() => router.push('/')}>
+      Back Home
+    </Button>
+  </div>
+);
+
+export default NoFoundPage;

src/pages/Authorized.tsx

@@ -14,7 +14,10 @@ const getRouteAuthority = (path: string, routeData: Route[]) => {
   routeData.forEach(route => {
     // match prefix
     if (pathToRegexp(`${route.path}(.*)`).test(path)) {
+      // exact match
+      if (route.path === path) {
         authorities = route.authority || authorities;
+      }
       // get children authority recursively
       if (route.routes) {
         authorities = getRouteAuthority(path, route.routes) || authorities;

src/pages/account/settings/components/base.tsx

@@ -24,7 +24,10 @@ const AvatarView = ({ avatar }: { avatar: string }) => (
     <Upload fileList={[]}>
       <div className={styles.button_view}>
         <Button icon="upload">
-          <FormattedMessage id="account-settings.basic.change-avatar" defaultMessage="Change avatar" />
+          <FormattedMessage
+            id="account-settings.basic.change-avatar"
+            defaultMessage="Change avatar"
+          />
         </Button>
       </div>
     </Upload>
@@ -207,7 +210,10 @@ class BaseView extends Component<BaseViewProps> {
               })(<PhoneView />)}
             </FormItem>
             <Button type="primary" onClick={this.handlerSubmit}>
-              <FormattedMessage id="account-settings.basic.update" defaultMessage="Update Information" />
+              <FormattedMessage
+                id="account-settings.basic.update"
+                defaultMessage="Update Information"
+              />
             </Button>
           </Form>
         </div>

src/pages/account/settings/components/notification.tsx

@@ -17,12 +17,18 @@ class NotificationView extends Component {
     return [
       {
         title: formatMessage({ id: 'account-settings.notification.password' }, {}),
-        description: formatMessage({ id: 'account-settings.notification.password-description' }, {}),
+        description: formatMessage(
+          { id: 'account-settings.notification.password-description' },
+          {},
+        ),
         actions: [Action],
       },
       {
         title: formatMessage({ id: 'account-settings.notification.messages' }, {}),
-        description: formatMessage({ id: 'account-settings.notification.messages-description' }, {}),
+        description: formatMessage(
+          { id: 'account-settings.notification.messages-description' },
+          {},
+        ),
         actions: [Action],
       },
       {

src/pages/account/settings/index.tsx

@@ -30,18 +30,20 @@ interface SettingsState {
 @connect(({ accountSettings }: { accountSettings: { currentUser: CurrentUser } }) => ({
   currentUser: accountSettings.currentUser,
 }))
-class Settings extends Component<
-  SettingsProps,
-  SettingsState
-> {
+class Settings extends Component<SettingsProps, SettingsState> {
   main: HTMLDivElement | undefined = undefined;
 
   constructor(props: SettingsProps) {
     super(props);
     const menuMap = {
-      base: <FormattedMessage id="account-settings.menuMap.basic" defaultMessage="Basic Settings" />,
+      base: (
+        <FormattedMessage id="account-settings.menuMap.basic" defaultMessage="Basic Settings" />
+      ),
       security: (
-        <FormattedMessage id="account-settings.menuMap.security" defaultMessage="Security Settings" />
+        <FormattedMessage
+          id="account-settings.menuMap.security"
+          defaultMessage="Security Settings"
+        />
       ),
       binding: (
         <FormattedMessage id="account-settings.menuMap.binding" defaultMessage="Account Binding" />

src/pages/dashboard/analysis/components/IntroduceRow.tsx

@@ -24,12 +24,18 @@ const IntroduceRow = ({ loading, visitData }: { loading: boolean; visitData: Vis
       <ChartCard
         bordered={false}
         title={
-          <FormattedMessage id="dashboard-analysis.analysis.total-sales" defaultMessage="Total Sales" />
+          <FormattedMessage
+            id="dashboard-analysis.analysis.total-sales"
+            defaultMessage="Total Sales"
+          />
         }
         action={
           <Tooltip
             title={
-              <FormattedMessage id="dashboard-analysis.analysis.introduce" defaultMessage="Introduce" />
+              <FormattedMessage
+                id="dashboard-analysis.analysis.introduce"
+                defaultMessage="Introduce"
+              />
             }
           >
             <Icon type="info-circle-o" />
@@ -40,7 +46,10 @@ const IntroduceRow = ({ loading, visitData }: { loading: boolean; visitData: Vis
         footer={
           <Field
             label={
-              <FormattedMessage id="dashboard-analysis.analysis.day-sales" defaultMessage="Daily Sales" />
+              <FormattedMessage
+                id="dashboard-analysis.analysis.day-sales"
+                defaultMessage="Daily Sales"
+              />
             }
             value={`￥${numeral(12423).format('0,0')}`}
           />
@@ -66,7 +75,10 @@ const IntroduceRow = ({ loading, visitData }: { loading: boolean; visitData: Vis
         action={
           <Tooltip
             title={
-              <FormattedMessage id="dashboard-analysis.analysis.introduce" defaultMessage="Introduce" />
+              <FormattedMessage
+                id="dashboard-analysis.analysis.introduce"
+                defaultMessage="Introduce"
+              />
             }
           >
             <Icon type="info-circle-o" />
@@ -76,7 +88,10 @@ const IntroduceRow = ({ loading, visitData }: { loading: boolean; visitData: Vis
         footer={
           <Field
             label={
-              <FormattedMessage id="dashboard-analysis.analysis.day-visits" defaultMessage="Daily Visits" />
+              <FormattedMessage
+                id="dashboard-analysis.analysis.day-visits"
+                defaultMessage="Daily Visits"
+              />
             }
             value={numeral(1234).format('0,0')}
           />
@@ -90,11 +105,16 @@ const IntroduceRow = ({ loading, visitData }: { loading: boolean; visitData: Vis
       <ChartCard
         bordered={false}
         loading={loading}
-        title={<FormattedMessage id="dashboard-analysis.analysis.payments" defaultMessage="Payments" />}
+        title={
+          <FormattedMessage id="dashboard-analysis.analysis.payments" defaultMessage="Payments" />
+        }
         action={
           <Tooltip
             title={
-              <FormattedMessage id="dashboard-analysis.analysis.introduce" defaultMessage="Introduce" />
+              <FormattedMessage
+                id="dashboard-analysis.analysis.introduce"
+                defaultMessage="Introduce"
+              />
             }
           >
             <Icon type="info-circle-o" />
@@ -130,7 +150,10 @@ const IntroduceRow = ({ loading, visitData }: { loading: boolean; visitData: Vis
         action={
           <Tooltip
             title={
-              <FormattedMessage id="dashboard-analysis.analysis.introduce" defaultMessage="Introduce" />
+              <FormattedMessage
+                id="dashboard-analysis.analysis.introduce"
+                defaultMessage="Introduce"
+              />
             }
           >
             <Icon type="info-circle-o" />
@@ -140,11 +163,17 @@ const IntroduceRow = ({ loading, visitData }: { loading: boolean; visitData: Vis
         footer={
           <div style={{ whiteSpace: 'nowrap', overflow: 'hidden' }}>
             <Trend flag="up" style={{ marginRight: 16 }}>
-              <FormattedMessage id="dashboard-analysis.analysis.week" defaultMessage="Weekly Changes" />
+              <FormattedMessage
+                id="dashboard-analysis.analysis.week"
+                defaultMessage="Weekly Changes"
+              />
               <span className={styles.trendText}>12%</span>
             </Trend>
             <Trend flag="down">
-              <FormattedMessage id="dashboard-analysis.analysis.day" defaultMessage="Weekly Changes" />
+              <FormattedMessage
+                id="dashboard-analysis.analysis.day"
+                defaultMessage="Weekly Changes"
+              />
               <span className={styles.trendText}>11%</span>
             </Trend>
           </div>

src/pages/dashboard/analysis/components/ProportionSales.tsx

@@ -59,7 +59,9 @@ const ProportionSales = ({
       </h4>
       <Pie
         hasLegend
-        subTitle={<FormattedMessage id="dashboard-analysis.analysis.sales" defaultMessage="Sales" />}
+        subTitle={
+          <FormattedMessage id="dashboard-analysis.analysis.sales" defaultMessage="Sales" />
+        }
         total={() => <Yuan>{salesPieData.reduce((pre, now) => now.y + pre, 0)}</Yuan>}
         data={salesPieData}
         valueFormat={value => <Yuan>{value}</Yuan>}

src/pages/dashboard/analysis/components/SalesCard.tsx

@@ -41,16 +41,28 @@ const SalesCard = ({
           <div className={styles.salesExtraWrap}>
             <div className={styles.salesExtra}>
               <a className={isActive('today')} onClick={() => selectDate('today')}>
-                <FormattedMessage id="dashboard-analysis.analysis.all-day" defaultMessage="All Day" />
+                <FormattedMessage
+                  id="dashboard-analysis.analysis.all-day"
+                  defaultMessage="All Day"
+                />
               </a>
               <a className={isActive('week')} onClick={() => selectDate('week')}>
-                <FormattedMessage id="dashboard-analysis.analysis.all-week" defaultMessage="All Week" />
+                <FormattedMessage
+                  id="dashboard-analysis.analysis.all-week"
+                  defaultMessage="All Week"
+                />
               </a>
               <a className={isActive('month')} onClick={() => selectDate('month')}>
-                <FormattedMessage id="dashboard-analysis.analysis.all-month" defaultMessage="All Month" />
+                <FormattedMessage
+                  id="dashboard-analysis.analysis.all-month"
+                  defaultMessage="All Month"
+                />
               </a>
               <a className={isActive('year')} onClick={() => selectDate('year')}>
-                <FormattedMessage id="dashboard-analysis.analysis.all-year" defaultMessage="All Year" />
+                <FormattedMessage
+                  id="dashboard-analysis.analysis.all-year"
+                  defaultMessage="All Year"
+                />
               </a>
             </div>
             <RangePicker

src/pages/dashboard/analysis/components/TopSearch.tsx

@@ -17,7 +17,10 @@ const columns = [
   },
   {
     title: (
-      <FormattedMessage id="dashboard-analysis.table.search-keyword" defaultMessage="Search keyword" />
+      <FormattedMessage
+        id="dashboard-analysis.table.search-keyword"
+        defaultMessage="Search keyword"
+      />
     ),
     dataIndex: 'keyword',
     key: 'keyword',
@@ -31,7 +34,9 @@ const columns = [
     className: styles.alignRight,
   },
   {
-    title: <FormattedMessage id="dashboard-analysis.table.weekly-range" defaultMessage="Weekly Range" />,
+    title: (
+      <FormattedMessage id="dashboard-analysis.table.weekly-range" defaultMessage="Weekly Range" />
+    ),
     dataIndex: 'range',
     key: 'range',
     sorter: (a: { range: number }, b: { range: number }) => a.range - b.range,
@@ -79,7 +84,10 @@ const TopSearch = ({
               />
               <Tooltip
                 title={
-                  <FormattedMessage id="dashboard-analysis.analysis.introduce" defaultMessage="introduce" />
+                  <FormattedMessage
+                    id="dashboard-analysis.analysis.introduce"
+                    defaultMessage="introduce"
+                  />
                 }
               >
                 <Icon style={{ marginLeft: 8 }} type="info-circle-o" />
@@ -103,7 +111,10 @@ const TopSearch = ({
               />
               <Tooltip
                 title={
-                  <FormattedMessage id="dashboard-analysis.analysis.introduce" defaultMessage="introduce" />
+                  <FormattedMessage
+                    id="dashboard-analysis.analysis.introduce"
+                    defaultMessage="introduce"
+                  />
                 }
               >
                 <Icon style={{ marginLeft: 8 }} type="info-circle-o" />

src/pages/form/basic-form/index.tsx

@@ -71,7 +71,10 @@ class BasicForm extends Component<BasicFormProps> {
       <PageHeaderWrapper content={<FormattedMessage id="form-basic-form.basic.description" />}>
         <Card bordered={false}>
           <Form onSubmit={this.handleSubmit} hideRequiredMark style={{ marginTop: 8 }}>
-            <FormItem {...formItemLayout} label={<FormattedMessage id="form-basic-form.title.label" />}>
+            <FormItem
+              {...formItemLayout}
+              label={<FormattedMessage id="form-basic-form.title.label" />}
+            >
               {getFieldDecorator('title', {
                 rules: [
                   {
@@ -79,9 +82,14 @@ class BasicForm extends Component<BasicFormProps> {
                     message: formatMessage({ id: 'form-basic-form.title.required' }),
                   },
                 ],
-              })(<Input placeholder={formatMessage({ id: 'form-basic-form.title.placeholder' })} />)}
+              })(
+                <Input placeholder={formatMessage({ id: 'form-basic-form.title.placeholder' })} />,
+              )}
             </FormItem>
-            <FormItem {...formItemLayout} label={<FormattedMessage id="form-basic-form.date.label" />}>
+            <FormItem
+              {...formItemLayout}
+              label={<FormattedMessage id="form-basic-form.date.label" />}
+            >
               {getFieldDecorator('date', {
                 rules: [
                   {
@@ -99,7 +107,10 @@ class BasicForm extends Component<BasicFormProps> {
                 />,
               )}
             </FormItem>
-            <FormItem {...formItemLayout} label={<FormattedMessage id="form-basic-form.goal.label" />}>
+            <FormItem
+              {...formItemLayout}
+              label={<FormattedMessage id="form-basic-form.goal.label" />}
+            >
               {getFieldDecorator('goal', {
                 rules: [
                   {
@@ -164,7 +175,9 @@ class BasicForm extends Component<BasicFormProps> {
               }
             >
               {getFieldDecorator('invites')(
-                <Input placeholder={formatMessage({ id: 'form-basic-form.invites.placeholder' })} />,
+                <Input
+                  placeholder={formatMessage({ id: 'form-basic-form.invites.placeholder' })}
+                />,
               )}
             </FormItem>
             <FormItem

src/pages/list/basic-list/index.tsx

@@ -59,10 +59,7 @@ interface BasicListState {
     loading: loading.models.listBasicList,
   }),
 )
-class BasicList extends Component<
-  BasicListProps,
-  BasicListState
-> {
+class BasicList extends Component<BasicListProps, BasicListState> {
   state: BasicListState = { visible: false, done: false, current: undefined };
 
   formLayout = {

src/pages/list/card-list/index.tsx

@@ -35,10 +35,7 @@ interface CardListState {
     loading: loading.models.list,
   }),
 )
-class CardList extends Component<
-  CardListProps,
-  CardListState
-> {
+class CardList extends Component<CardListProps, CardListState> {
   componentDidMount() {
     const { dispatch } = this.props;
     dispatch({

src/pages/list/table-list/_mock.ts

@@ -28,12 +28,10 @@ for (let i = 0; i < 8; i += 1) {
 function getRule(
   req: { url: any },
   res: {
-    json: (
-      arg0: {
+    json: (arg0: {
       list: TableListItem[];
       pagination: { total: number; pageSize: number; current: number };
-      },
-    ) => void;
+    }) => void;
   },
   u: any,
 ) {

src/pages/list/table-list/components/CreateForm.tsx

@@ -7,11 +7,7 @@ const FormItem = Form.Item;
 
 interface CreateFormProps extends FormComponentProps {
   modalVisible: boolean;
-  handleAdd: (
-    fieldsValue: {
-      desc: string;
-    },
-  ) => void;
+  handleAdd: (fieldsValue: { desc: string }) => void;
   handleModalVisible: () => void;
 }
 const CreateForm: React.SFC<CreateFormProps> = props => {

src/pages/profile/basic/index.tsx

@@ -65,10 +65,7 @@ interface BasicState {
     loading: loading.effects['profileBasic/fetchBasic'],
   }),
 )
-class Basic extends Component<
-  BasicProps,
-  BasicState
-> {
+class Basic extends Component<BasicProps, BasicState> {
   componentDidMount() {
     const { dispatch } = this.props;
     dispatch({

src/pages/result/success/index.tsx

@@ -64,7 +64,10 @@ const extra = (
       <Step
         title={
           <span style={{ fontSize: 14 }}>
-            <FormattedMessage id="result-success.success.step1-title" defaultMessage="Create project" />
+            <FormattedMessage
+              id="result-success.success.step1-title"
+              defaultMessage="Create project"
+            />
           </span>
         }
         description={desc1}

src/pages/user/login/index.tsx

@@ -45,10 +45,7 @@ export interface FromDataType {
     submitting: loading.effects['userLogin/login'],
   }),
 )
-class Login extends Component<
-  LoginProps,
-  LoginState
-> {
+class Login extends Component<LoginProps, LoginState> {
   loginForm: FormComponentProps['form'] | undefined | null = undefined;
 
   state: LoginState = {

src/typings.d.ts

@@ -21,6 +21,13 @@ declare module 'nzh/cn';
 declare module 'webpack-theme-color-replacer';
 declare module 'webpack-theme-color-replacer/client';
 
+// src/typings.d.ts
+declare module 'umi-plugin-react/locale' {
+  export default interface MessageDescriptor {
+    id: string;
+  } /* eslint-disable-line */
+}
+
 declare let ga: Function;
 
 // preview.pro.ant.design only do not use in your production ;