From c59842ca1c25ce78bb197b55576a420b1c00dfdd Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Sat, 1 Sep 2018 22:37:30 +0800
Subject: [PATCH] make setting names easy to understand

---
 src/components/PageHeaderWrapper/GridContent.js |  2 +-
 src/components/PageHeaderWrapper/index.js       |  2 +-
 src/components/SettingDrawer/index.js           |  9 +++++----
 src/components/TopNavHeader/index.js            |  6 +++---
 src/defaultSettings.js                          | 15 +++++++--------
 src/locales/en-US.js                            |  6 +++---
 src/locales/zh-CN.js                            |  8 ++++----
 7 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/components/PageHeaderWrapper/GridContent.js b/src/components/PageHeaderWrapper/GridContent.js
index 68fa027f..5f16c5d0 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 <div className={className}>{children}</div>;
diff --git a/src/components/PageHeaderWrapper/index.js b/src/components/PageHeaderWrapper/index.js
index 1a833590..63082df7 100644
--- a/src/components/PageHeaderWrapper/index.js
+++ b/src/components/PageHeaderWrapper/index.js
@@ -13,7 +13,7 @@ const PageHeaderWrapper = ({ children, grid, wrapperClassName, top, ...restProps
     <MenuContext.Consumer>
       {value => (
         <PageHeader
-          wide={grid === 'Wide'}
+          wide={grid === 'Fixed'}
           home={<FormattedMessage id="menu.home" defaultMessage="Home" />}
           {...value}
           key="pageheader"
diff --git a/src/components/SettingDrawer/index.js b/src/components/SettingDrawer/index.js
index 8eabe552..cb359254 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 }}
           >
-            <Select.Option value="Wide">
-              {formatMessage({ id: 'app.setting.gridmode.wide' })}
+            <Select.Option value="Fixed">
+              {formatMessage({ id: 'app.setting.gridmode.fixed' })}
             </Select.Option>
             <Select.Option value="Fluid">
               {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 {
           </Body>
           <Divider />
           <CopyToClipboard
-            text={JSON.stringify(setting)}
+            text={JSON.stringify(omit(setting, ['colorWeak']), null, 2)}
             onCopy={() => message.success(formatMessage({ id: 'app.setting.copyinfo' }))}
           >
             <Button block icon="copy">
diff --git a/src/components/TopNavHeader/index.js b/src/components/TopNavHeader/index.js
index cbe1faa9..347208c9 100644
--- a/src/components/TopNavHeader/index.js
+++ b/src/components/TopNavHeader/index.js
@@ -9,13 +9,13 @@ export default class TopNavHeader extends PureComponent {
     super(props);
 
     this.state = {
-      maxWidth: (props.grid === 'Wide' ? 1200 : window.innerWidth) - 324 - 165 - 4,
+      maxWidth: (props.grid === 'Fixed' ? 1200 : window.innerWidth) - 324 - 165 - 4,
     };
   }
 
   static getDerivedStateFromProps(props) {
     return {
-      maxWidth: (props.grid === 'Wide' ? 1200 : window.innerWidth) - 324 - 165 - 4,
+      maxWidth: (props.grid === 'Fixed' ? 1200 : window.innerWidth) - 324 - 165 - 4,
     };
   }
 
@@ -28,7 +28,7 @@ export default class TopNavHeader extends PureComponent {
           ref={ref => {
             this.maim = ref;
           }}
-          className={`${styles.main} ${grid === 'Wide' ? styles.wide : ''}`}
+          className={`${styles.main} ${grid === 'Fixed' ? styles.wide : ''}`}
         >
           <div className={styles.left}>
             <div className={styles.logo} key="logo" id="logo">
diff --git a/src/defaultSettings.js b/src/defaultSettings.js
index 68141b24..c254c74e 100644
--- a/src/defaultSettings.js
+++ b/src/defaultSettings.js
@@ -1,10 +1,9 @@
 module.exports = {
-  navTheme: 'dark',
-  primaryColor: '#1890FF',
-  layout: 'sidemenu',
-  grid: 'Fluid',
-  fixedHeader: false,
-  autoHideHeader: false,
-  fixSiderbar: false,
-  colorWeak: false,
+  navTheme: 'dark', // theme for nav menu
+  primaryColor: '#1890FF', // primary color of ant design
+  layout: 'sidemenu', // nav menu position: sidemenu or topmenu
+  contentWidth: 'Fluid', // layout of content: Fluid or Fixed, only works when layout is topmenu
+  fixedHeader: false, // sticky header
+  autoHideHeader: false, // auto hide header
+  fixSiderbar: false, // sticky siderbar
 };
diff --git a/src/locales/en-US.js b/src/locales/en-US.js
index af8273c6..9f52eee7 100644
--- a/src/locales/en-US.js
+++ b/src/locales/en-US.js
@@ -156,9 +156,9 @@ export default {
   'app.result.success.btn-project': 'View project',
   'app.result.success.btn-print': 'Print',
   'app.setting.pagestyle': 'Page style setting',
-  'app.setting.gridmode': 'Grid Mode',
-  'app.setting.gridmode.wide': 'Wide',
-  'app.setting.gridmode.fluid': 'Fluid',
+  'app.setting.content-width': 'Content Width',
+  'app.setting.content-width.fixed': 'Fixed',
+  'app.setting.content-width.fluid': 'Fluid',
   'app.setting.themecolor': 'Theme Color',
   'app.setting.navigationmode': 'Navigation Mode',
   'app.setting.fixedheader': 'Fixed Header',
diff --git a/src/locales/zh-CN.js b/src/locales/zh-CN.js
index 6b6ec550..b1f775b6 100644
--- a/src/locales/zh-CN.js
+++ b/src/locales/zh-CN.js
@@ -151,10 +151,10 @@ export default {
   'app.result.success.btn-return': '返回列表',
   'app.result.success.btn-project': '查看项目',
   'app.result.success.btn-print': '打印',
-  'app.setting.pagestyle': '整理风格设置',
-  'app.setting.gridmode': '栅格模式',
-  'app.setting.gridmode.wide': '定宽',
-  'app.setting.gridmode.fluid': '流式',
+  'app.setting.pagestyle': '整体风格设置',
+  'app.setting.content-width': '内容区域宽度',
+  'app.setting.content-width.fixed': '定宽',
+  'app.setting.content-width.fluid': '流式',
   'app.setting.themecolor': '主题色',
   'app.setting.navigationmode': '导航模式',
   'app.setting.fixedheader': '固定 Header',
-- 
GitLab