Skip to content

Commit

Permalink
fix: swagger url 导入样式修改
Browse files Browse the repository at this point in the history
  • Loading branch information
gaoxiaomumu committed Jul 12, 2018
1 parent 59273ed commit 4ee7165
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* 接口运行和测试集合中加入参数备注信息
* 测试接口导入支持状态过滤
* json schema 增加枚举备注功能
* 左侧菜单栏可以支持单独滚动条

#### Bug Fixed

Expand Down
4 changes: 2 additions & 2 deletions client/components/Postman/Postman.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ const ParamsNameComponent = props => {
const TooltipTitle = () => {
return (
<div>
{example && <div>示例: {example}</div>}
{desc && <div>备注: {desc}</div>}
{example && <div>示例: <span className="table-desc">{example}</span></div>}
{desc && <div>备注: <span className="table-desc">{desc}</span></div>}
</div>
);
};
Expand Down
11 changes: 5 additions & 6 deletions client/containers/Project/Setting/ProjectData/ProjectData.js
Original file line number Diff line number Diff line change
Expand Up @@ -333,22 +333,21 @@ class ProjectData extends Component {
</Select>
</div>
<div className="dataSync">
<span>
开启数据同步<Tooltip title="开启数据同步后会覆盖项目中原本的数据">
<span className="label">
开启数据同步&nbsp;<Tooltip title="开启数据同步后会覆盖项目中原本的数据">
<Icon type="question-circle-o" />
</Tooltip>{' '}
:
</span>

<Switch checked={this.state.dataSync} onChange={this.onChange} />
</div>
{this.state.curImportType === 'swagger' && (
<div className="dataSync">
<span>
开启url导入<Tooltip title="swagger url 导入">
<span className="label">
开启url导入&nbsp;<Tooltip title="swagger url 导入">
<Icon type="question-circle-o" />
</Tooltip>{' '}
&nbsp;&nbsp;:
&nbsp;&nbsp;
</span>

<Switch checked={this.state.isSwaggerUrl} onChange={this.handleUrlChange} />
Expand Down
10 changes: 9 additions & 1 deletion client/containers/Project/Setting/ProjectData/ProjectData.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,16 @@
padding-top: 16px;
font-weight: 500;
width: 100%;
span{
.label{
padding-right: 8px;
width: 115px;
display: inline-block;
}
.label:after {
content: ":";
margin: 0 8px 0 2px;
position: relative;
top: -.5px;
}
}

Expand Down

0 comments on commit 4ee7165

Please sign in to comment.