mirror/yapi
2
0
Fork 0
mirror of https://github.com/YMFE/yapi.git synced 2025-01-06 12:45:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wenbo.dong 2017-08-16 14:41:33 +08:00
commit f0168a7661
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/containers/Group/GroupList/GroupList.js
View File

@ -167,10 +167,11 @@ export default class GroupList extends Component {
showConfirm =()=> { showConfirm =()=> {
let that = this; let that = this;
confirm({ confirm({
title: that.props.currGroup.group_name, title: "确认删除"+that.props.currGroup.group_name+"分组吗？",
content: <div style={{marginTop:'10px', fontSize: '14px', lineHeight: '25px'}}> content: <div style={{marginTop:'10px', fontSize: '12px', lineHeight: '25px'}}>
<Alert message="该操作会删除该分组下所有项目!" type="warning" /> <Alert message="警告：此操作非常危险,会删除该分组下面所有项目和接口，并且无法恢复!" type="warning" />
<div style={{marginTop: '10px'}}><b>请输入分组名称：</b><input id="group_name" /></div>
<div style={{marginTop: '15px'}}><b>请输入分组名称确认此操作:</b><input id="group_name" /></div>
</div>, </div>,
onOk() { onOk() {
let groupName = document.getElementById('group_name').value; let groupName = document.getElementById('group_name').value;
@ -184,6 +185,7 @@ export default class GroupList extends Component {
} }
}, },
iconType: 'delete',
onCancel() { } onCancel() { }
}); });
} }

4
client/containers/Project/Interface/InterfaceList/Run.js
View File

@ -74,7 +74,7 @@ export default class Run extends Component {
req_headers = [], req_headers = [],
req_body_type, req_body_type,
req_query = [], req_query = [],
// req_params = [], req_params = [],
req_body_other = '', req_body_other = '',
req_body_form = [] req_body_form = []
} = currInterface; } = currInterface;
@ -101,7 +101,7 @@ export default class Run extends Component {
this.setState({ this.setState({
method, method,
domains, domains,
pathParam: [{name: 'id', value: ''}], pathParam: req_params.concat(),
pathname, pathname,
query: req_query.concat(), query: req_query.concat(),
bodyForm: req_body_form.concat(), bodyForm: req_body_form.concat(),