diff --git a/package.json b/package.json index 601d572363d13957ddb04c43b61ae8423679e2e5..fdc790f2808b958289e3c6b877baac0f6e93e9e8 100755 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "@babel/polyfill": "^7.0.0-beta.53", "@types/react": "^16.4.11", "@types/react-dom": "^16.0.6", - "antd-pro-merge-less": "^0.0.6", + "antd-pro-merge-less": "^0.0.9", "antd-theme-webpack-plugin": "^1.0.8", "babel-eslint": "^8.2.6", "babel-runtime": "^6.9.2", diff --git a/src/components/SettingDarwer/ThemeColor.js b/src/components/SettingDarwer/ThemeColor.js index 63bf4782f6b077303f6e54fdcc6cfee80fd47102..f70bd4f824a9d737ba721b1d19bf1625e6439a33 100644 --- a/src/components/SettingDarwer/ThemeColor.js +++ b/src/components/SettingDarwer/ThemeColor.js @@ -15,7 +15,7 @@ const Tag = ({ color, check, ...rest }) => { ); }; -const ThemeColor = ({ colors, value, onChange }) => { +const ThemeColor = ({ colors, title, value, onChange }) => { let colorList = colors; if (!colors) { colorList = [ @@ -31,7 +31,7 @@ const ThemeColor = ({ colors, value, onChange }) => { } return (
-

主题色

+

{title}

{colorList.map(color => { return ( diff --git a/src/components/SettingDarwer/index.js b/src/components/SettingDarwer/index.js index 074bce0c35cc8f046b8727a13f7f14bfc691941a..3a5802d3a42493aa63352d7c14d41b81806c48c5 100644 --- a/src/components/SettingDarwer/index.js +++ b/src/components/SettingDarwer/index.js @@ -1,5 +1,6 @@ import React, { PureComponent } from 'react'; import { Select, message, Drawer, List, Switch, Divider, Icon, Button } from 'antd'; +import { formatMessage } from 'umi/locale'; import { CopyToClipboard } from 'react-copy-to-clipboard'; import { connect } from 'dva'; import styles from './index.less'; @@ -26,7 +27,7 @@ class SettingDarwer extends PureComponent { } = this.props; return [ { - title: '栅格模式', + title: formatMessage({ id: 'app.setting.gridmode' }), action: [ , ], }, { - title: '固定 Header', + title: formatMessage({ id: 'app.setting.fixedheader' }), action: [
- + this.changeSetting('themeColor', color)} /> - + - + , ]} > - 色弱模式 + {formatMessage({ id: 'app.setting.weakmode' })} - message.success( - 'copy success，please replace defaultSetting in src/models/setting.js' - ) - } + onCopy={() => message.success(formatMessage({ id: 'app.setting.copyinfo' }))} >
diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js index 14299d2cc84e57d9756ab13039d10e3a1e1d0bda..c96e64d8f38905ca14b347aff472918f470e7172 100644 --- a/src/layouts/BasicLayout.js +++ b/src/layouts/BasicLayout.js @@ -179,7 +179,12 @@ class BasicLayout extends React.PureComponent { {...this.props} /> )} - +
{children}