diff --git a/src/components/PageHeaderWrapper/GridContent.js b/src/components/PageHeaderWrapper/GridContent.js index 68fa027f0d8d883d45a2e7e075700e951831782f..5f16c5d00f81f76705ccfab74d8a532d4aa39f42 100644 --- a/src/components/PageHeaderWrapper/GridContent.js +++ b/src/components/PageHeaderWrapper/GridContent.js @@ -6,7 +6,7 @@ class GridContent extends PureComponent { render() { const { grid, children } = this.props; let className = `${styles.main}`; - if (grid === 'Wide') { + if (grid === 'Fixed') { className = `${styles.main} ${styles.wide}`; } return
{children}
; diff --git a/src/components/PageHeaderWrapper/index.js b/src/components/PageHeaderWrapper/index.js index 1a8335904868c1d0ec86cfccb3e6c49c38a6d14a..63082df74b03af2d6a1e3a0cc06d38e186cba774 100644 --- a/src/components/PageHeaderWrapper/index.js +++ b/src/components/PageHeaderWrapper/index.js @@ -13,7 +13,7 @@ const PageHeaderWrapper = ({ children, grid, wrapperClassName, top, ...restProps {value => ( } {...value} key="pageheader" diff --git a/src/components/SettingDrawer/index.js b/src/components/SettingDrawer/index.js index 8eabe5528a4f729b9ce44de38fbb3c5755509d5b..cb3592543c53ea3a37e23a82cdace7ce71a8810e 100644 --- a/src/components/SettingDrawer/index.js +++ b/src/components/SettingDrawer/index.js @@ -3,6 +3,7 @@ import { Select, message, Drawer, List, Switch, Divider, Icon, Button, Alert } f import { formatMessage } from 'umi/locale'; import { CopyToClipboard } from 'react-copy-to-clipboard'; import { connect } from 'dva'; +import omit from 'omit.js'; import styles from './index.less'; import ThemeColor from './ThemeColor'; import BlockChecbox from './BlockChecbox'; @@ -39,8 +40,8 @@ class SettingDrawer extends PureComponent { onSelect={value => this.changeSetting('grid', value)} style={{ width: 80 }} > - - {formatMessage({ id: 'app.setting.gridmode.wide' })} + + {formatMessage({ id: 'app.setting.gridmode.fixed' })} {formatMessage({ id: 'app.setting.gridmode.fluid' })} @@ -88,7 +89,7 @@ class SettingDrawer extends PureComponent { const nextState = { ...setting }; nextState[key] = value; if (key === 'layout') { - nextState.grid = value === 'topmenu' ? 'Wide' : 'Fluid'; + nextState.grid = value === 'topmenu' ? 'Fixed' : 'Fluid'; } else if (key === 'fixedHeader' && !value) { nextState.autoHideHeader = false; } @@ -198,7 +199,7 @@ class SettingDrawer extends PureComponent { message.success(formatMessage({ id: 'app.setting.copyinfo' }))} >