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

This commit is contained in:
sean 2017-08-28 17:13:09 +08:00
commit a9a7ca77df
2 changed files with 19 additions and 4 deletions

View File

@ -2,8 +2,9 @@ import React, { Component } from 'react'
import { connect } from 'react-redux';
import PropTypes from 'prop-types'
import { withRouter } from 'react-router'
import { Table } from 'antd'
import { Table, Tooltip } from 'antd'
import { fetchInterfaceColList, fetchCaseList, setColData } from '../../../../reducer/modules/interfaceCol'
import { formatTime } from '../../../../common.js'
@connect(
state => {
@ -75,13 +76,27 @@ export default class InterfaceColContent extends Component {
dataIndex: 'casename',
key: 'casename'
}, {
title: '用例路径',
title: '接口路径',
dataIndex: 'path',
key: 'path'
key: 'path',
render: (path, record) => {
return (
<Tooltip title="跳转到对应接口">
<a href={`/project/2909/interface/api/${record.interface_id}`}>{path || 'fdsf'}</a>
</Tooltip>
)
}
}, {
title: '请求方式',
dataIndex: 'method',
key: 'method'
}, {
title: '更新时间',
dataIndex: 'up_time',
key: 'up_time',
render: (item) => {
return <span>{formatTime(item)}</span>
}
}];
return (

View File

@ -108,7 +108,7 @@ class InterfaceList extends Component {
}],
onFilter: (value, record) => record.status.indexOf(value) === 0
}, {
title: '更新日期',
title: '更新时间',
dataIndex: 'up_time',
key: 'up_time',
render: (item) => {