From 3ee8cc356f5c57e4446eb9aee861da6d77c07461 Mon Sep 17 00:00:00 2001
From: zwjamnsss <zwjamnsss@gmail.com>
Date: Wed, 26 Jul 2017 10:26:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A1=B9=E7=9B=AE=E7=AE=80=E4=BB=8B?=
 =?UTF-8?q?=E5=A4=9A=E8=A1=8C=E6=96=87=E6=9C=AC=E6=BA=A2=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/actions/addInterface.js                      | 11 ++++++++++-
 .../AddInterface/InterfaceTest/InterfaceTest.js     |  1 +
 .../containers/ProjectGroups/GroupList/GroupList.js |  4 ++--
 .../ProjectGroups/GroupList/GroupList.scss          | 13 +++++++++++++
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/client/actions/addInterface.js b/client/actions/addInterface.js
index 4675fb63..7437eb20 100644
--- a/client/actions/addInterface.js
+++ b/client/actions/addInterface.js
@@ -7,8 +7,10 @@ import {
   GET_INTERFACE_REQ_PARAMS,
   GET_INTERFACE_RES_PARAMS,
   PUSH_INTERFACE_NAME,
-  PUSH_INTERFACE_METHOD
+  PUSH_INTERFACE_METHOD,
+  FETCH_INTERFACE_PROJECT
 } from '../constants/action-types.js'
+import axios from 'axios'
 
 export function pushInputValue (value) {
   return {
@@ -72,3 +74,10 @@ export function pushInterfaceMethod (value) {
     payload: value
   }
 }
+
+export function fetchInterfaceProject(id) {
+  return {
+    type: FETCH_INTERFACE_PROJECT,
+    payload: axios.get('/project/get', { params: {id}})
+  }
+}
diff --git a/client/containers/AddInterface/InterfaceTest/InterfaceTest.js b/client/containers/AddInterface/InterfaceTest/InterfaceTest.js
index 9fd40912..728d6279 100644
--- a/client/containers/AddInterface/InterfaceTest/InterfaceTest.js
+++ b/client/containers/AddInterface/InterfaceTest/InterfaceTest.js
@@ -111,6 +111,7 @@ export default class InterfaceTest extends Component {
         </div>
         <Button onClick={this.testInterface}>发送跨域请求</Button>
         <div>
+          返回结果：
           {JSON.stringify(this.state.res, 2)}
         </div>
       </div>
diff --git a/client/containers/ProjectGroups/GroupList/GroupList.js b/client/containers/ProjectGroups/GroupList/GroupList.js
index 1cb57ebe..828091e0 100644
--- a/client/containers/ProjectGroups/GroupList/GroupList.js
+++ b/client/containers/ProjectGroups/GroupList/GroupList.js
@@ -203,11 +203,11 @@ export default class GroupList extends Component {
         <div className="group-bar">
           <div className="curr-group">
             <div className="curr-group-name">
-              {currGroup.group_name}
+              <div className="text" title={currGroup.group_name}>{currGroup.group_name}</div>
               <Icon className="edit-group" type="edit" title="编辑分组" onClick={() => this.showModal(TYPE_EDIT)}/>
               <Icon className="delete-group" type="delete" title="删除分组" onClick={this.deleteGroup}/>
             </div>
-            <div className="curr-group-desc">简介：{currGroup.group_desc}</div>
+            <div className="curr-group-desc" title={currGroup.group_desc}>简介：{currGroup.group_desc}</div>
           </div>
           <div className="group-operate">
             <div className="search">
diff --git a/client/containers/ProjectGroups/GroupList/GroupList.scss b/client/containers/ProjectGroups/GroupList/GroupList.scss
index c6cb57fc..47ab3822 100644
--- a/client/containers/ProjectGroups/GroupList/GroupList.scss
+++ b/client/containers/ProjectGroups/GroupList/GroupList.scss
@@ -5,12 +5,25 @@
     border-radius: 4px 4px 0 0;
     padding: 32px 24px;
     .curr-group-name {
+      .text {
+        display: inline-block;
+        overflow:hidden;
+        white-space:nowrap;
+        text-overflow:ellipsis;
+        max-width: 150px;
+      }
       color: #fff;
       font-size: 24px;
     }
     .curr-group-desc {
       color: #fff;
       font-size: 12px;
+      max-height: 54px;
+      text-overflow:ellipsis;
+      overflow:hidden;
+      -webkit-line-clamp: 3;
+      -webkit-box-orient: vertical;
+      display: -webkit-box;
     }
     .delete-group, .edit-group {
       font-size: 18px;