diff --git a/client/containers/Project/Interface/InterfaceList/InterfaceList.js b/client/containers/Project/Interface/InterfaceList/InterfaceList.js index 129ac5f0..8664c796 100644 --- a/client/containers/Project/Interface/InterfaceList/InterfaceList.js +++ b/client/containers/Project/Interface/InterfaceList/InterfaceList.js @@ -3,7 +3,7 @@ import { connect } from 'react-redux'; import PropTypes from 'prop-types' import axios from 'axios' import { - Table, Tag, Button, Modal, message, Tooltip + Table, Button, Modal, message, Tooltip } from 'antd'; import AddInterfaceForm from './AddInterfaceForm'; import { fetchInterfaceList} from '../../../../reducer/modules/interface.js'; @@ -134,16 +134,16 @@ class InterfaceList extends Component { title: '状态', dataIndex: 'status', key: 'status', - width: 12, + width: 14, render: (item) => { return
{item === 'done' ? - 完成 + 已完成 : - 未完成 + 未完成 }
}, filters: [{ - text: '完成', + text: '已完成', value: 'done' }, { text: '未完成', diff --git a/client/containers/Project/Interface/InterfaceList/View.js b/client/containers/Project/Interface/InterfaceList/View.js index 4becf042..6f1a3e4f 100644 --- a/client/containers/Project/Interface/InterfaceList/View.js +++ b/client/containers/Project/Interface/InterfaceList/View.js @@ -234,20 +234,10 @@ class View extends Component { }]; let status = { undone: "未完成", - done: "完成" - } - let statusColor = { - undone: { - bac: "rgb(255, 85, 0)", - color: "white" - }, - done:{ - bac: "rgb(135, 208, 104)", - color: "white" - } + done: "已完成" } let methodColor = variable.METHOD_COLOR[this.props.curData.method?this.props.curData.method.toLowerCase():"get"]; - statusColor = statusColor[this.props.curData.status?this.props.curData.status.toLowerCase():"undone"]; + // statusColor = statusColor[this.props.curData.status?this.props.curData.status.toLowerCase():"undone"]; let h = this.countEnter(this.props.curData.req_body_other); const aceEditor =
请求Body: @@ -269,7 +259,7 @@ class View extends Component {
状态: - {status[this.props.curData.status]} + {status[this.props.curData.status]}
创建时间: diff --git a/client/styles/common.scss b/client/styles/common.scss index a20db834..8424e088 100644 --- a/client/styles/common.scss +++ b/client/styles/common.scss @@ -97,3 +97,22 @@ em { width: min-content !important; } } + +.tag-status { + &::before { + content: ''; + display: inline-block; + margin-right: 6px; + width: 7px; + height: 7px; + border-radius: 50%; + position: relative; + bottom: 1px; + } + &.done::before { + background-color: #57cf27; + } + &.undone::before { + background-color: #ff561b; + } +}