fix ci errot

017a406d · qixian.cs@outlook.com · 22785c32 · 017a406d · 017a406d
Commit 017a406d authored Jun 07, 2018 by qixian.cs@outlook.com
Show whitespace changes
Inline Side-by-side

Showing with 11 additions and 10 deletions

src/components/SettingDarwer/index.js src/components/SettingDarwer/index.js +2 -1

src/routes/Account/Settings/Info.js src/routes/Account/Settings/Info.js +9 -9

No files found.
--- a/src/components/SettingDarwer/index.js
+++ b/src/components/SettingDarwer/index.js
@@ -137,6 +137,7 @@ class SettingDarwer extends PureComponent {
          parent={null}
          level={null}
          open={collapse}
+          mask={false}
          onHandleClick={this.togglerContent}
          handleChild={
            !collapse ? (
@@ -211,7 +212,7 @@ class SettingDarwer extends PureComponent {
            <Divider />
-            <Body title="导航设置 ">
+            <Body title="其他设置 ">
              <List.Item
                actions={[
                  <Select

--- a/src/routes/Account/Settings/Info.js
+++ b/src/routes/Account/Settings/Info.js
@@ -19,15 +19,6 @@ const menuMap = {
  currentUser: user.currentUser,
 }))
 export default class Info extends Component {
-  static getDerivedStateFromProps(props, state) {
-    const { match, location } = props;
-    let selectKey = location.pathname.replace(`${match.path}/`, '');
-    selectKey = menuMap[selectKey] ? selectKey : 'base';
-    if (selectKey !== state.selectKey) {
-      return { selectKey };
-    }
-    return null;
-  }
  constructor(props) {
    super(props);
    const { match, location } = props;
@@ -38,6 +29,15 @@ export default class Info extends Component {
      mode: 'inline',
    };
  }
+  static getDerivedStateFromProps(props, state) {
+    const { match, location } = props;
+    let selectKey = location.pathname.replace(`${match.path}/`, '');
+    selectKey = menuMap[selectKey] ? selectKey : 'base';
+    if (selectKey !== state.selectKey) {
+      return { selectKey };
+    }
+    return null;
+  }
  componentDidMount() {
    window.addEventListener('resize', this.resize);
    this.resize();