Make model and page together

config/plugin.config.js

@@ -5,6 +5,8 @@ const AntDesignThemePlugin = require('antd-theme-webpack-plugin');
 const path = require('path');
 
 const plugin = config => {
+  return;
+
   // 将所有 less 合并为一个供 themePlugin使用
   const outFile = path.join(__dirname, '../.temp/ant-design-pro.less');
   const stylesDir = path.join(__dirname, '../src/');

src/models/list.js

@@ -1,4 +1,4 @@
-import { queryFakeList, removeFakeList, addFakeList, updateFakeList } from '../services/api';
+import { queryFakeList, removeFakeList, addFakeList, updateFakeList } from '@/services/api';
 
 export default {
   namespace: 'list',

src/models/project.js

@@ -1,4 +1,4 @@
-import { queryProjectNotice } from '../services/api';
+import { queryProjectNotice } from '@/services/api';
 
 export default {
   namespace: 'project',

src/services/geographic.js → 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');

src/pages/Dashboard/Workplace.js

@@ -4,9 +4,9 @@ import { connect } from 'dva';
 import { Link } from 'dva/router';
 import { Row, Col, Card, List, Avatar } from 'antd';
 
-import { Radar } from 'components/Charts';
+import { Radar } from '@/components/Charts';
-import EditableLinkGroup from 'components/EditableLinkGroup';
+import EditableLinkGroup from '@/components/EditableLinkGroup';
-import PageHeaderLayout from '../../layouts/PageHeaderLayout';
+import PageHeaderLayout from '@/layouts/PageHeaderLayout';
 
 import styles from './Workplace.less';
 

src/models/activities.js → src/pages/Dashboard/models/activities.js

@@ -1,4 +1,4 @@
-import { queryActivities } from '../services/api';
+import { queryActivities } from '@/services/api';
 
 export default {
   namespace: 'activities',

src/models/chart.js → src/pages/Dashboard/models/chart.js

@@ -1,4 +1,4 @@
-import { fakeChartData } from '../services/api';
+import { fakeChartData } from '@/services/api';
 
 export default {
   namespace: 'chart',

src/models/monitor.js → src/pages/Dashboard/models/monitor.js

@@ -1,4 +1,4 @@
-import { queryTags } from '../services/api';
+import { queryTags } from '@/services/api';
 
 export default {
   namespace: 'monitor',

src/services/error.js → src/pages/Exception/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}`);

src/models/form.js → src/pages/Forms/models/form.js

@@ -1,6 +1,6 @@
 import { routerRedux } from 'dva/router';
 import { message } from 'antd';
-import { fakeSubmitForm } from '../services/api';
+import { fakeSubmitForm } from '@/services/api';
 
 export default {
   namespace: 'form',

src/models/rule.js → src/pages/List/models/rule.js

@@ -1,4 +1,4 @@
-import { queryRule, removeRule, addRule, updateRule } from '../services/api';
+import { queryRule, removeRule, addRule, updateRule } from '@/services/api';
 
 export default {
   namespace: 'rule',

src/models/profile.js → src/pages/Profile/models/profile.js

@@ -1,4 +1,4 @@
-import { queryBasicProfile, queryAdvancedProfile } from '../services/api';
+import { queryBasicProfile, queryAdvancedProfile } from '@/services/api';
 
 export default {
   namespace: 'profile',

src/pages/Result/Error.js

@@ -1,8 +1,8 @@
 import React, { Fragment } from 'react';
 import { formatMessage, FormattedMessage } from 'umi/locale';
 import { Button, Icon, Card } from 'antd';
-import Result from 'components/Result';
+import Result from '@/components/Result';
-import PageHeaderLayout from '../../layouts/PageHeaderLayout';
+import PageHeaderLayout from '@/layouts/PageHeaderLayout';
 
 const extra = (
   <Fragment>

src/pages/Result/Success.js

@@ -2,7 +2,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 PageHeaderLayout from '../../layouts/PageHeaderLayout';
+import PageHeaderLayout from '@/layouts/PageHeaderLayout';
 
 const { Step } = Steps;
 

src/models/login.js → src/pages/User/models/login.js

@@ -1,9 +1,9 @@
 import { routerRedux } from 'dva/router';
 import { stringify } from 'qs';
-import { fakeAccountLogin, getFakeCaptcha } from '../services/api';
+import { fakeAccountLogin, getFakeCaptcha } from '@/services/api';
-import { setAuthority } from '../utils/authority';
+import { setAuthority } from '@/utils/authority';
-import { getPageQuery } from '../utils/utils';
+import { getPageQuery } from '@/utils/utils';
-import { reloadAuthorized } from '../utils/Authorized';
+import { reloadAuthorized } from '@/utils/Authorized';
 
 export default {
   namespace: 'login',

src/models/register.js → src/pages/User/models/register.js

@@ -1,6 +1,6 @@
-import { fakeRegister } from '../services/api';
+import { fakeRegister } from '@/services/api';
-import { setAuthority } from '../utils/authority';
+import { setAuthority } from '@/utils/authority';
-import { reloadAuthorized } from '../utils/Authorized';
+import { reloadAuthorized } from '@/utils/Authorized';
 
 export default {
   namespace: 'register',