mirror/yapi
2
0
Fork 0
mirror of https://github.com/YMFE/yapi.git synced 2025-02-17 13:49:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 完善测试集合功能

Browse Source
This commit is contained in:
suxiaoxin 2017-09-21 11:24:24 +08:00
parent 00511d1ed1
commit 4d1381ceb3
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/common.js
View File

@ -76,7 +76,6 @@ exports.debounce = (func, wait) => {
exports.simpleJsonPathParse = function (key, json){
if(!key || typeof key !== 'string' || key.indexOf('$.') !== 0 || key.length <= 2){
console.error('key 格式有误')
return null;
}
let keys = key.substr(2).split(".");
@ -94,7 +93,6 @@ exports.simpleJsonPathParse = function (key, json){
}catch(e){
console.error(e);
json = null;
break;
}

1
client/containers/Project/Interface/InterfaceCol/CaseReport.js
View File

@ -11,7 +11,6 @@ const CaseReport = function (props) {
let headers = json_format(props.headers, null, ' ');
let res_header = json_format(props.res_header, null, ' ');
let res_body = json_format(props.res_body);
let validRes = props.validRes.map((item, index) => {
return <div key={index}>{item.message}</div>
})

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

@ -175,7 +175,7 @@ class InterfaceColContent extends Component {
result.url = href;
result.method = interfaceData.method;
result.headers = that.getHeadersObj(interfaceData.req_headers);
result.body = interfaceData.req_body_type === 'form' ? (that.arrToObj(interfaceData.req_body_form), null, ' ') : interfaceData.req_body_other
result.body = interfaceData.req_body_type === 'form' ? that.arrToObj(interfaceData.req_body_form) : interfaceData.req_body_other
result.res_header = header;
result.res_body = res;
if (res && typeof res === 'object') {
@ -209,7 +209,6 @@ class InterfaceColContent extends Component {
handleVarWord(val){
console.log(val, this.records)
return simpleJsonPathParse(val, this.records)
}
@ -430,7 +429,7 @@ class InterfaceColContent extends Component {
</Table.Provider>
<Modal
title="测试报告"
width="660"
width="660px"
style={{ minHeight: '500px' }}
visible={this.state.visible}
onCancel={this.handleCancel}

13
server/controllers/interfaceCol.js
View File

@ -142,8 +142,9 @@ class interfaceColController extends baseController{
result.req_body_type = data.req_body_type;
result.req_headers = data.req_headers;
result.res_body = data.res_body;
result.res_body_type = data.res_body_type;
result.req_body_form = this.handleParamsValue(data.req_body_form, result.req_body_form)
result.res_body_type = data.res_body_type;
result.req_body_form = this.handleParamsValue(data.req_body_form, result.req_body_form)
result.req_query = this.handleParamsValue(data.req_query, result.req_query)
result.req_params = this.handleParamsValue(data.req_params, result.req_params)
resultList[index] = result;
@ -333,8 +334,7 @@ class interfaceColController extends baseController{
result.req_body_type = data.req_body_type;
result.req_headers = data.req_headers;
result.res_body = data.res_body;
result.res_body_type = data.res_body_type;
result.res_body_type = data.res_body_type;
result.req_body_form = this.handleParamsValue(data.req_body_form, result.req_body_form)
result.req_query = this.handleParamsValue(data.req_query, result.req_query)
result.req_params = this.handleParamsValue(data.req_params, result.req_params)
@ -347,6 +347,9 @@ class interfaceColController extends baseController{
handleParamsValue(params, val){
let value = {};
try{
params = params.toObject();
}catch(e){ }
if(params.length === 0 || val.length === 0){
return params;
}
@ -355,7 +358,7 @@ class interfaceColController extends baseController{
})
params.forEach((item, index)=>{
if(!value[item.name] || typeof value[item.name] !== 'object') return null;
params[index].value = value[item.name].value;
params[index].value = value[item.name].value;
})
return params;
}