fix: sonar 检查

This commit is contained in:
gaoxiaolin.gao 2018-06-26 17:48:45 +08:00
parent f986eb4010
commit 900d73ff88
6 changed files with 140 additions and 119 deletions

View File

@ -46,14 +46,14 @@ export default class Srch extends Component {
onSelect = async (value, option) => {
if (option.props.type == '分组') {
if (option.props.type === '分组') {
this.props.changeMenuItem('/group');
this.props.history.push('/group/' + option.props['id']);
this.props.setCurrGroup({ group_name: value, _id: option.props['id']-0 });
} else if(option.props.type == '项目') {
} else if(option.props.type === '项目') {
await this.props.fetchGroupMsg(option.props['groupId'])
this.props.history.push('/project/' + option.props['id']);
} else if (option.props.type == '接口') {
} else if (option.props.type === '接口') {
await this.props.fetchInterfaceListMenu(option.props['projectId']);
this.props.history.push('/project/' + option.props['projectId']+'/interface/api/'+option.props['id']);
}

View File

@ -52,7 +52,7 @@ const columns = [
dataIndex: 'default',
key: 'default',
render: text => {
return <div>{_.isBoolean(text) ? text+'': text}</div>
return <div>{_.isBoolean(text) ? text+'': text}</div>;
}
},
{

View File

@ -366,10 +366,10 @@ function handleParams(interfaceData, handleValue, requestParams) {
if(interfaceRunData.req_body_type === 'raw'){
if(headers && headers['Content-Type']){
if(headers['Content-Type'].indexOf('application/x-www-form-urlencoded')>=0) {
interfaceRunData.req_body_type = 'form'
interfaceRunData.req_body_type = 'form';
let reqData = json_parse(interfaceRunData.req_body_other);
if(reqData && typeof reqData === 'object'){
interfaceRunData.req_body_form = []
interfaceRunData.req_body_form = [];
Object.keys(reqData).forEach(key=>{
interfaceRunData.req_body_form.push({
name: key,
@ -381,7 +381,7 @@ function handleParams(interfaceData, handleValue, requestParams) {
}
} else if(headers['Content-Type'].indexOf('application/json')>=0) {
interfaceRunData.req_body_type = 'json'
interfaceRunData.req_body_type = 'json';
}
}
}

View File

@ -1,12 +1,12 @@
import React, { Component } from 'react'
import { connect } from 'react-redux'
import axios from 'axios'
import PropTypes from 'prop-types'
import React, { Component } from 'react';
import { connect } from 'react-redux';
import axios from 'axios';
import PropTypes from 'prop-types';
import { withRouter } from 'react-router-dom';
import { Table, Button, message, Popconfirm, Tooltip, Icon } from 'antd';
import { fetchMockCol } from 'client/reducer/modules/mockCol'
import { fetchMockCol } from 'client/reducer/modules/mockCol';
import { formatTime } from 'client/common.js';
import constants from 'client/constants/variable.js'
import constants from 'client/constants/variable.js';
import CaseDesModal from './CaseDesModal';
import { json5_parse } from '../../../client/common';
import _ from 'underscore';
@ -17,7 +17,7 @@ import _ from 'underscore';
list: state.mockCol.list,
currInterface: state.inter.curdata,
currProject: state.project.currProject
}
};
},
{
fetchMockCol
@ -31,43 +31,42 @@ export default class MockCol extends Component {
match: PropTypes.object,
fetchMockCol: PropTypes.func,
currProject: PropTypes.object
}
};
state = {
caseData: {},
caseDesModalVisible: false,
isAdd: false
}
};
constructor(props) {
super(props);
}
componentWillMount() {
const interfaceId = this.props.match.params.actionId
const interfaceId = this.props.match.params.actionId;
this.props.fetchMockCol(interfaceId);
}
openModal = (record, isAdd)=>{
return async ()=>{
if(this.props.currInterface.res_body_is_json_schema && isAdd){
openModal = (record, isAdd) => {
return async () => {
if (this.props.currInterface.res_body_is_json_schema && isAdd) {
let result = await axios.post('/api/interface/schema2json', {
schema: json5_parse(this.props.currInterface.res_body),
required: true
})
record.res_body = JSON.stringify(result.data)
});
record.res_body = JSON.stringify(result.data);
}
this.setState({
isAdd: isAdd,
caseDesModalVisible: true,
caseData: record
})
}
}
});
};
};
handleOk = async (caseData) => {
if(!caseData){
handleOk = async caseData => {
if (!caseData) {
return null;
}
const { caseData: currcase } = this.state;
@ -77,7 +76,7 @@ export default class MockCol extends Component {
...caseData,
interface_id: interface_id,
project_id: project_id
})
});
if (!this.state.isAdd) {
caseData.id = currcase._id;
}
@ -85,132 +84,154 @@ export default class MockCol extends Component {
if (res.data.errcode === 0) {
message.success(this.state.isAdd ? '添加成功' : '保存成功');
await this.props.fetchMockCol(interface_id);
this.setState({ caseDesModalVisible: false })
this.setState({ caseDesModalVisible: false });
} else {
message.error(res.data.errmsg);
}
})
}
});
};
deleteCase = async (id) => {
deleteCase = async id => {
const interface_id = this.props.match.params.actionId;
await axios.post('/api/plugin/advmock/case/del', {id}).then(async res => {
await axios.post('/api/plugin/advmock/case/del', { id }).then(async res => {
if (res.data.errcode === 0) {
message.success('删除成功');
await this.props.fetchMockCol(interface_id);
} else {
message.error(res.data.errmsg);
}
})
}
});
};
render() {
const { list: data, currInterface } = this.props;
const { isAdd, caseData, caseDesModalVisible } = this.state;
const role = this.props.currProject.role;
const isGuest = role ==='guest'
const isGuest = role === 'guest';
const initCaseData = {
ip: '',
ip_enable: false,
name: currInterface.title,
code: '200',
delay: 0,
headers: [{name: '', value: ''}],
headers: [{ name: '', value: '' }],
params: {},
res_body: currInterface.res_body
}
res_body: currInterface.res_body
};
let ipFilters = [];
let ipObj = {};
let userFilters = [];
let userObj = {};
_.isArray(data) &&
data.forEach(item => {
ipObj[item.ip_enable ? item.ip : ''] = '';
userObj[item.username] = '';
})
_.isArray(data) &&
data.forEach(item => {
ipObj[item.ip_enable ? item.ip : ''] = '';
userObj[item.username] = '';
});
ipFilters = Object.keys(Object.assign(ipObj)).map(value => {
if (!value) {
value = '无过滤'
value = '无过滤';
}
return { text: value, value }
})
userFilters = Object.keys(Object.assign(userObj)).map(value => { return { text: value, value } })
const columns = [{
title: '期望名称',
dataIndex: 'name',
key: 'name'
}, {
title: 'ip',
dataIndex: 'ip',
key: 'ip',
render: (text, recode) => {
if (!recode.ip_enable) {
text = '';
}
return text;
return { text: value, value };
});
userFilters = Object.keys(Object.assign(userObj)).map(value => {
return { text: value, value };
});
const columns = [
{
title: '期望名称',
dataIndex: 'name',
key: 'name'
},
onFilter: (value, record) => (record.ip === value && record.ip_enable) || (value === '无过滤' && !record.ip_enable),
filters: ipFilters
}, {
title: '创建人',
dataIndex: 'username',
key: 'username',
onFilter: (value, record) => record.username === value,
filters: userFilters
}, {
title: '编辑时间',
dataIndex: 'up_time',
key: 'up_time',
render: text => formatTime(text)
}, {
title: '操作',
dataIndex: '_id',
key: '_id',
render: (_id, recode) => {
return (!isGuest &&
<div>
<span style={{marginRight: 5}}>
<Button size="small" onClick={ this.openModal(recode) }>编辑</Button>
</span>
<span>
<Popconfirm
title="你确定要删除这条期望?"
onConfirm={() => this.deleteCase(_id)}
okText="确定"
cancelText="取消"
>
<Button size="small" onClick={() => {}}>删除</Button>
</Popconfirm>
</span>
</div>
)
{
title: 'ip',
dataIndex: 'ip',
key: 'ip',
render: (text, recode) => {
if (!recode.ip_enable) {
text = '';
}
return text;
},
onFilter: (value, record) =>
(record.ip === value && record.ip_enable) || (value === '无过滤' && !record.ip_enable),
filters: ipFilters
},
{
title: '创建人',
dataIndex: 'username',
key: 'username',
onFilter: (value, record) => record.username === value,
filters: userFilters
},
{
title: '编辑时间',
dataIndex: 'up_time',
key: 'up_time',
render: text => formatTime(text)
},
{
title: '操作',
dataIndex: '_id',
key: '_id',
render: (_id, recode) => {
return (
!isGuest && (
<div>
<span style={{ marginRight: 5 }}>
<Button size="small" onClick={this.openModal(recode)}>
编辑
</Button>
</span>
<span>
<Popconfirm
title="你确定要删除这条期望?"
onConfirm={() => this.deleteCase(_id)}
okText="确定"
cancelText="取消"
>
<Button size="small" onClick={() => {}}>
删除
</Button>
</Popconfirm>
</span>
</div>
)
);
}
}
}];
];
return (
<div>
<div style={{marginBottom: 8}}>
<Button type="primary" onClick={this.openModal(initCaseData, true)} disabled={isGuest}>添加期望</Button>
<a target="_blank" rel="noopener noreferrer" href={constants.docHref.adv_mock_case} style={{marginLeft: 8}} >
<Tooltip title="点击查看文档"><Icon type="question-circle-o" /></Tooltip>
<div style={{ marginBottom: 8 }}>
<Button type="primary" onClick={this.openModal(initCaseData, true)} disabled={isGuest}>
添加期望
</Button>
<a
target="_blank"
rel="noopener noreferrer"
href={constants.docHref.adv_mock_case}
style={{ marginLeft: 8 }}
>
<Tooltip title="点击查看文档">
<Icon type="question-circle-o" />
</Tooltip>
</a>
</div>
<Table columns={columns} dataSource={data} pagination={false} rowKey='_id' />
{ caseDesModalVisible &&
<Table columns={columns} dataSource={data} pagination={false} rowKey="_id" />
{caseDesModalVisible && (
<CaseDesModal
visible={caseDesModalVisible}
isAdd={isAdd}
caseData={caseData}
onOk={this.handleOk}
onCancel={() => this.setState({caseDesModalVisible: false})}
ref={this.saveFormRef}
/>
}
visible={caseDesModalVisible}
isAdd={isAdd}
caseData={caseData}
onOk={this.handleOk}
onCancel={() => this.setState({ caseDesModalVisible: false })}
ref={this.saveFormRef}
/>
)}
</div>
)
);
}
}

View File

@ -682,7 +682,7 @@ class projectController extends baseController {
let projectInst = yapi.getInst(projectModel);
var check = await projectInst.checkMemberRepeat(params.id, params.member_uid);
if (check === 0) {
return (ctx.body = yapi.commons.resReturn(null, 400, '项目成员不存在'));
return ctx.body = yapi.commons.resReturn(null, 400, '项目成员不存在');
}
let result = await projectInst.changeMemberEmailNotice(params.id, params.member_uid, params.notice);

View File

@ -7,7 +7,7 @@ const projectModel = require('../models/project.js');
const interfaceColModel = require('../models/interfaceCol.js');
const interfaceCaseModel = require('../models/interfaceCase.js');
const interfaceModel = require('../models/interface.js');
const userModel = require('../models/user.js')
const userModel = require('../models/user.js');
const json5 = require('json5');
const _ = require('underscore');
const Ajv = require('ajv');