From 9b3a2e6d5167593005fd1366fa08407c248f62a4 Mon Sep 17 00:00:00 2001
From: "gaoxiaolin.gao" <gaoxiaolin.gao@qunar.com>
Date: Tue, 30 Jan 2018 11:45:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=88=AA=E6=96=AD=E8=BF=87=E9=95=BF?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                           |  2 ++
 client/components/Header/Header.js                     |  2 --
 .../Project/Interface/InterfaceList/Edit.scss          |  2 ++
 .../Project/Interface/InterfaceList/InterfaceList.js   | 10 ++--------
 exts/yapi-plugin-statistics/controller.js              |  6 +-----
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fd257f4..a0fdac0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 * 数据导入同步，数据导入支持swagger 3.0
 * swagger 数据导入支持 2xx 的httpcode
+* 新增系统信息页面
 
 #### Bug Fixed
 
@@ -15,6 +16,7 @@
 * 修复mongodb帐号密码配置错误时引发的错误
 * 修复删除分组后侧边数据没哟更新问题
 
+
 ### v1.3.4
 
 #### Feature
diff --git a/client/components/Header/Header.js b/client/components/Header/Header.js
index 1efb6dd7..800c8cb4 100755
--- a/client/components/Header/Header.js
+++ b/client/components/Header/Header.js
@@ -45,8 +45,6 @@ const MenuUser = (props) => (
             item.name === '个人中心' ? <Link to={item.path + `/${props.uid}`}>
               <Icon type={item.icon} />
               {item.name}
-            </Link> : !item.adminFlag ? <Link to={item.path}><Icon type={item.icon} />
-              {item.name}
             </Link> : <Link to={item.path}><Icon type={item.icon} />
               {item.name}
             </Link>
diff --git a/client/containers/Project/Interface/InterfaceList/Edit.scss b/client/containers/Project/Interface/InterfaceList/Edit.scss
index 644f0af8..947b5bf9 100755
--- a/client/containers/Project/Interface/InterfaceList/Edit.scss
+++ b/client/containers/Project/Interface/InterfaceList/Edit.scss
@@ -63,9 +63,11 @@
   }
   .path {
     width: 100%;
+    display: inline-block;
     overflow: hidden;
     text-overflow:ellipsis;
     white-space: nowrap;
+    padding-right: 24px;
   }
   .colValue{
     display: inline-block;
diff --git a/client/containers/Project/Interface/InterfaceList/InterfaceList.js b/client/containers/Project/Interface/InterfaceList/InterfaceList.js
index 983bfb0d..61007856 100755
--- a/client/containers/Project/Interface/InterfaceList/InterfaceList.js
+++ b/client/containers/Project/Interface/InterfaceList/InterfaceList.js
@@ -50,13 +50,7 @@ class InterfaceList extends Component {
       this.setState({
         catid: null
       })
-      // let r = await axios.get('/api/interface/list?project_id=' + projectId);
-      // if (r.data.errcode) {
-      //   throw new Error(r.data.errmsg);
-      // }
-      // this.setState({
-      //   data: r.data.data
-      // })
+      
       let r = await this.props.fetchInterfaceList(projectId);
       this.setState({
         data: r.payload.data.data
@@ -166,7 +160,7 @@ class InterfaceList extends Component {
       title: '接口分类',
       dataIndex: 'catid',
       key: 'catid',
-      width: 12,
+      width: 18,
       render: (item, record) => {
         return <Select value={item + ''} className="select" onChange={(catid) => this.changeInterfaceCat(record._id, catid)}>
           {this.props.catList.map(cat => {
diff --git a/exts/yapi-plugin-statistics/controller.js b/exts/yapi-plugin-statistics/controller.js
index 9285c9ba..57c1808a 100644
--- a/exts/yapi-plugin-statistics/controller.js
+++ b/exts/yapi-plugin-statistics/controller.js
@@ -74,9 +74,7 @@ class statisMockController extends baseController {
     if (yapi.WEBCONFIG.mail && yapi.WEBCONFIG.mail.enable) {
       mail = await this.checkEmail();
       // return ctx.body = yapi.commons.resReturn(result);
-
     } else {
-      console.log(3)
       mail = '未配置'
     }
 
@@ -91,8 +89,6 @@ class statisMockController extends baseController {
       freemem,
       uptime
     }
-
-
     return ctx.body = yapi.commons.resReturn(data);
 
   }
@@ -104,7 +100,7 @@ class statisMockController extends baseController {
       yapi.mail.verify((error) => {
         if (error) {
           result = '不可用';
-          reject(result)
+          resolve(result)
         } else {
           result = '可用';
           resolve(result)