diff --git a/config/config.js b/config/config.js index d86bc928dd82cddb2d061689a6dfde53afdd4821..d75938edc668241a7f8694fa706e6a52653cd773 100644 --- 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 index 5475bee038ba8a832e8b29d91bd08aa7af95d3ad..f87334d482029d82509ddb6c0dab5ab62236cd15 100644 --- 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 index 44e86b1748a9921b3063bc1223f8e44c225b75ed..4f2b9a00ac215b35505355915cafe806bbeeedac 100644 --- 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 index 5c346a52bd9eb0e38e26bbe294570d7c653582a2..693c81721e1c41c93a0de2dee321ea358f9d4455 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'; +import GlobalFooter from '@/components/GlobalFooter'; const { Footer } = Layout; const FooterView = () => ( diff --git a/src/layouts/Header.js b/src/layouts/Header.js index afb2c7d0854b788b16ba91c52e2085b733c74bc9..d297c8883be44fd3c9926585db60e367389b99a4 100644 --- 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 index 8263b18a765df0b7196cfe62fb446156d18c0c68..eeaac5e01c0464909301c96c18a5ac45cb5c48b4 100644 --- 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 index 40eb7ae8facb3a83b515947fedbd54283d4e108d..1ff6a42b97eefb65fa0c04b2488605e729c5449f 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'; +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 index 0a3d87669618364fc9a69139341b58e49eca807e..a653ef1705889c4d1c82e51a75d6cdd886d9c767 100644 --- 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 () => ( diff --git a/src/pages/Account/Center/Applications.js b/src/pages/Account/Center/Applications.js index 729cdd42cb0f81fd1ec4e14d5368125259e82d74..114325bb99d700119dcdf828bf28e3f84e69318e 100644 --- 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 index 727b9021b448ce2314804f0287d5bd5f8c981051..37d6a203e668df00d742f20c366721a18304600c 100644 --- 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 index 7eb91be8b85bea1e6353fe8c0db747ca47a9ec83..74af5e1681c91dfabdef18e9f9141ff234ff6a23 100644 --- 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 index 32721e145628fb0c0582463f04bf6a9eeb2c7e68..727fd9c3658b58e9b2f1e3438c6474d44fadc5dd 100644 --- 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 index 687d63e8ac7da5b77ea2aafe55bee66845127301..a58766b36ff330e85da4d6762bad1639d375d064 100644 --- 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: ( - Weak + + Weak ), }; @@ -28,9 +29,8 @@ class SecurityView extends Component { title: formatMessage({ id: 'app.settings.security.password' }, {}), description: ( - {formatMessage({ id: 'app.settings.security.password-description' }, {})}:{ - passwordStrength.strong - } + {formatMessage({ id: 'app.settings.security.password-description' }, {})}: + {passwordStrength.strong} ), actions: [ diff --git a/src/pages/Account/Settings/services/geographic.js b/src/pages/Account/Settings/services/geographic.js index ee7fcc3fc136bae9d6802284891b6d39b9e899a2..a5defd87b941d2c2057050a920f7040ef79a05cc 100644 --- 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 index 5f3b37f0d4eb627b1fc480102617ab00d5ba27a5..62679aa8088e492500c392e09fffc8e4180afaa3 100644 --- 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 index dc2319cbf4ff5b5c0ad5e61755ec475e9e5436d3..8f3eb38898c05beed98973bfd8417f73e8ee319c 100644 --- 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 index 54b3970ed4181aadb8363144357c5dd6b8ce472e..c6b5463fe29348e54b036a315462a609d1633d27 100644 --- 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 index 3f0701f1a8c6c7f75f9585bc559c45e5c59b9a70..0316b619556891fe28d1d5eb1192825fce5cb9d9 100644 --- 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 index 4bd4979baeeb8464e907f87fa73f4be1d78a5625..038017112f79467c737c87da0f83f203caffb63f 100644 --- 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 index 84ee0fdcc0cbcb71bc0f808ff7ee6ccc3a6315d6..c75724aa74fe3dd2d3416c9f8d34f94a26be0cb8 100644 --- 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 index ebec5032a3275101e68aaf9daeb846510f7cd0e6..e9ecdff1d63774a38d125481ad812df187304fa0 100644 --- 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 index e7b36ae0e044da3f0d0290a43ab196aec6ba15ee..f85732e4c6ee5b4a5df26bef2e3e3d9333cf552f 100644 --- 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 index 3d20badc1e7d90fb6b5c4ec2700df07006e1eae5..a7e7c289f71b67d7e27c4f86086116cb6df325de 100644 --- 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 index 54fe43c148d4108e8544a772525391d71e37cfb6..856ba7eee47d213bd4e80fd8edca60ea1e44a0df 100644 --- 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 { {data.amount} - - ( - {digitUppercase(data.amount)} - ) - + ({digitUppercase(data.amount)}) diff --git a/src/pages/Forms/StepForm/Step3.js b/src/pages/Forms/StepForm/Step3.js index 2438d82e73648710d1b1f1f7c213cb607e61c4d3..6b29dba10fafee80f3fabe16f2c405b66987a15e 100644 --- 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 index 51a6e8649fab91093042f09e073721fc943da726..8ea12024566d178d6a50812c7caad510e5f8ad17 100644 --- 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 index 1503c6f4e5fae131a62f56cdae362fc0570b9b1b..9bf1e42c8bb1366743afb26db1cdd791c1a4d106 100644 --- 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 index ba6cfa796d99c2435ce34057523cb8411766b2ef..8f5cb368d3931865ad68f330e4d2ceb0b4df21cd 100644 --- 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 index bca8f10b8d8e32093d454da77d951ae8eb8368e3..9e90d02b409daeb5433a084ae8dc9ee60a9c4c40 100644 --- 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 index 364063a36f82296d147002ac5430f8310ddb2487..3f2db2b2f9be8062b34ba99009d5b1aed29ac43a 100644 --- 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 index 29cb62d45c4990f7001dca6f82277f558b7e57eb..f086c501c887f985093d0e6cf0b99643a0ed44dc 100644 --- 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 index 1426bdecaded374bd400e15996de46558780ec36..2c6c8baa1031f2934d465eb11f3056a9abdc8f9a 100644 --- 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 index cbab2cd3bcdd078569b31d1fc2db561dc5250d5a..3d6feacc2635872b8c6006c529524cb107a5c584 100644 --- 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 index 4775640a30a051797c43e7b32ea1146ec6707ccc..1b04eb62c635400f6a72702219d46ad0f4bc600b 100644 --- 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 index aeda83c198e9a5ffa862ee53f3f50582cce4f595..43b8d72655bafe27dbd31ad33c93e9b934289f17 100644 --- 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 index fdff5be30e9ba4758ddc3c8970a8e3f774bc2192..531fc7c71e2202fd0a9124472deb4df5bb2e0651 100644 --- 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 index f3d627ea7c231b56045ac18209b15d8f74d8acbf..792757dfa5888c5bb934ada39842d467f407d10c 100644 --- 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 { diff --git a/src/pages/Profile/AdvancedProfile.js b/src/pages/Profile/AdvancedProfile.js index 03b366e364786e508ead9b1590c73091ace516ec..37dfbefb71bbff65ade4cc8dc33aaababfef05cb 100644 --- a/src/pages/Profile/AdvancedProfile.js +++ b/src/pages/Profile/AdvancedProfile.js @@ -18,7 +18,7 @@ import { Divider, } from 'antd'; import classNames from 'classnames'; -import DescriptionList from 'components/DescriptionList'; +import DescriptionList from '@/components/DescriptionList'; import PageHeaderLayout from '@/layouts/PageHeaderLayout'; import styles from './AdvancedProfile.less'; diff --git a/src/pages/Profile/BasicProfile.js b/src/pages/Profile/BasicProfile.js index dd17dad02a8dc2c29cabfedf5aa85cf41e1e3b4b..ea457288b9a21dd9fddf1b3927fd28856585bb8b 100644 --- a/src/pages/Profile/BasicProfile.js +++ b/src/pages/Profile/BasicProfile.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { connect } from 'dva'; import { Card, Badge, Table, Divider } from 'antd'; -import DescriptionList from 'components/DescriptionList'; +import DescriptionList from '@/components/DescriptionList'; import PageHeaderLayout from '@/layouts/PageHeaderLayout'; import styles from './BasicProfile.less'; diff --git a/src/pages/Result/Success.js b/src/pages/Result/Success.js index 1d049b8f9fb3e6dd82a0540954c4c4009366ca52..12e38452456b4026eb2cfecfc28f43fb3bf23c27 100644 --- a/src/pages/Result/Success.js +++ b/src/pages/Result/Success.js @@ -1,7 +1,7 @@ import React, { Fragment } from 'react'; import { formatMessage, FormattedMessage } from 'umi/locale'; import { Button, Row, Col, Icon, Steps, Card } from 'antd'; -import Result from 'components/Result'; +import Result from '@/components/Result'; import PageHeaderLayout from '@/layouts/PageHeaderLayout'; const { Step } = Steps; diff --git a/src/pages/User/Login.js b/src/pages/User/Login.js index a88a5ae4c517b64e8847686dd9e641136a3850ff..462784026d99dd247a8b29e8cf44ac0024b0cd9a 100644 --- a/src/pages/User/Login.js +++ b/src/pages/User/Login.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { connect } from 'dva'; import { Link } from 'dva/router'; import { Checkbox, Alert, Icon } from 'antd'; -import Login from 'components/Login'; +import Login from '@/components/Login'; import styles from './Login.less'; const { Tab, UserName, Password, Mobile, Captcha, Submit } = Login; diff --git a/src/pages/User/RegisterResult.js b/src/pages/User/RegisterResult.js index fac8260bf4041e0fde008337291e41a4321e27d6..28eca74515517b8e99a0348be3c744090bfbcaf4 100644 --- a/src/pages/User/RegisterResult.js +++ b/src/pages/User/RegisterResult.js @@ -1,7 +1,7 @@ import React from 'react'; import { Button } from 'antd'; import { Link } from 'dva/router'; -import Result from 'components/Result'; +import Result from '@/components/Result'; import styles from './RegisterResult.less'; const actions = ( diff --git a/src/services/api.js b/src/services/api.js index 2281cd344c7189ebe89191b5cb4162086e085f88..431f2ccd00c5b75cefb91262734ea62d5c92a032 100644 --- a/src/services/api.js +++ b/src/services/api.js @@ -1,5 +1,5 @@ import { stringify } from 'qs'; -import request from '../utils/request'; +import request from '@/utils/request'; export async function queryProjectNotice() { return request('/api/project/notice'); diff --git a/src/services/error.js b/src/services/error.js index 7e1eeee1948fcbcd725af01420b7905432816b93..b77e4de9c5c9a067ca6bf8728734da92de3abcdd 100644 --- a/src/services/error.js +++ b/src/services/error.js @@ -1,4 +1,4 @@ -import request from '../utils/request'; +import request from '@/utils/request'; export async function query(code) { return request(`/api/${code}`); diff --git a/src/services/user.js b/src/services/user.js index c4defb4f65d938310fb76e4b4e4bb0d7f3fae5ed..89e03c6f67b2ba505e429b2c9afbcb40142508aa 100644 --- a/src/services/user.js +++ b/src/services/user.js @@ -1,4 +1,4 @@ -import request from '../utils/request'; +import request from '@/utils/request'; export async function query() { return request('/api/users'); diff --git a/src/utils/Authorized.js b/src/utils/Authorized.js index ceb11617c9c06267596dab72dbb4a9fed20a57b4..8c420cbaa1441f2fa4f52e4c97b8aa327cddce26 100644 --- a/src/utils/Authorized.js +++ b/src/utils/Authorized.js @@ -1,4 +1,4 @@ -import RenderAuthorized from '../components/Authorized'; +import RenderAuthorized from '@/components/Authorized'; import { getAuthority } from './authority'; let Authorized = RenderAuthorized(getAuthority()); // eslint-disable-line diff --git a/src/utils/Yuan.js b/src/utils/Yuan.js index f5436b42f78f499c70eeaa3d77a62883fba05358..434a57fb7cfc547015cfff71ac427b85be27817b 100644 --- a/src/utils/Yuan.js +++ b/src/utils/Yuan.js @@ -1,5 +1,5 @@ import React from 'react'; -import { yuan } from 'components/Charts'; +import { yuan } from '@/components/Charts'; /** * 减少使用 dangerouslySetInnerHTML */