From 14a53edeb3cbc66d3000763a5c4e46c977e3520b Mon Sep 17 00:00:00 2001
From: "wenbo.dong" <wenbo.dong@qunar.com>
Date: Wed, 20 Sep 2017 20:32:20 +0800
Subject: [PATCH 1/3] =?UTF-8?q?opti:=20=E6=8E=A5=E5=8F=A3=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=9B=BE=E6=A0=87=E6=8C=89=E9=92=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Project/Interface/InterfaceCol/InterfaceColMenu.scss     | 4 ++--
 client/containers/Project/Interface/InterfaceList/View.js    | 5 ++++-
 client/containers/Project/Interface/interface.scss           | 5 ++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/client/containers/Project/Interface/InterfaceCol/InterfaceColMenu.scss b/client/containers/Project/Interface/InterfaceCol/InterfaceColMenu.scss
index 2d489328..da4ed49f 100755
--- a/client/containers/Project/Interface/InterfaceCol/InterfaceColMenu.scss
+++ b/client/containers/Project/Interface/InterfaceCol/InterfaceColMenu.scss
@@ -6,11 +6,11 @@
   .opts-icon, .case-delete-icon {
     line-height: 25px;
     width: 30px;
+    transform: rotate(90deg);
+    font-weight: bold;
   }
   .opts-icon:hover, .case-delete-icon:hover {
     color: #2395f1;
-    border-radius: 4px;
-    box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
   }
   .menu-title {
     display: flex;
diff --git a/client/containers/Project/Interface/InterfaceList/View.js b/client/containers/Project/Interface/InterfaceList/View.js
index fda39499..76d388d8 100755
--- a/client/containers/Project/Interface/InterfaceList/View.js
+++ b/client/containers/Project/Interface/InterfaceList/View.js
@@ -5,6 +5,7 @@ import PropTypes from 'prop-types'
 import { Table,Icon } from 'antd'
 const mockEditor = require('./mockEditor.js')
 import { formatTime } from '../../../../common.js';
+import { Link } from 'react-router-dom';
 import ErrMsg from '../../../../components/ErrMsg/ErrMsg.js';
 import variable from '../../../../constants/variable';
 // import { Card } from 'antd'
@@ -275,7 +276,9 @@ class View extends Component {
       </div>
       <div className="colMockUrl">
         <span className="colKey">Mock地址：</span>
-        <span className="colValue">{location.protocol + '//' + location.hostname + (location.port !== "" ? ":" + location.port : "") + `/mock/${this.props.currProject._id}${this.props.currProject.basepath}${this.props.curData.path}`}</span>
+        <Link to={'https://baidu.com/'}>
+          <span className="colValue">{location.protocol + '//' + location.hostname + (location.port !== "" ? ":" + location.port : "") + `/mock/${this.props.currProject._id}${this.props.currProject.basepath}${this.props.curData.path}`}</span>
+        </Link>
       </div>
       {this.props.curData.desc?<div className="colDesc">
         <span className="colKey">接口备注：</span>
diff --git a/client/containers/Project/Interface/interface.scss b/client/containers/Project/Interface/interface.scss
index 0491cc14..e05be0ed 100755
--- a/client/containers/Project/Interface/interface.scss
+++ b/client/containers/Project/Interface/interface.scss
@@ -76,15 +76,14 @@
     .interface-delete-icon{
         position: relative;
         right: 0;
-        // top: 2px;
         float: right;
         line-height: 25px;
         width: 30px;
+        transform: rotate(90deg);
+        font-weight: bold;
     }
     .interface-delete-icon:hover {
         color: #2395f1;
-        border-radius: 4px;
-        box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
     }
 
     .interface-list{

From 39afe88561a9a0cc57a05a2884ae991f8b9b2853 Mon Sep 17 00:00:00 2001
From: "wenbo.dong" <wenbo.dong@qunar.com>
Date: Wed, 20 Sep 2017 20:38:22 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=8E=A5=E5=8F=A3=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0mock=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E7=9A=84=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/containers/Project/Interface/InterfaceList/View.js   | 5 +----
 client/containers/Project/Interface/InterfaceList/View.scss | 4 ++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/containers/Project/Interface/InterfaceList/View.js b/client/containers/Project/Interface/InterfaceList/View.js
index 76d388d8..1dc78746 100755
--- a/client/containers/Project/Interface/InterfaceList/View.js
+++ b/client/containers/Project/Interface/InterfaceList/View.js
@@ -5,7 +5,6 @@ import PropTypes from 'prop-types'
 import { Table,Icon } from 'antd'
 const mockEditor = require('./mockEditor.js')
 import { formatTime } from '../../../../common.js';
-import { Link } from 'react-router-dom';
 import ErrMsg from '../../../../components/ErrMsg/ErrMsg.js';
 import variable from '../../../../constants/variable';
 // import { Card } from 'antd'
@@ -276,9 +275,7 @@ class View extends Component {
       </div>
       <div className="colMockUrl">
         <span className="colKey">Mock地址：</span>
-        <Link to={'https://baidu.com/'}>
-          <span className="colValue">{location.protocol + '//' + location.hostname + (location.port !== "" ? ":" + location.port : "") + `/mock/${this.props.currProject._id}${this.props.currProject.basepath}${this.props.curData.path}`}</span>
-        </Link>
+        <span className="colValue" onClick={() => window.open(location.protocol + '//' + location.hostname + (location.port !== "" ? ":" + location.port : "") + `/mock/${this.props.currProject._id}${this.props.currProject.basepath}${this.props.curData.path}`, '_blank')}>{location.protocol + '//' + location.hostname + (location.port !== "" ? ":" + location.port : "") + `/mock/${this.props.currProject._id}${this.props.currProject.basepath}${this.props.curData.path}`}</span>
       </div>
       {this.props.curData.desc?<div className="colDesc">
         <span className="colKey">接口备注：</span>
diff --git a/client/containers/Project/Interface/InterfaceList/View.scss b/client/containers/Project/Interface/InterfaceList/View.scss
index ccf63f63..5982a91f 100755
--- a/client/containers/Project/Interface/InterfaceList/View.scss
+++ b/client/containers/Project/Interface/InterfaceList/View.scss
@@ -24,6 +24,10 @@
 
         }
     }
+    .colValue {
+      color: #2395f1;
+      cursor: pointer;
+    }
     .ace_print-margin{
         display: none;
     }

From a4b82657af93bb7df16b7f0ab2dd42ab1f6d6c71 Mon Sep 17 00:00:00 2001
From: "wenbo.dong" <wenbo.dong@qunar.com>
Date: Wed, 20 Sep 2017 21:20:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?opti:=20=E6=96=87=E6=A1=88=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/containers/Group/GroupList/GroupList.js              | 2 +-
 .../Project/Interface/InterfaceCol/InterfaceColMenu.js      | 6 +++---
 .../Project/Interface/InterfaceList/InterfaceMenu.js        | 6 +++---
 client/containers/Project/Interface/InterfaceList/View.js   | 2 +-
 client/containers/Project/Interface/InterfaceList/View.scss | 2 +-
 client/containers/Project/Interface/interface.scss          | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/client/containers/Group/GroupList/GroupList.js b/client/containers/Group/GroupList/GroupList.js
index 8d42f0b7..ca66860d 100755
--- a/client/containers/Group/GroupList/GroupList.js
+++ b/client/containers/Group/GroupList/GroupList.js
@@ -252,7 +252,7 @@ export default class GroupList extends Component {
 
           <div className="group-operate">
             <div className="search">
-              <Search placeholder="Filter by name" onChange={this.searchGroup} onSearch={(v) => this.searchGroup(null, v)} />
+              <Search placeholder="搜索分类" onChange={this.searchGroup} onSearch={(v) => this.searchGroup(null, v)} />
             </div>
           </div>
           <Menu
diff --git a/client/containers/Project/Interface/InterfaceCol/InterfaceColMenu.js b/client/containers/Project/Interface/InterfaceCol/InterfaceColMenu.js
index 410b422c..b5fc0173 100755
--- a/client/containers/Project/Interface/InterfaceCol/InterfaceColMenu.js
+++ b/client/containers/Project/Interface/InterfaceCol/InterfaceColMenu.js
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types'
 import { fetchInterfaceColList, fetchInterfaceCaseList, setColData } from '../../../../reducer/modules/interfaceCol'
 import { autobind } from 'core-decorators';
 import axios from 'axios';
-import { Input, Icon, Tag, Modal, message, Tooltip, Tree, Dropdown, Menu, Form } from 'antd';
+import { Input, Icon, Button, Modal, message, Tooltip, Tree, Dropdown, Menu, Form } from 'antd';
 
 const TreeNode = Tree.TreeNode;
 const FormItem = Form.Item;
@@ -215,9 +215,9 @@ export default class InterfaceColMenu extends Component {
     return (
       <div>
         <div className="interface-filter">
-          <Input placeholder="Filter by name" onChange={this.filterCol} />
+          <Input placeholder="搜索测试集合" onChange={this.filterCol} />
           <Tooltip placement="bottom" title="添加集合">
-            <Tag color="#108ee9" style={{ marginLeft: "16px" }} onClick={() => this.showColModal('add')} className="btn-filter" ><Icon type="plus" /></Tag>
+            <Button type="primary" style={{ marginLeft: "16px" }} onClick={() => this.showColModal('add')} className="btn-filter" >添加集合</Button>
           </Tooltip>
         </div>
         <Tree
diff --git a/client/containers/Project/Interface/InterfaceList/InterfaceMenu.js b/client/containers/Project/Interface/InterfaceList/InterfaceMenu.js
index 7acaf5b1..714623c3 100755
--- a/client/containers/Project/Interface/InterfaceList/InterfaceMenu.js
+++ b/client/containers/Project/Interface/InterfaceList/InterfaceMenu.js
@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types'
 import { fetchInterfaceList, fetchInterfaceData, deleteInterfaceData, deleteInterfaceCatData, initInterface } from '../../../../reducer/modules/interface.js';
 import { getProject } from '../../../../reducer/modules/project.js';
-import { Menu, Input, Icon, Tag, Modal, message, Tree, Dropdown } from 'antd';
+import { Menu, Input, Icon, Button, Modal, message, Tree, Dropdown } from 'antd';
 import AddInterfaceForm from './AddInterfaceForm';
 import AddInterfaceCatForm from './AddInterfaceCatForm';
 import axios from 'axios'
@@ -252,8 +252,8 @@ class InterfaceMenu extends Component {
     const matchParams = this.props.match.params;
     let menuList = this.state.list;
     const searchBox = <div className="interface-filter">
-      <Input onChange={this.onFilter} value={this.state.filter} placeholder="Filter by name" />
-      <Tag color="#108ee9" onClick={() => this.changeModal('add_cat_modal_visible', true)} className="btn-filter" ><Icon type="plus"  /></Tag>
+      <Input onChange={this.onFilter} value={this.state.filter} placeholder="搜索接口" />
+      <Button type="primary" onClick={() => this.changeModal('add_cat_modal_visible', true)} className="btn-filter" >添加接口</Button>
       <Modal
         title="添加接口"
         visible={this.state.visible}
diff --git a/client/containers/Project/Interface/InterfaceList/View.js b/client/containers/Project/Interface/InterfaceList/View.js
index 1dc78746..fe4feb1b 100755
--- a/client/containers/Project/Interface/InterfaceList/View.js
+++ b/client/containers/Project/Interface/InterfaceList/View.js
@@ -275,7 +275,7 @@ class View extends Component {
       </div>
       <div className="colMockUrl">
         <span className="colKey">Mock地址：</span>
-        <span className="colValue" onClick={() => window.open(location.protocol + '//' + location.hostname + (location.port !== "" ? ":" + location.port : "") + `/mock/${this.props.currProject._id}${this.props.currProject.basepath}${this.props.curData.path}`, '_blank')}>{location.protocol + '//' + location.hostname + (location.port !== "" ? ":" + location.port : "") + `/mock/${this.props.currProject._id}${this.props.currProject.basepath}${this.props.curData.path}`}</span>
+        <span className="colValue href" onClick={() => window.open(location.protocol + '//' + location.hostname + (location.port !== "" ? ":" + location.port : "") + `/mock/${this.props.currProject._id}${this.props.currProject.basepath}${this.props.curData.path}`, '_blank')}>{location.protocol + '//' + location.hostname + (location.port !== "" ? ":" + location.port : "") + `/mock/${this.props.currProject._id}${this.props.currProject.basepath}${this.props.curData.path}`}</span>
       </div>
       {this.props.curData.desc?<div className="colDesc">
         <span className="colKey">接口备注：</span>
diff --git a/client/containers/Project/Interface/InterfaceList/View.scss b/client/containers/Project/Interface/InterfaceList/View.scss
index 5982a91f..0629cde9 100755
--- a/client/containers/Project/Interface/InterfaceList/View.scss
+++ b/client/containers/Project/Interface/InterfaceList/View.scss
@@ -24,7 +24,7 @@
 
         }
     }
-    .colValue {
+    .colValue.href {
       color: #2395f1;
       cursor: pointer;
     }
diff --git a/client/containers/Project/Interface/interface.scss b/client/containers/Project/Interface/interface.scss
index e05be0ed..81b70e4f 100755
--- a/client/containers/Project/Interface/interface.scss
+++ b/client/containers/Project/Interface/interface.scss
@@ -57,14 +57,14 @@
     }
     .interface-filter{
         padding: 12px 16px;
-        padding-right: 58px;
+        padding-right: 110px;
         line-height: 32px;
         background-color: #ddd;
         position: relative;
     }
     .btn-filter {
         position: absolute;
-        right: 0;
+        right: 16px;
         top: 50%;
         transform: translateY(-50%);
     }