Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev

client/components/Breadcrumb/Breadcrumb.scss

@@ -5,7 +5,7 @@
     font-size: 16px;
     float: left;
     color: #fff;
-    padding-left: 40px;
+    padding-left: 64px;
   }
   .ant-breadcrumb a {
     color: #fff;

client/components/Header/Header.js

@@ -9,11 +9,11 @@ import { changeMenuItem } from '../../reducer/modules/menu'
 import { withRouter } from 'react-router';
 import Srch from './Search/Search'
 const { Header } = Layout;
-import { logoSVG, betaSVG } from '../../common.js';
+import { logoSVG } from '../../common.js';
 import Breadcrumb from '../Breadcrumb/Breadcrumb.js'
 
 const MenuUser = (props) => (
-  <Menu className="user-menu" >
+  <Menu theme="dark" className="user-menu" >
     <Menu.Item key="0">
       <Link to={`/user/profile/${props.uid}`} onClick={props.relieveLink}><Icon type="user"/>个人中心</Link>
     </Menu.Item>
@@ -36,6 +36,13 @@ const ToolUser = (props)=> (
     <li className="toolbar-li item-search">
       <Srch groupList={props.groupList}/>
     </li>
+    <Link to="/follow">
+      <Tooltip placement="bottom" title={'我的关注'}>
+        <li className="toolbar-li">
+          <Icon className="dropdown-link" style={{ fontSize: 16 }} type="star" />
+        </li>
+      </Tooltip>
+    </Link>
     <Link to="/add-project">
       <Tooltip placement="bottom" title={'新建项目'}>
         <li className="toolbar-li">
@@ -49,6 +56,7 @@ const ToolUser = (props)=> (
       </li>
     </Tooltip>
     <li className="toolbar-li">
+      
       <Dropdown
         placement = "bottomRight"
         overlay={
@@ -63,10 +71,11 @@ const ToolUser = (props)=> (
         <a className="dropdown-link">
           <Avatar src={`/api/user/avatar?uid=${props.uid}`} />
           {/*<img style={{width:24,height:24}} src={`/api/user/avatar?uid=${props.uid}`} />*/}
-          <span className="name">{props.user}</span>
-
+          {/*<span className="name">{props.user}</span>*/}
+          <span className="name"><Icon type="down-circle-o" /></span>
         </a>
       </Dropdown>
+      
     </li>
   </ul>
 );
@@ -168,7 +177,8 @@ export default class HeaderCom extends Component {
         <div className="content g-row">
           <div className="logo">
             <Link to="/group" onClick={this.relieveLink} className="href">
-              <span className="img">{logoSVG('32px')}</span><span className="logo-name">YAPI<span className="ui-badge">{betaSVG}</span></span>
+              <span className="img">{logoSVG('32px')}</span>
+              {/*<span className="logo-name">YApi<span className="ui-badge">{betaSVG}</span></span>*/}
             </Link>
           </div>
           <Breadcrumb />

client/components/Header/Header.scss

@@ -14,6 +14,7 @@
     float: left;
     line-height: .56rem;
     height: .56rem;
+    
     .href {
       text-decoration: none;
     }
@@ -44,24 +45,24 @@
       from { background-position: 0px; }
       to { background-position: -240px; }
     }
-    &:before, &:after {
-      content: '';
-      display: block;
-      width: 2px;
-      height: .56rem;
-      background-color: #222;
-      border-left: 1px solid #575D67;
-      position: relative;
-      top: 0;
-    }
-    &:before {
-      float: left;
-      left: -.08rem;
-    }
-    &:after {
-      float: right;
-      right: -.27rem;
-    }
+    // &:before, &:after {
+    //   content: '';
+    //   display: block;
+    //   width: 2px;
+    //   height: .56rem;
+    //   background-color: #222;
+    //   border-left: 1px solid #575D67;
+    //   position: relative;
+    //   top: 0;
+    // }
+    // &:before {
+    //   float: left;
+    //   left: -.08rem;
+    // }
+    // &:after {
+    //   float: right;
+    //   right: -.27rem;
+    // }
   }
 
   .nav-toolbar {
@@ -69,7 +70,9 @@
     float: left;
 
   }
-
+  .user-menu{
+    margin-top: 20px;
+  }
   .user-toolbar{
     float: right;
     height: .54rem;

client/containers/Follows/Follows.js

@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
 import { Row, Col } from 'antd';
 import { getFollowList } from  '../../reducer/modules/follow';
 import { setBreadcrumb } from  '../../reducer/modules/user';
-import Subnav from '../../components/Subnav/Subnav.js';
+// import Subnav from '../../components/Subnav/Subnav.js';
 import ProjectCard from '../../components/ProjectCard/ProjectCard.js';
 import ErrMsg from '../../components/ErrMsg/ErrMsg.js';
 
@@ -60,7 +60,7 @@ class Follows extends Component {
     const data = this.state.data;
     return (
       <div>
-        <Subnav
+        {/*<Subnav
           default={'我的关注'}
           data={[{
             name: '项目广场',
@@ -68,7 +68,7 @@ class Follows extends Component {
           }, {
             name: '我的关注',
             path: '/follow'
-          }]}/>
+          }]}/>*/}
         <div className="g-row">
           <Row gutter={24} className="follow-box card-panel pannel-without-tab">
             {data.length ? data.map((item, index) => {

client/containers/Follows/Follows.scss

@@ -5,6 +5,7 @@
 .follow-box{
   padding: 24px;
   background-color: #fff;
+  margin-top: 32px;
 }
 
 .card-panel {

client/containers/Group/Group.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import GroupList from './GroupList/GroupList.js';
 import ProjectList from './ProjectList/ProjectList.js';
 import MemberList from './MemberList/MemberList.js';
-import Subnav from '../../components/Subnav/Subnav.js';
+// import Subnav from '../../components/Subnav/Subnav.js';
 import { Route, Switch, Redirect } from 'react-router-dom';
 import { Row, Col, Tabs } from 'antd';
 const TabPane = Tabs.TabPane;
@@ -32,8 +32,8 @@ export default class Group extends Component {
       </div>
     )
     return (
-      <div>
-        <Subnav
+      <div className='projectGround'>
+        {/*<Subnav
           default={'项目广场'}
           data={[{
             name: '项目广场',
@@ -41,7 +41,7 @@ export default class Group extends Component {
           }, {
             name: '我的关注',
             path: '/follow'
-          }]}/>
+          }]}/>*/}
         <Switch>
           <Redirect exact from='/group' to='/group/0' />
           <Route path="/group/:groupId" render={() => GroupContent} />

client/containers/Group/Group.scss

@@ -4,3 +4,6 @@
   @include row-width-limit;
   margin: 0 auto .24rem;
 }
+.projectGround{
+  padding-top: 32px;
+}

client/containers/Group/GroupList/GroupList.scss

@@ -18,7 +18,7 @@
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;
-        max-width: 150px;
+        max-width: 140px;
         font-weight: 200;
         vertical-align: bottom;
       }

client/containers/Project/Interface/InterfaceList/InterfaceList.js

@@ -15,7 +15,8 @@ import './Edit.scss';
   state => {
     return {
       curData: state.inter.curdata,
-      curProject: state.project.currProject
+      curProject: state.project.currProject,
+      catList: state.inter.list
     }
   },{
     fetchInterfaceList
@@ -36,6 +37,7 @@ class InterfaceList extends Component {
 
   static propTypes = {
     curData: PropTypes.object,
+    catList: PropTypes.array,
     match: PropTypes.object,
     curProject: PropTypes.object,
     history: PropTypes.object,
@@ -151,15 +153,21 @@ class InterfaceList extends Component {
       }],
       onFilter: (value, record) => record.status.indexOf(value) === 0
     }]
-
+    let intername = '';
+    if(this.props.curProject.cat){
+      for(let i = 0;i<this.props.curProject.cat.length;i++){
+        if(this.props.curProject.cat[i]._id === this.state.catid){
+          intername = this.props.curProject.cat[i].name;
+        }
+      }
+    }
     const data = this.state.data.map(item => {
       item.key = item._id;
       return item;
     });
-
     return (
       <div style={{ padding: '16px' }}>
-        <h2 style={{ display: 'inline-block'}}>接口列表</h2>
+        <h2 style={{ display: 'inline-block'}}>{intername?intername:'全部接口'}</h2>
         <Button style={{float: 'right'}} type="primary" onClick={() => this.setState({ visible: true })}>添加接口</Button>
         <Table className="table-interfacelist" pagination={false} columns={columns} onChange={this.handleChange} dataSource={data} />
         <Modal

client/containers/Project/Interface/InterfaceList/View.js

@@ -65,7 +65,7 @@ class View extends Component {
             key: i,
             name: item.name,
             value: item.desc,
-            required: item.required?"是":"否",
+            required: item.required==0?"否":"是",
             type: item.type
           })
         })
@@ -129,7 +129,7 @@ class View extends Component {
           key: i,
           name: item.name,
           value: item.desc,
-          required: item.required?"是":"否"
+          required: item.required==0?"否":"是"
         })
       })
     }
@@ -189,7 +189,7 @@ class View extends Component {
         dataSource.push({
           key: i,
           name: item.name,
-          required: item.required?"是":"否",
+          required: item.required==0?"否":"是",
           value: item.value,
           desc: item.desc
         })