diff --git a/package.json b/package.json index d6fd19cea7bbe65314930daade8196142e880523..63c93b998956f118cb38bd93aa79ad94d749ba5e 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,8 @@ "react-dom": "^16.7.0", "react-fittext": "^1.0.0", "react-media": "^1.9.2", - "umi": "^2.4.4" + "umi": "^2.4.4", + "umi-plugin-react": "^1.7.2" }, "devDependencies": { "@types/history": "^4.7.2", @@ -101,8 +102,7 @@ "tslint": "^5.12.1", "tslint-config-prettier": "^1.17.0", "tslint-react": "^3.6.0", - "umi-plugin-ga": "^1.1.3", - "umi-plugin-react": "^1.7.2" + "umi-plugin-ga": "^1.1.3" }, "optionalDependencies": { "puppeteer": "^1.12.1" diff --git a/src/components/Charts/MiniProgress/index.js b/src/components/Charts/MiniProgress/index.js index 6e9840f9eb2f8585d9dce8cec5b22f1bae4ac8bc..dd5712e8a850c8acbd41d959d73f17a96ecb65eb 100644 --- a/src/components/Charts/MiniProgress/index.js +++ b/src/components/Charts/MiniProgress/index.js @@ -1,6 +1,5 @@ import React from 'react'; import { Tooltip } from 'antd'; - import styles from './index.less'; const MiniProgress = ({ diff --git a/src/components/GlobalHeader/RightContent.js b/src/components/GlobalHeader/RightContent.js index 3b07c3e6ba421f4f842901f97b715f6dd6f825fc..d40e1166c670af5955030dff1278d2747aa2e655 100644 --- a/src/components/GlobalHeader/RightContent.js +++ b/src/components/GlobalHeader/RightContent.js @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { FormattedMessage, formatMessage } from 'umi/locale'; +import { FormattedMessage, formatMessage } from 'umi-plugin-react/locale'; import { Spin, Tag, Menu, Icon, Avatar, Tooltip, message } from 'antd'; import moment from 'moment'; import groupBy from 'lodash/groupBy'; diff --git a/src/components/PageHeaderWrapper/index.js b/src/components/PageHeaderWrapper/index.js index cd745f66e8db1182493560238cc60762235dad09..a305e1a05d54982f3ed28593d5985d33d8c295ac 100644 --- a/src/components/PageHeaderWrapper/index.js +++ b/src/components/PageHeaderWrapper/index.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FormattedMessage } from 'umi/locale'; +import { FormattedMessage } from 'umi-plugin-react/locale'; import Link from 'umi/link'; import PageHeader from '@/components/PageHeader'; import { connect } from 'dva'; diff --git a/src/components/SelectLang/index.js b/src/components/SelectLang/index.js index f6abe2f279ef9c8c34463406f0c2a94503e6650d..3ce3fb8d3634b21f8471135e0a5da1db9c63d9d0 100644 --- a/src/components/SelectLang/index.js +++ b/src/components/SelectLang/index.js @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { formatMessage, setLocale, getLocale } from 'umi/locale'; +import { formatMessage, setLocale, getLocale } from 'umi-plugin-react/locale'; import { Menu, Icon } from 'antd'; import classNames from 'classnames'; import HeaderDropdown from '../HeaderDropdown'; diff --git a/src/components/SettingDrawer/ThemeColor.js b/src/components/SettingDrawer/ThemeColor.js index e5d66d4be5cb29a2684eff46734e06fba17d6923..9765b737e44a3a8168f5561306cdca56fc9c5e88 100644 --- a/src/components/SettingDrawer/ThemeColor.js +++ b/src/components/SettingDrawer/ThemeColor.js @@ -1,6 +1,6 @@ import React from 'react'; import { Tooltip, Icon } from 'antd'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import styles from './ThemeColor.less'; const Tag = ({ color, check, ...rest }) => ( diff --git a/src/components/SettingDrawer/index.js b/src/components/SettingDrawer/index.js index 1a9be4f4f8a5cfece8dddbc315001a17749f24f2..dcf341a0212ff943c7bafd7654f37b1cfbfa7470 100644 --- a/src/components/SettingDrawer/index.js +++ b/src/components/SettingDrawer/index.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { Select, message, Drawer, List, Switch, Divider, Icon, Button, Alert, Tooltip } from 'antd'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import { CopyToClipboard } from 'react-copy-to-clipboard'; import { connect } from 'dva'; import omit from 'omit.js'; diff --git a/src/global.js b/src/global.js index bebe4829c63d4f4a47f4aa7bf649f23e2deef90d..a0ecf97a027f3c687d6856e67d80817a002c94e7 100644 --- a/src/global.js +++ b/src/global.js @@ -1,6 +1,6 @@ import React from 'react'; import { notification, Button, message } from 'antd'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import defaultSettings from './defaultSettings'; window.React = React; diff --git a/src/layouts/Header.js b/src/layouts/Header.js index 9d4f7c54abe75f2599d6bd8f5acf668b46fbe849..d6931fbbb2d30b46a96f094612d87a94268e73e3 100644 --- a/src/layouts/Header.js +++ b/src/layouts/Header.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import { Layout, message } from 'antd'; import Animate from 'rc-animate'; import { connect } from 'dva'; diff --git a/src/layouts/UserLayout.js b/src/layouts/UserLayout.js index 18fb176e26e9af4b08b34e52d23e69c03b19688a..93f826b30cfb187edd27a8d9a88a345da3f30c88 100644 --- a/src/layouts/UserLayout.js +++ b/src/layouts/UserLayout.js @@ -1,5 +1,5 @@ import React, { Component, Fragment } from 'react'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import { connect } from 'dva'; import Link from 'umi/link'; import { Icon } from 'antd'; diff --git a/src/models/menu.js b/src/models/menu.js index c49f8e201d041634cbff2316ace87b72353dd03b..3d98f2d846434bc3da4a1b220a9f60f3643edbc7 100644 --- a/src/models/menu.js +++ b/src/models/menu.js @@ -1,6 +1,6 @@ import memoizeOne from 'memoize-one'; import isEqual from 'lodash/isEqual'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import Authorized from '@/utils/Authorized'; import { menu } from '../defaultSettings'; diff --git a/src/pages/404.js b/src/pages/404.js index 34921c02b789dff7b692f12d6b1ceb9a562ce372..ada3484e5edfe618f8b88bc900d9e42b9a4b7ac3 100644 --- a/src/pages/404.js +++ b/src/pages/404.js @@ -1,6 +1,6 @@ import React from 'react'; import Link from 'umi/link'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import Exception from '@/components/Exception'; export default () => ( diff --git a/src/pages/Account/Settings/BaseView.js b/src/pages/Account/Settings/BaseView.js index f2f2b3a925be290f24c016a6a08230b0fbffde5c..040bd7b5c4b9b3ea3b005b076e8e5f317abe50dc 100644 --- a/src/pages/Account/Settings/BaseView.js +++ b/src/pages/Account/Settings/BaseView.js @@ -1,5 +1,5 @@ import React, { Component, Fragment } from 'react'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import { Form, Input, Upload, Select, Button } from 'antd'; import { connect } from 'dva'; import styles from './BaseView.less'; diff --git a/src/pages/Account/Settings/BindingView.js b/src/pages/Account/Settings/BindingView.js index 29a29890ca0d5ab339f872f1fe614ff9b0122ea4..f2908874d27f578399a8e805a22ae7f23b8f8a40 100644 --- a/src/pages/Account/Settings/BindingView.js +++ b/src/pages/Account/Settings/BindingView.js @@ -1,5 +1,5 @@ import React, { Component, Fragment } from 'react'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import { Icon, List } from 'antd'; class BindingView extends Component { diff --git a/src/pages/Account/Settings/Info.js b/src/pages/Account/Settings/Info.js index ceee506b8bc5c5569d838f95f1d9cb051dbd2f26..c5d4ef762f6e02e531376df889457288a614e78a 100644 --- a/src/pages/Account/Settings/Info.js +++ b/src/pages/Account/Settings/Info.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { connect } from 'dva'; import router from 'umi/router'; -import { FormattedMessage } from 'umi/locale'; +import { FormattedMessage } from 'umi-plugin-react/locale'; import { Menu } from 'antd'; import GridContent from '@/components/PageHeaderWrapper/GridContent'; import styles from './Info.less'; diff --git a/src/pages/Account/Settings/NotificationView.js b/src/pages/Account/Settings/NotificationView.js index 96677bbd269501cb9e901ea0f30b58ed2e51d774..00175ccfd3422dba4a3b1dcdd0f25bfc3c2208ff 100644 --- a/src/pages/Account/Settings/NotificationView.js +++ b/src/pages/Account/Settings/NotificationView.js @@ -1,5 +1,5 @@ import React, { Component, Fragment } from 'react'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import { Switch, List } from 'antd'; class NotificationView extends Component { diff --git a/src/pages/Account/Settings/SecurityView.js b/src/pages/Account/Settings/SecurityView.js index 0706bd0b9b2988bb41bcc2a3fe9ab20f65f6bf16..96dbf32c0effb88eda517576c7c34dfb911e97de 100644 --- a/src/pages/Account/Settings/SecurityView.js +++ b/src/pages/Account/Settings/SecurityView.js @@ -1,5 +1,5 @@ import React, { Component, Fragment } from 'react'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import { List } from 'antd'; // import { getTimeDistance } from '@/utils/utils'; diff --git a/src/pages/Dashboard/IntroduceRow.js b/src/pages/Dashboard/IntroduceRow.js index e33a4001ce94e8030fbfa405ca2d590d2d895fa8..f7e67df075fb258af3050950543dcb1313a29f49 100644 --- a/src/pages/Dashboard/IntroduceRow.js +++ b/src/pages/Dashboard/IntroduceRow.js @@ -1,6 +1,6 @@ import React, { memo } from 'react'; import { Row, Col, Icon, Tooltip } from 'antd'; -import { FormattedMessage, formatMessage } from 'umi/locale'; +import { FormattedMessage, formatMessage } from 'umi-plugin-react/locale'; import styles from './Analysis.less'; import { ChartCard, MiniArea, MiniBar, MiniProgress, Field } from '@/components/Charts'; import Trend from '@/components/Trend'; diff --git a/src/pages/Dashboard/Monitor.js b/src/pages/Dashboard/Monitor.js index a2d812aba193a0a10393ead604b1008a6cb36801..de8035342bad5cdc69cef8d57d1532835b6ae5bc 100644 --- a/src/pages/Dashboard/Monitor.js +++ b/src/pages/Dashboard/Monitor.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { connect } from 'dva'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import { Row, Col, Card, Tooltip } from 'antd'; import { Pie, WaterWave, Gauge, TagCloud } from '@/components/Charts'; import NumberInfo from '@/components/NumberInfo'; diff --git a/src/pages/Dashboard/OfflineData.js b/src/pages/Dashboard/OfflineData.js index f7d06ef07b8f10f93a86320b3b17d081816a462f..71791313d29451dcfaf017738f37cdadbe330730 100644 --- a/src/pages/Dashboard/OfflineData.js +++ b/src/pages/Dashboard/OfflineData.js @@ -1,6 +1,6 @@ import React, { memo } from 'react'; import { Card, Tabs, Row, Col } from 'antd'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import styles from './Analysis.less'; import { TimelineChart, Pie } from '@/components/Charts'; import NumberInfo from '@/components/NumberInfo'; diff --git a/src/pages/Dashboard/ProportionSales.js b/src/pages/Dashboard/ProportionSales.js index ff16a7d231751d8311b76078df1f182dbfcce34d..39771300bdeb82f9f8549160ab06ca7952aeac9d 100644 --- a/src/pages/Dashboard/ProportionSales.js +++ b/src/pages/Dashboard/ProportionSales.js @@ -1,6 +1,6 @@ import React, { memo } from 'react'; import { Card, Radio } from 'antd'; -import { FormattedMessage } from 'umi/locale'; +import { FormattedMessage } from 'umi-plugin-react/locale'; import styles from './Analysis.less'; import { Pie } from '@/components/Charts'; import Yuan from '@/utils/Yuan'; diff --git a/src/pages/Dashboard/SalesCard.js b/src/pages/Dashboard/SalesCard.js index 3ab577757067c329a79028cbec08deb3dfc61787..ee6adf214ec3709646c478e7be28c39cab7b0f1b 100644 --- a/src/pages/Dashboard/SalesCard.js +++ b/src/pages/Dashboard/SalesCard.js @@ -1,6 +1,6 @@ import React, { memo } from 'react'; import { Row, Col, Card, Tabs, DatePicker } from 'antd'; -import { FormattedMessage, formatMessage } from 'umi/locale'; +import { FormattedMessage, formatMessage } from 'umi-plugin-react/locale'; import numeral from 'numeral'; import styles from './Analysis.less'; import { Bar } from '@/components/Charts'; diff --git a/src/pages/Dashboard/TopSearch.js b/src/pages/Dashboard/TopSearch.js index 4e75ea7d51ebba6a5d52e336c24d318f8e5d5a41..bd893950d05e2817a2861e2baf17ea5a6af6c0c8 100644 --- a/src/pages/Dashboard/TopSearch.js +++ b/src/pages/Dashboard/TopSearch.js @@ -1,6 +1,6 @@ import React, { memo } from 'react'; import { Row, Col, Table, Tooltip, Card, Icon } from 'antd'; -import { FormattedMessage } from 'umi/locale'; +import { FormattedMessage } from 'umi-plugin-react/locale'; import Trend from '@/components/Trend'; import numeral from 'numeral'; import styles from './Analysis.less'; diff --git a/src/pages/Editor/GGEditor/Flow/index.js b/src/pages/Editor/GGEditor/Flow/index.js index 4dc19867d664434f125053874fd87f252df2a54a..97aaf6e3cc157d3915e9cfd70e582a0696b4f214 100644 --- a/src/pages/Editor/GGEditor/Flow/index.js +++ b/src/pages/Editor/GGEditor/Flow/index.js @@ -7,7 +7,7 @@ import { FlowToolbar } from '../components/EditorToolbar'; import { FlowItemPanel } from '../components/EditorItemPanel'; import { FlowDetailPanel } from '../components/EditorDetailPanel'; import styles from './index.less'; -import { FormattedMessage } from 'umi/locale'; +import { FormattedMessage } from 'umi-plugin-react/locale'; import PageHeaderWrapper from '@/components/PageHeaderWrapper'; GGEditor.setTrackable(false); diff --git a/src/pages/Editor/GGEditor/Koni/index.js b/src/pages/Editor/GGEditor/Koni/index.js index 35c4f3e1f22e065ca1f7f0e4e330b52cbc599ce5..2ae34ca1f7270798d6aab2b5cf1930ae793d6c8a 100644 --- a/src/pages/Editor/GGEditor/Koni/index.js +++ b/src/pages/Editor/GGEditor/Koni/index.js @@ -8,7 +8,7 @@ import { KoniItemPanel } from '../components/EditorItemPanel'; import { KoniDetailPanel } from '../components/EditorDetailPanel'; import KoniCustomNode from './shape/nodes/KoniCustomNode'; import styles from '../Flow/index.less'; -import { FormattedMessage } from 'umi/locale'; +import { FormattedMessage } from 'umi-plugin-react/locale'; import PageHeaderWrapper from '@/components/PageHeaderWrapper'; GGEditor.setTrackable(false); diff --git a/src/pages/Editor/GGEditor/Mind/index.js b/src/pages/Editor/GGEditor/Mind/index.js index afb2d6763508fb12b90923a71dab513ac82cfbd8..4e078f60f5416a8f3d588b3bcd0b51d19892f05c 100644 --- a/src/pages/Editor/GGEditor/Mind/index.js +++ b/src/pages/Editor/GGEditor/Mind/index.js @@ -7,7 +7,7 @@ import { MindToolbar } from '../components/EditorToolbar'; import { MindDetailPanel } from '../components/EditorDetailPanel'; import data from '../mock/worldCup2018.json'; import styles from '../Flow/index.less'; -import { FormattedMessage } from 'umi/locale'; +import { FormattedMessage } from 'umi-plugin-react/locale'; import PageHeaderWrapper from '@/components/PageHeaderWrapper'; GGEditor.setTrackable(false); diff --git a/src/pages/Exception/403.js b/src/pages/Exception/403.js index 35e4ca3a12f36701d7120cd2d840c44ebca1b5dc..e91f9c91d498c4e12ae739d5afc746beaaf3f3bf 100644 --- a/src/pages/Exception/403.js +++ b/src/pages/Exception/403.js @@ -1,5 +1,5 @@ import React from 'react'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import Link from 'umi/link'; import Exception from '@/components/Exception'; diff --git a/src/pages/Exception/404.js b/src/pages/Exception/404.js index 84c986c5e577a141ccc675ce49dd3b9b4399a519..f21b1f89dee571da356523e6cf2981d17874de22 100644 --- a/src/pages/Exception/404.js +++ b/src/pages/Exception/404.js @@ -1,5 +1,5 @@ import React from 'react'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import Link from 'umi/link'; import Exception from '@/components/Exception'; diff --git a/src/pages/Exception/500.js b/src/pages/Exception/500.js index 9d96f21203ef5466593a674b4b6da89bd6dde39f..904844cd1e74cfd07d6ad0f1063a9fa315b6b2a4 100644 --- a/src/pages/Exception/500.js +++ b/src/pages/Exception/500.js @@ -1,5 +1,5 @@ import React from 'react'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import Link from 'umi/link'; import Exception from '@/components/Exception'; diff --git a/src/pages/Forms/BasicForm.js b/src/pages/Forms/BasicForm.js index 55833150a1ed63d053e894968d35ac548c3129ae..dd86ebacc62b8ff3bd6f84af021623350ec427cb 100644 --- a/src/pages/Forms/BasicForm.js +++ b/src/pages/Forms/BasicForm.js @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { connect } from 'dva'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import { Form, Input, diff --git a/src/pages/List/Applications.js b/src/pages/List/Applications.js index e36012ddde3578696ee10fe4a45148f5a0421839..e8161898f0ec93077a1be42e6c5c50882ab7bed0 100644 --- a/src/pages/List/Applications.js +++ b/src/pages/List/Applications.js @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react'; import numeral from 'numeral'; import { connect } from 'dva'; -import { FormattedMessage } from 'umi/locale'; +import { FormattedMessage } from 'umi-plugin-react/locale'; import { Row, Col, Form, Card, Select, Icon, Avatar, List, Tooltip, Dropdown, Menu } from 'antd'; import TagSelect from '@/components/TagSelect'; import StandardFormRow from '@/components/StandardFormRow'; diff --git a/src/pages/List/Articles.js b/src/pages/List/Articles.js index 5ab311ba0835434d1cfb98d7c0e0fdc3f17430e0..6182d4972374806b5fb958256d360cfe82840194 100644 --- a/src/pages/List/Articles.js +++ b/src/pages/List/Articles.js @@ -1,7 +1,7 @@ import React, { Component, Fragment } from 'react'; import { connect } from 'dva'; import { Form, Card, Select, List, Tag, Icon, Row, Col, Button } from 'antd'; -import { FormattedMessage } from 'umi/locale'; +import { FormattedMessage } from 'umi-plugin-react/locale'; import TagSelect from '@/components/TagSelect'; import StandardFormRow from '@/components/StandardFormRow'; diff --git a/src/pages/List/Projects.js b/src/pages/List/Projects.js index 3f4a6e9d7a5fa7076912fd7987039cbc72b3079c..2ae82a88a17ebaf2144649eaaeccee6f6c33bdcb 100644 --- a/src/pages/List/Projects.js +++ b/src/pages/List/Projects.js @@ -2,7 +2,7 @@ import React, { PureComponent } from 'react'; import moment from 'moment'; import { connect } from 'dva'; import { Row, Col, Form, Card, Select, List } from 'antd'; -import { FormattedMessage } from 'umi/locale'; +import { FormattedMessage } from 'umi-plugin-react/locale'; import TagSelect from '@/components/TagSelect'; import AvatarList from '@/components/AvatarList'; diff --git a/src/pages/Result/Error.js b/src/pages/Result/Error.js index fba2da6d13c08785b0443c8760308b0aeebd2863..b8e528d54d690bf2c5ba81991efbc687812e20ed 100644 --- a/src/pages/Result/Error.js +++ b/src/pages/Result/Error.js @@ -1,5 +1,5 @@ import React, { Fragment } from 'react'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import { Button, Icon, Card } from 'antd'; import Result from '@/components/Result'; import PageHeaderWrapper from '@/components/PageHeaderWrapper'; diff --git a/src/pages/Result/Success.js b/src/pages/Result/Success.js index 74d19dc38c23dc39c73f107c6407cb577bbcb3e7..0b100806cef9b52cdd41c4a37a7e2006da1ea7b8 100644 --- a/src/pages/Result/Success.js +++ b/src/pages/Result/Success.js @@ -1,5 +1,5 @@ import React, { Fragment } from 'react'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import { Button, Row, Col, Icon, Steps, Card } from 'antd'; import Result from '@/components/Result'; import PageHeaderWrapper from '@/components/PageHeaderWrapper'; diff --git a/src/pages/User/Login.js b/src/pages/User/Login.js index 6ddece46d54cd48b46251539b34a3c3efb700959..e3498bd3e4fc9ceafae9f5e3af63a1b066ef681a 100644 --- a/src/pages/User/Login.js +++ b/src/pages/User/Login.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { connect } from 'dva'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import Link from 'umi/link'; import { Checkbox, Alert, Icon } from 'antd'; import Login from '@/components/Login'; diff --git a/src/pages/User/Register.js b/src/pages/User/Register.js index ea4565c28bac77692a0f520ef372b7f4b8e5dc0a..d685965f5f3da55b4a63fbce3ebc4c46a9bf0880 100644 --- a/src/pages/User/Register.js +++ b/src/pages/User/Register.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { connect } from 'dva'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import Link from 'umi/link'; import router from 'umi/router'; import { Form, Input, Button, Select, Row, Col, Popover, Progress } from 'antd'; diff --git a/src/pages/User/RegisterResult.js b/src/pages/User/RegisterResult.js index 6e338b277b917cd3d23c3b883f7c710ec306018c..d1bfe59ac12d0bd025e87aac30274fbd2951b608 100644 --- a/src/pages/User/RegisterResult.js +++ b/src/pages/User/RegisterResult.js @@ -1,5 +1,5 @@ import React from 'react'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import { Button } from 'antd'; import Link from 'umi/link'; import Result from '@/components/Result'; diff --git a/src/utils/getPageTitle.js b/src/utils/getPageTitle.js index 0dd1e6207858670ee08f256ff10e292717e6a078..30e2dce1d0c580db30cc6bd78a07d99c088e99d6 100644 --- a/src/utils/getPageTitle.js +++ b/src/utils/getPageTitle.js @@ -1,4 +1,4 @@ -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import pathToRegexp from 'path-to-regexp'; import isEqual from 'lodash/isEqual'; import memoizeOne from 'memoize-one';