use new alias @ which default set in umi

ant-design · Aug 23, 2018 · 8189570 · 8189570
1 parent b0816a4
commit 8189570
Show file tree

Hide file tree

Showing 47 changed files with 68 additions and 80 deletions.
diff --git a/config/config.js b/config/config.js
@@ -21,14 +21,12 @@ export default {
           baseNavigator: true, // default true, when it is true, will use `navigator.language` overwrite default
         },
         polyfills: ['ie9'],
-        ...(
-          (!process.env.TEST && require('os').platform() === 'darwin')
+        ...(!process.env.TEST && require('os').platform() === 'darwin'
           ? {
               dll: ['dva', 'dva/router', 'dva/saga', 'dva/fetch'],
               hardSource: true,
             }
-          : {}
-        ),
+          : {}),
       },
     ],
   ],
@@ -42,12 +40,6 @@ export default {
     '@antv/data-set': 'DataSet',
     rollbar: 'rollbar',
   },
-  alias: {
-    components: path.resolve(__dirname, '../src/components/'),
-    utils: path.resolve(__dirname, '../src/utils/'),
-    assets: path.resolve(__dirname, '../src/assets/'),
-    common: path.resolve(__dirname, '../src/common/'),
-  },
   ignoreMomentLocale: true,
   lessLoaderOptions: {
     javascriptEnabled: true,

diff --git a/jsconfig.json b/jsconfig.json
@@ -4,7 +4,7 @@
     "experimentalDecorators": true,
     "baseUrl": ".",
     "paths": {
-      "components/*": ["./src/components/*"]
+      "@/*": ["./src/*"]
     }
   }
 }
diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js
@@ -8,9 +8,9 @@ import { ContainerQuery } from 'react-container-query';
 import classNames from 'classnames';
 import pathToRegexp from 'path-to-regexp';
 import { formatMessage } from 'umi/locale';
-import SiderMenu from '../components/SiderMenu';
-import Authorized from '../utils/Authorized';
-import SettingDarwer from '../components/SettingDarwer';
+import SiderMenu from '@/components/SiderMenu';
+import Authorized from '@/utils/Authorized';
+import SettingDarwer from '@/components/SettingDarwer';
 import logo from '../assets/logo.svg';
 import Footer from './Footer';
 import Header from './Header';

diff --git a/src/layouts/Footer.js b/src/layouts/Footer.js
@@ -1,6 +1,6 @@
 import React, { Fragment } from 'react';
 import { Layout, Icon } from 'antd';
-import GlobalFooter from '../components/GlobalFooter';
+import GlobalFooter from '@/components/GlobalFooter';
 
 const { Footer } = Layout;
 const FooterView = () => (

diff --git a/src/layouts/Header.js b/src/layouts/Header.js
@@ -3,10 +3,10 @@ import { Layout, message } from 'antd';
 import Animate from 'rc-animate';
 import { connect } from 'dva';
 import { routerRedux } from 'dva/router';
-import GlobalHeader from '../components/GlobalHeader';
-import TopNavHeader from '../components/TopNavHeader';
+import GlobalHeader from '@/components/GlobalHeader';
+import TopNavHeader from '@/components/TopNavHeader';
 import styles from './Header.less';
-import Authorized from '../utils/Authorized';
+import Authorized from '@/utils/Authorized';
 
 const { Header } = Layout;
 

diff --git a/src/layouts/PageHeaderLayout.js b/src/layouts/PageHeaderLayout.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { FormattedMessage } from 'umi/locale';
 import { Link } from 'dva/router';
-import PageHeader from 'components/PageHeader';
+import PageHeader from '@/components/PageHeader';
 import GridContent from './GridContent';
 import styles from './PageHeaderLayout.less';
 import MenuContext from './MenuContext';

diff --git a/src/layouts/UserLayout.js b/src/layouts/UserLayout.js
@@ -1,7 +1,7 @@
 import React, { Fragment } from 'react';
 import { Link } from 'dva/router';
 import { Icon } from 'antd';
-import GlobalFooter from '../components/GlobalFooter';
+import GlobalFooter from '@/components/GlobalFooter';
 import styles from './UserLayout.less';
 import logo from '../assets/logo.svg';
 

diff --git a/src/pages/404.js b/src/pages/404.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Link } from 'dva/router';
-import Exception from 'components/Exception';
+import Exception from '@/components/Exception';
 
 export default () => (
   <Exception type="404" style={{ minHeight: 500, height: '80%' }} linkElement={Link} />

diff --git a/src/pages/Account/Center/Applications.js b/src/pages/Account/Center/Applications.js
@@ -2,7 +2,7 @@ import React, { PureComponent } from 'react';
 import { List, Card, Icon, Dropdown, Menu, Avatar, Tooltip } from 'antd';
 import numeral from 'numeral';
 import { connect } from 'dva';
-import { formatWan } from '../../../utils/utils';
+import { formatWan } from '@/utils/utils';
 import stylesApplications from '../../List/Applications.less';
 
 @connect(({ list }) => ({

diff --git a/src/pages/Account/Center/Center.less b/src/pages/Account/Center/Center.less
@@ -1,5 +1,5 @@
 @import '~antd/lib/style/themes/default.less';
-@import '../../../utils/utils.less';
+@import '~@/utils/utils.less';
 
 .avatarHolder {
   text-align: center;

diff --git a/src/pages/Account/Center/Projects.js b/src/pages/Account/Center/Projects.js
@@ -2,7 +2,7 @@ import React, { PureComponent } from 'react';
 import { List, Card } from 'antd';
 import moment from 'moment';
 import { connect } from 'dva';
-import AvatarList from '../../../components/AvatarList';
+import AvatarList from '@/components/AvatarList';
 import stylesProjects from '../../List/Projects.less';
 
 @connect(({ list }) => ({

diff --git a/src/pages/Account/Settings/BaseView.js b/src/pages/Account/Settings/BaseView.js
@@ -5,7 +5,7 @@ import { connect } from 'dva';
 import styles from './BaseView.less';
 import GeographicView from './GeographicView';
 import PhoneView from './PhoneView';
-// import { getTimeDistance } from '../../../utils/utils';
+// import { getTimeDistance } from '@/utils/utils';
 
 const FormItem = Form.Item;
 const { Option } = Select;

diff --git a/src/pages/Account/Settings/SecurityView.js b/src/pages/Account/Settings/SecurityView.js
@@ -1,7 +1,7 @@
 import React, { Component, Fragment } from 'react';
 import { formatMessage, FormattedMessage } from 'umi/locale';
 import { List } from 'antd';
-// import { getTimeDistance } from '../../../utils/utils';
+// import { getTimeDistance } from '@/utils/utils';
 
 const passwordStrength = {
   strong: (
@@ -16,7 +16,8 @@ const passwordStrength = {
   ),
   weak: (
     <font className="weak">
-      <FormattedMessage id="app.settings.security.weak" defaultMessage="Weak" />Weak
+      <FormattedMessage id="app.settings.security.weak" defaultMessage="Weak" />
+      Weak
     </font>
   ),
 };
@@ -28,9 +29,8 @@ class SecurityView extends Component {
         title: formatMessage({ id: 'app.settings.security.password' }, {}),
         description: (
           <Fragment>
-            {formatMessage({ id: 'app.settings.security.password-description' }, {})}：{
-              passwordStrength.strong
-            }
+            {formatMessage({ id: 'app.settings.security.password-description' }, {})}：
+            {passwordStrength.strong}
           </Fragment>
         ),
         actions: [

diff --git a/src/pages/Account/Settings/services/geographic.js b/src/pages/Account/Settings/services/geographic.js
@@ -1,4 +1,4 @@
-import request from '../../../../utils/request';
+import request from '@/utils/request';
 
 export async function queryProvince() {
   return request('/api/geographic/province');

diff --git a/src/pages/Dashboard/Analysis.js b/src/pages/Dashboard/Analysis.js
@@ -23,9 +23,9 @@ import {
   Bar,
   Pie,
   TimelineChart,
-} from 'components/Charts';
-import Trend from 'components/Trend';
-import NumberInfo from 'components/NumberInfo';
+} from '@/components/Charts';
+import Trend from '@/components/Trend';
+import NumberInfo from '@/components/NumberInfo';
 import numeral from 'numeral';
 import GridContent from '@/layouts/GridContent';
 import Yuan from '@/utils/Yuan';

diff --git a/src/pages/Dashboard/Analysis.less b/src/pages/Dashboard/Analysis.less
@@ -1,5 +1,5 @@
 @import '~antd/lib/style/themes/default.less';
-@import '../../utils/utils.less';
+@import '~@/utils/utils.less';
 
 .iconGroup {
   i {

diff --git a/src/pages/Dashboard/Monitor.js b/src/pages/Dashboard/Monitor.js
@@ -1,10 +1,10 @@
 import React, { PureComponent } from 'react';
 import { connect } from 'dva';
 import { Row, Col, Card, Tooltip } from 'antd';
-import { Pie, WaterWave, Gauge, TagCloud } from 'components/Charts';
-import NumberInfo from 'components/NumberInfo';
-import CountDown from 'components/CountDown';
-import ActiveChart from 'components/ActiveChart';
+import { Pie, WaterWave, Gauge, TagCloud } from '@/components/Charts';
+import NumberInfo from '@/components/NumberInfo';
+import CountDown from '@/components/CountDown';
+import ActiveChart from '@/components/ActiveChart';
 import numeral from 'numeral';
 import GridContent from '@/layouts/GridContent';
 

diff --git a/src/pages/Dashboard/Monitor.less b/src/pages/Dashboard/Monitor.less
@@ -1,5 +1,5 @@
 @import '~antd/lib/style/themes/default.less';
-@import '../../utils/utils.less';
+@import '~@/utils/utils.less';
 
 .mapChart {
   padding-top: 24px;

diff --git a/src/pages/Dashboard/Workplace.less b/src/pages/Dashboard/Workplace.less
@@ -1,5 +1,5 @@
 @import '~antd/lib/style/themes/default.less';
-@import '../../utils/utils.less';
+@import '~@/utils/utils.less';
 
 .activitiesList {
   padding: 0 24px 8px 24px;

diff --git a/src/pages/Exception/403.js b/src/pages/Exception/403.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { formatMessage } from 'umi/locale';
 import { Link } from 'dva/router';
-import Exception from 'components/Exception';
+import Exception from '@/components/Exception';
 
 class Exception403 extends Component {
   render() {

diff --git a/src/pages/Exception/404.js b/src/pages/Exception/404.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { formatMessage } from 'umi/locale';
 import { Link } from 'dva/router';
-import Exception from 'components/Exception';
+import Exception from '@/components/Exception';
 
 class Exception404 extends Component {
   render() {

diff --git a/src/pages/Exception/500.js b/src/pages/Exception/500.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { formatMessage } from 'umi/locale';
 import { Link } from 'dva/router';
-import Exception from 'components/Exception';
+import Exception from '@/components/Exception';
 
 class Exception500 extends Component {
   render() {

diff --git a/src/pages/Forms/AdvancedForm.js b/src/pages/Forms/AdvancedForm.js
@@ -13,7 +13,7 @@ import {
   Popover,
 } from 'antd';
 import { connect } from 'dva';
-import FooterToolbar from 'components/FooterToolbar';
+import FooterToolbar from '@/components/FooterToolbar';
 import PageHeaderLayout from '@/layouts/PageHeaderLayout';
 import TableForm from './TableForm';
 import styles from './style.less';

diff --git a/src/pages/Forms/StepForm/Step2.js b/src/pages/Forms/StepForm/Step2.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { connect } from 'dva';
 import { Form, Input, Button, Alert, Divider } from 'antd';
 import { routerRedux } from 'dva/router';
-import { digitUppercase } from '../../../utils/utils';
+import { digitUppercase } from '@/utils/utils';
 import styles from './style.less';
 
 const formItemLayout = {
@@ -55,11 +55,7 @@ class Step2 extends React.PureComponent {
         </Form.Item>
         <Form.Item {...formItemLayout} className={styles.stepFormText} label="转账金额">
           <span className={styles.money}>{data.amount}</span>
-          <span className={styles.uppercase}>
-            （
-            {digitUppercase(data.amount)}
-            ）
-          </span>
+          <span className={styles.uppercase}>（{digitUppercase(data.amount)}）</span>
         </Form.Item>
         <Divider style={{ margin: '24px 0' }} />
         <Form.Item {...formItemLayout} label="支付密码" required={false}>

diff --git a/src/pages/Forms/StepForm/Step3.js b/src/pages/Forms/StepForm/Step3.js
@@ -2,7 +2,7 @@ import React, { Fragment } from 'react';
 import { connect } from 'dva';
 import { Button, Row, Col } from 'antd';
 import { routerRedux } from 'dva/router';
-import Result from 'components/Result';
+import Result from '@/components/Result';
 import styles from './style.less';
 
 @connect(({ form }) => ({

diff --git a/src/pages/Forms/StepForm/index.js b/src/pages/Forms/StepForm/index.js
@@ -4,7 +4,7 @@ import PageHeaderLayout from '@/layouts/PageHeaderLayout';
 import styles from '../style.less';
 
 // import { Route, Redirect, Switch } from 'dva/router';
-// import { getRoutes } from '../../../utils/utils';
+// import { getRoutes } from '@/utils/utils';
 
 const { Step } = Steps;
 

diff --git a/src/pages/List/Applications.js b/src/pages/List/Applications.js
@@ -2,10 +2,10 @@ import React, { PureComponent } from 'react';
 import numeral from 'numeral';
 import { connect } from 'dva';
 import { Row, Col, Form, Card, Select, Icon, Avatar, List, Tooltip, Dropdown, Menu } from 'antd';
-import TagSelect from 'components/TagSelect';
-import StandardFormRow from 'components/StandardFormRow';
+import TagSelect from '@/components/TagSelect';
+import StandardFormRow from '@/components/StandardFormRow';
 
-import { formatWan } from '../../utils/utils';
+import { formatWan } from '@/utils/utils';
 
 import styles from './Applications.less';
 

diff --git a/src/pages/List/Applications.less b/src/pages/List/Applications.less
@@ -1,5 +1,5 @@
 @import '~antd/lib/style/themes/default.less';
-@import '../../utils/utils.less';
+@import '~@/utils/utils.less';
 
 .filterCardList {
   margin-bottom: -24px;

diff --git a/src/pages/List/Articles.js b/src/pages/List/Articles.js
@@ -3,8 +3,8 @@ import moment from 'moment';
 import { connect } from 'dva';
 import { Form, Card, Select, List, Tag, Icon, Avatar, Row, Col, Button } from 'antd';
 
-import TagSelect from 'components/TagSelect';
-import StandardFormRow from 'components/StandardFormRow';
+import TagSelect from '@/components/TagSelect';
+import StandardFormRow from '@/components/StandardFormRow';
 import styles from './Articles.less';
 
 const { Option } = Select;

diff --git a/src/pages/List/Articles.less b/src/pages/List/Articles.less
@@ -1,5 +1,5 @@
 @import '~antd/lib/style/themes/default.less';
-@import '../../utils/utils.less';
+@import '~@/utils/utils.less';
 
 .listContent {
   .description {

diff --git a/src/pages/List/BasicList.less b/src/pages/List/BasicList.less
@@ -1,5 +1,5 @@
 @import '~antd/lib/style/themes/default.less';
-@import '../../utils/utils.less';
+@import '~@/utils/utils.less';
 
 .standardList {
   :global {

diff --git a/src/pages/List/CardList.js b/src/pages/List/CardList.js
@@ -2,7 +2,7 @@ import React, { PureComponent } from 'react';
 import { connect } from 'dva';
 import { Card, Button, Icon, List } from 'antd';
 
-import Ellipsis from 'components/Ellipsis';
+import Ellipsis from '@/components/Ellipsis';
 import PageHeaderLayout from '@/layouts/PageHeaderLayout';
 
 import styles from './CardList.less';

diff --git a/src/pages/List/CardList.less b/src/pages/List/CardList.less
@@ -1,5 +1,5 @@
 @import '~antd/lib/style/themes/default.less';
-@import '../../utils/utils.less';
+@import '~@/utils/utils.less';
 
 .cardList {
   margin-bottom: -24px;

diff --git a/src/pages/List/Projects.js b/src/pages/List/Projects.js
@@ -3,10 +3,10 @@ import moment from 'moment';
 import { connect } from 'dva';
 import { Row, Col, Form, Card, Select, List } from 'antd';
 
-import TagSelect from 'components/TagSelect';
-import AvatarList from 'components/AvatarList';
-import Ellipsis from 'components/Ellipsis';
-import StandardFormRow from 'components/StandardFormRow';
+import TagSelect from '@/components/TagSelect';
+import AvatarList from '@/components/AvatarList';
+import Ellipsis from '@/components/Ellipsis';
+import StandardFormRow from '@/components/StandardFormRow';
 
 import styles from './Projects.less';
 

diff --git a/src/pages/List/Projects.less b/src/pages/List/Projects.less
@@ -1,5 +1,5 @@
 @import '~antd/lib/style/themes/default.less';
-@import '../../utils/utils.less';
+@import '~@/utils/utils.less';
 
 .coverCardList {
   margin-bottom: -24px;

diff --git a/src/pages/List/TableList.js b/src/pages/List/TableList.js
@@ -21,7 +21,7 @@ import {
   Steps,
   Radio,
 } from 'antd';
-import StandardTable from 'components/StandardTable';
+import StandardTable from '@/components/StandardTable';
 import PageHeaderLayout from '@/layouts/PageHeaderLayout';
 
 import styles from './TableList.less';

diff --git a/src/pages/List/TableList.less b/src/pages/List/TableList.less
@@ -1,5 +1,5 @@
 @import '~antd/lib/style/themes/default.less';
-@import '../../utils/utils.less';
+@import '~@/utils/utils.less';
 
 .tableList {
   .tableListOperator {