mirror/yapi
2
0
Fork 0
mirror of https://github.com/YMFE/yapi.git synced 2025-03-07 14:16:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
喻希里 2017-09-30 14:47:41 +08:00
commit 426295f473
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/containers/Project/Interface/InterfaceCol/InterfaceColContent.js
View File

@ -111,8 +111,6 @@ class InterfaceColContent extends Component {
})
}
}, 500)
this.getInterfaceState()
}
componentWillUnmount() {

2
client/containers/Project/Interface/InterfaceCol/InterfaceColMenu.js
View File

@ -301,7 +301,7 @@ export default class InterfaceColMenu extends Component {
<Tooltip title="编辑集合">
<Icon type='edit' className="interface-delete-icon" onClick={(e) => {e.stopPropagation();this.showColModal('edit', col)}} />
</Tooltip>
<Tooltip title="添加集合">
<Tooltip title="导入接口">
<Icon type='plus' className="interface-delete-icon" onClick={(e) => {e.stopPropagation();this.showImportInterfaceModal(col._id)}} />
</Tooltip>
</div>

6
client/containers/Project/Interface/InterfaceList/InterfaceMenu.js
View File

@ -424,10 +424,10 @@ class InterfaceMenu extends Component {
return <TreeNode title={<div className="container-title" onMouseEnter={() => this.enterItem(item._id)} onMouseLeave={this.leaveItem} >
<Link className="interface-item" to={"/project/" + matchParams.id + "/interface/api/cat_" + item._id} ><Icon type="folder-open" style={{ marginRight: 5 }} />{item.name}</Link>
<div className="btns">
<Tooltip title="删除集合">
<Tooltip title="删除分类">
<Icon type='delete' className="interface-delete-icon" onClick={(e) => { e.stopPropagation();this.showDelCatConfirm(item._id) }} style={{ display: this.state.delIcon == item._id ? 'block' : 'none' }}/>
</Tooltip>
<Tooltip title="编辑集合">
<Tooltip title="修改分类">
<Icon type='edit' className="interface-delete-icon" style={{ display: this.state.delIcon == item._id ? 'block' : 'none' }} onClick={(e) => {
e.stopPropagation();
this.changeModal('change_cat_modal_visible', true);
@ -436,7 +436,7 @@ class InterfaceMenu extends Component {
})
}} />
</Tooltip>
<Tooltip title="添加集合">
<Tooltip title="添加接口">
<Icon type='plus' className="interface-delete-icon" style={{ display: this.state.delIcon == item._id ? 'block' : 'none' }} onClick={(e) => {
e.stopPropagation();
this.changeModal('visible', true);

1
client/plugin-module.js
View File

@ -1 +0,0 @@
module.exports = {}