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

client/containers/Project/Interface/InterfaceCol/CaseReport.js

@@ -11,9 +11,13 @@ 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>
-  })
+  let validRes ;
+  if(props.validRes && Array.isArray(props.validRes)){
+    validRes = props.validRes.map((item, index) => {
+      return <div key={index}>{item.message}</div>
+    })
+  }
+  
 
   return <div className="report">
     <Tabs defaultActiveKey="request" >

client/containers/Project/Interface/InterfaceCol/InterfaceColContent.js

@@ -3,6 +3,7 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types'
 import { withRouter } from 'react-router'
 import { Link } from 'react-router-dom'
+import constants from '../../../../constants/variable.js'
 import { Tooltip, Icon, Button, Spin, Modal, message ,Select} from 'antd'
 import { fetchInterfaceColList, fetchCaseList, setColData } from '../../../../reducer/modules/interfaceCol'
 import HTML5Backend from 'react-dnd-html5-backend';
@@ -25,7 +26,7 @@ function json_parse(data) {
     return data
   }
 }
-
+const HTTP_METHOD = constants.HTTP_METHOD;
 
 
 @connect(
@@ -155,8 +156,30 @@ class InterfaceColContent extends Component {
         status = 'error';
         result = e;
       }
-      this.reports[curitem._id] = result;
-      this.records[curitem._id] = result.res_body;
+      
+      let query = this.arrToObj(curitem.req_query);
+      if(!query || typeof query !== 'object'){
+        query = {};
+      }
+      let body = {};
+      if(HTTP_METHOD[curitem.method].request_body){
+        if(curitem.req_body_type === 'form'){
+          body = this.arrToObj(curitem.req_body_form);
+        }else {
+          body = isJson(curitem.req_body_other);
+        }
+        
+        if(!body || typeof body !== 'object'){
+          body = {};
+        }
+      }
+
+      let params = Object.assign({}, query, body);
+      this.reports = result;
+      this.records[curitem._id] = {
+        params: params,
+        body: result.res_body
+      };
 
       curitem = Object.assign({}, rows[i], { test_status: status });
       newRows = [].concat([], rows);