From e37be7167cab71eb1636dc86cbcd7dade64f89ad Mon Sep 17 00:00:00 2001 From: silenceqi Date: Wed, 11 Mar 2020 07:56:05 +0800 Subject: [PATCH] front and back --- .gitignore | 1 + app/web/config/.config.js.swp | Bin 12288 -> 0 bytes app/web/config/config.js | 9 +- app/web/config/router.config.js | 239 +----------------- .../components/GlobalHeader/RightContent.js | 2 +- app/web/src/components/GlobalHeader/index.js | 2 +- app/web/src/components/SelectLang/index.js | 2 +- .../components/SettingDrawer/ThemeColor.js | 2 +- app/web/src/components/SettingDrawer/index.js | 2 +- app/web/src/components/SiderMenu/BaseMenu.js | 4 +- app/web/src/components/SiderMenu/SiderMenu.js | 4 +- app/web/src/components/TopNavHeader/index.js | 4 +- app/web/src/layouts/BasicLayout.js | 7 +- app/web/src/layouts/Footer.js | 6 +- app/web/src/layouts/Header.js | 10 +- app/web/src/layouts/UserLayout.js | 10 +- app/web/src/locales/zh-CN.js | 9 +- app/web/src/page/helloworld.js | 22 -- package.json | 8 +- 19 files changed, 62 insertions(+), 281 deletions(-) delete mode 100644 app/web/config/.config.js.swp delete mode 100644 app/web/src/page/helloworld.js diff --git a/.gitignore b/.gitignore index 5de05797..e017f9b8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ .umi dist +run # Logs logs diff --git a/app/web/config/.config.js.swp b/app/web/config/.config.js.swp deleted file mode 100644 index 7da9089417c9498c7af5aa0e540957233815a294..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2zi!kp9LHT|N)c5h#z2RYQ14uz6m%!CFfmY7NU$J4zMPYDo7l#&DFP0}8z3ZJ zfB_zZfhS;M<1tuR_$Kk?P6)LV1L$Yn_w4xh$3K6zD8KRc{o8kv>w_JJah9=9>+;c; zms>217^_qvbt<2z+IGwcyE~I(%$?~~myla$awkfz%|sql{K&XNu5_lf;)Tg`rSpC& zwU>?yYx$8J^VGnc$7yg-by;aa1c<>Y z5g-EpAOV3d_itAjJADSlo{r~G4dI6x1(0k|&V$ZM89%(0 ( diff --git a/app/web/src/components/SettingDrawer/index.js b/app/web/src/components/SettingDrawer/index.js index 4996e996..7d892fae 100644 --- a/app/web/src/components/SettingDrawer/index.js +++ b/app/web/src/components/SettingDrawer/index.js @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { Select, message, Drawer, List, Switch, Divider, Icon, Button, Alert, Tooltip } from 'antd'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi'; import { CopyToClipboard } from 'react-copy-to-clipboard'; import { connect } from 'dva'; import omit from 'omit.js'; diff --git a/app/web/src/components/SiderMenu/BaseMenu.js b/app/web/src/components/SiderMenu/BaseMenu.js index 76c21bc0..ecb469ba 100644 --- a/app/web/src/components/SiderMenu/BaseMenu.js +++ b/app/web/src/components/SiderMenu/BaseMenu.js @@ -1,9 +1,9 @@ import React, { PureComponent } from 'react'; import { Menu, Icon } from 'antd'; -import Link from 'umi/link'; +import {Link} from 'umi'; import isEqual from 'lodash/isEqual'; import memoizeOne from 'memoize-one'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi'; import pathToRegexp from 'path-to-regexp'; import { urlToList } from '../_utils/pathTools'; import styles from './index.less'; diff --git a/app/web/src/components/SiderMenu/SiderMenu.js b/app/web/src/components/SiderMenu/SiderMenu.js index 2d366b9b..d1c62fd0 100644 --- a/app/web/src/components/SiderMenu/SiderMenu.js +++ b/app/web/src/components/SiderMenu/SiderMenu.js @@ -2,7 +2,7 @@ import React, { PureComponent } from 'react'; import { Layout } from 'antd'; import pathToRegexp from 'path-to-regexp'; import classNames from 'classnames'; -import Link from 'umi/link'; +import {Link} from 'umi'; import styles from './index.less'; import BaseMenu, { getMenuMatches } from './BaseMenu'; import { urlToList } from '../_utils/pathTools'; @@ -110,7 +110,7 @@ export default class SiderMenu extends PureComponent {