diff --git a/src/components/Authorized/Secured.js b/src/components/Authorized/Secured.js index d31cc5650233cb3d7d25b9d51bacc7d265b04451..70546813b6c98398fc3b183f05cbeaa32e052abc 100644 --- a/src/components/Authorized/Secured.js +++ b/src/components/Authorized/Secured.js @@ -1,5 +1,5 @@ import React from 'react'; -import Exception from '../Exception/index'; +import Exception from '../Exception'; import CheckPermissions from './CheckPermissions'; /** * 默认不能访问任何页面 diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js index 4c1596a98f45d37895436f65a6ab4e3d638d50a7..e2341045bd32e7718a5310e665d0e6f020852b36 100644 --- a/src/layouts/BasicLayout.js +++ b/src/layouts/BasicLayout.js @@ -7,9 +7,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/index'; +import SiderMenu from '../components/SiderMenu'; import Authorized from '../utils/Authorized'; -import SettingDarwer from '../components/SettingDarwer/index'; +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 index e1c6e8169893d07d96076cf0f346c244dfd4dd27..5c346a52bd9eb0e38e26bbe294570d7c653582a2 100644 --- 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/index'; +import GlobalFooter from '../components/GlobalFooter'; const { Footer } = Layout; const FooterView = () => ( diff --git a/src/layouts/Header.js b/src/layouts/Header.js index c1d0c52408e1ca72012eaef3dc0034fdab2d249f..afb2c7d0854b788b16ba91c52e2085b733c74bc9 100644 --- a/src/layouts/Header.js +++ b/src/layouts/Header.js @@ -3,8 +3,8 @@ import { Layout, message } from 'antd'; import Animate from 'rc-animate'; import { connect } from 'dva'; import { routerRedux } from 'dva/router'; -import GlobalHeader from '../components/GlobalHeader/index'; -import TopNavHeader from '../components/TopNavHeader/index'; +import GlobalHeader from '../components/GlobalHeader'; +import TopNavHeader from '../components/TopNavHeader'; import styles from './Header.less'; import Authorized from '../utils/Authorized'; diff --git a/src/layouts/UserLayout.js b/src/layouts/UserLayout.js index 3eb766c9903b2ca12d7627e241b5157085886c66..40eb7ae8facb3a83b515947fedbd54283d4e108d 100644 --- 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/index'; +import GlobalFooter from '../components/GlobalFooter'; import styles from './UserLayout.less'; import logo from '../assets/logo.svg'; diff --git a/src/pages/Account/Center/Center.js b/src/pages/Account/Center/Center.js index 9609ca3a9a82b3a6a9894137ae91c61a5682b142..903e2ed80bb6e5ed25a3092faa3bf4408152ba9f 100644 --- a/src/pages/Account/Center/Center.js +++ b/src/pages/Account/Center/Center.js @@ -2,7 +2,7 @@ import React, { PureComponent } from 'react'; import { connect } from 'dva'; import { Link, routerRedux } from 'dva/router'; import { Card, Row, Col, Icon, Avatar, Tag, Divider, Spin, Input } from 'antd'; -import GridContent from '../../../layouts/GridContent'; +import GridContent from '@/layouts/GridContent'; import styles from './Center.less'; @connect(({ loading, user, project }) => ({ diff --git a/src/pages/Account/Settings/Info.js b/src/pages/Account/Settings/Info.js index bf52a48261cbc13189c48be2b2ba511aaf548e89..f53986f29c8842fecde72f938768240981c6ad93 100644 --- a/src/pages/Account/Settings/Info.js +++ b/src/pages/Account/Settings/Info.js @@ -4,7 +4,7 @@ import { routerRedux } from 'dva/router'; import { FormattedMessage } from 'umi/locale'; import { Menu } from 'antd'; import styles from './Info.less'; -import GridContent from '../../../layouts/GridContent'; +import GridContent from '@/layouts/GridContent'; const { Item } = Menu; diff --git a/src/pages/Dashboard/Analysis.js b/src/pages/Dashboard/Analysis.js index 33034b6d921af11449246a1471a814eaa779a841..5f3b37f0d4eb627b1fc480102617ab00d5ba27a5 100644 --- a/src/pages/Dashboard/Analysis.js +++ b/src/pages/Dashboard/Analysis.js @@ -27,9 +27,9 @@ import { import Trend from 'components/Trend'; import NumberInfo from 'components/NumberInfo'; import numeral from 'numeral'; -import GridContent from '../../layouts/GridContent'; -import Yuan from '../../utils/Yuan'; -import { getTimeDistance } from '../../utils/utils'; +import GridContent from '@/layouts/GridContent'; +import Yuan from '@/utils/Yuan'; +import { getTimeDistance } from '@/utils/utils'; import styles from './Analysis.less'; diff --git a/src/pages/Dashboard/Monitor.js b/src/pages/Dashboard/Monitor.js index d8f1aa0c6b4c44ed52188f986881920731bec95a..54b3970ed4181aadb8363144357c5dd6b8ce472e 100644 --- a/src/pages/Dashboard/Monitor.js +++ b/src/pages/Dashboard/Monitor.js @@ -6,9 +6,9 @@ import NumberInfo from 'components/NumberInfo'; import CountDown from 'components/CountDown'; import ActiveChart from 'components/ActiveChart'; import numeral from 'numeral'; -import GridContent from '../../layouts/GridContent'; +import GridContent from '@/layouts/GridContent'; -import Authorized from '../../utils/Authorized'; +import Authorized from '@/utils/Authorized'; import styles from './Monitor.less'; const { Secured } = Authorized; diff --git a/src/pages/Forms/AdvancedForm.js b/src/pages/Forms/AdvancedForm.js index fdaa61bace91afa13919efb6fcf63abd54e7821d..b9e5ffc6cd00f1d39a9b508fb661ceb28a4d5adc 100644 --- a/src/pages/Forms/AdvancedForm.js +++ b/src/pages/Forms/AdvancedForm.js @@ -14,7 +14,7 @@ import { } from 'antd'; import { connect } from 'dva'; import FooterToolbar from 'components/FooterToolbar'; -import PageHeaderLayout from '../../layouts/PageHeaderLayout'; +import PageHeaderLayout from '@/layouts/PageHeaderLayout'; import TableForm from './TableForm'; import styles from './style.less'; diff --git a/src/pages/Forms/BasicForm.js b/src/pages/Forms/BasicForm.js index a971a33ee01c3fe5d4c04df702a1d78998952f69..b6067ecdca340de9a25f1f408814a1f8651cea00 100644 --- a/src/pages/Forms/BasicForm.js +++ b/src/pages/Forms/BasicForm.js @@ -12,7 +12,7 @@ import { Icon, Tooltip, } from 'antd'; -import PageHeaderLayout from '../../layouts/PageHeaderLayout'; +import PageHeaderLayout from '@/layouts/PageHeaderLayout'; import styles from './style.less'; const FormItem = Form.Item; diff --git a/src/pages/Forms/StepForm/index.js b/src/pages/Forms/StepForm/index.js index 685f3ed71ab05c35d5c13b6aac0cae62a71e501a..51a6e8649fab91093042f09e073721fc943da726 100644 --- a/src/pages/Forms/StepForm/index.js +++ b/src/pages/Forms/StepForm/index.js @@ -1,6 +1,6 @@ import React, { PureComponent, Fragment } from 'react'; import { Card, Steps } from 'antd'; -import PageHeaderLayout from '../../../layouts/PageHeaderLayout'; +import PageHeaderLayout from '@/layouts/PageHeaderLayout'; import styles from '../style.less'; // import { Route, Redirect, Switch } from 'dva/router'; diff --git a/src/pages/List/BasicList.js b/src/pages/List/BasicList.js index 97b8e31a0511a7afc459f22eda313feb0ad75d77..3e95a1f301577bf05a3dafc04830230f09508272 100644 --- a/src/pages/List/BasicList.js +++ b/src/pages/List/BasicList.js @@ -21,8 +21,8 @@ import { Select, } from 'antd'; -import PageHeaderLayout from '../../layouts/PageHeaderLayout'; -import Result from '../../components/Result'; +import PageHeaderLayout from '@/layouts/PageHeaderLayout'; +import Result from '@/components/Result'; import styles from './BasicList.less'; diff --git a/src/pages/List/CardList.js b/src/pages/List/CardList.js index 6ad863e551bee2581ca581d37efe095d14164d7c..1426bdecaded374bd400e15996de46558780ec36 100644 --- a/src/pages/List/CardList.js +++ b/src/pages/List/CardList.js @@ -3,7 +3,7 @@ import { connect } from 'dva'; import { Card, Button, Icon, List } from 'antd'; import Ellipsis from 'components/Ellipsis'; -import PageHeaderLayout from '../../layouts/PageHeaderLayout'; +import PageHeaderLayout from '@/layouts/PageHeaderLayout'; import styles from './CardList.less'; diff --git a/src/pages/List/List.js b/src/pages/List/List.js index 5443f5f6b29ceafe3310e4cff500298ae38a6bb0..5e8707559205941a5db14fc9b1a669f734bb4286 100644 --- a/src/pages/List/List.js +++ b/src/pages/List/List.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { routerRedux } from 'dva/router'; import { connect } from 'dva'; import { Input } from 'antd'; -import PageHeaderLayout from '../../layouts/PageHeaderLayout'; +import PageHeaderLayout from '@/layouts/PageHeaderLayout'; @connect() export default class SearchList extends Component { diff --git a/src/pages/List/TableList.js b/src/pages/List/TableList.js index 938853ac663ee861092dc90a7d359fd5d3ba0da1..fdff5be30e9ba4758ddc3c8970a8e3f774bc2192 100644 --- a/src/pages/List/TableList.js +++ b/src/pages/List/TableList.js @@ -22,7 +22,7 @@ import { Radio, } from 'antd'; import StandardTable from 'components/StandardTable'; -import PageHeaderLayout from '../../layouts/PageHeaderLayout'; +import PageHeaderLayout from '@/layouts/PageHeaderLayout'; import styles from './TableList.less'; diff --git a/src/pages/Profile/AdvancedProfile.js b/src/pages/Profile/AdvancedProfile.js index 93d407f27a3732f87d238f506c78c39137ad81a2..03b366e364786e508ead9b1590c73091ace516ec 100644 --- a/src/pages/Profile/AdvancedProfile.js +++ b/src/pages/Profile/AdvancedProfile.js @@ -19,7 +19,7 @@ import { } from 'antd'; import classNames from 'classnames'; import DescriptionList from 'components/DescriptionList'; -import PageHeaderLayout from '../../layouts/PageHeaderLayout'; +import PageHeaderLayout from '@/layouts/PageHeaderLayout'; import styles from './AdvancedProfile.less'; const { Step } = Steps; diff --git a/src/pages/Profile/BasicProfile.js b/src/pages/Profile/BasicProfile.js index b226de39becb331e3fb769618d5e7f184368a687..dd17dad02a8dc2c29cabfedf5aa85cf41e1e3b4b 100644 --- a/src/pages/Profile/BasicProfile.js +++ b/src/pages/Profile/BasicProfile.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { connect } from 'dva'; import { Card, Badge, Table, Divider } from 'antd'; import DescriptionList from 'components/DescriptionList'; -import PageHeaderLayout from '../../layouts/PageHeaderLayout'; +import PageHeaderLayout from '@/layouts/PageHeaderLayout'; import styles from './BasicProfile.less'; const { Description } = DescriptionList;