From 017a406dbb717d58753c5ec19d1d40d63fce21f5 Mon Sep 17 00:00:00 2001
From: "qixian.cs@outlook.com" <wasd2144@hotmail.com>
Date: Thu, 7 Jun 2018 17:53:57 +0800
Subject: [PATCH] fix ci errot

---
 src/components/SettingDarwer/index.js |  3 ++-
 src/routes/Account/Settings/Info.js   | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/components/SettingDarwer/index.js b/src/components/SettingDarwer/index.js
index cf113471..9988ae55 100644
--- 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
diff --git a/src/routes/Account/Settings/Info.js b/src/routes/Account/Settings/Info.js
index 7c104fac..fca86dae 100644
--- 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();
-- 
GitLab

