mirror/yapi
2
0
Fork 0
mirror of https://github.com/YMFE/yapi.git synced 2025-03-01 14:05:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: g截断， mock信息select，json5提示

Browse Source
This commit is contained in:
gaoxiaolin.gao 2018-09-17 14:46:06 +08:00
parent cfae41122a
commit 0e87c1c9bd
7 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/components/SchemaTable/SchemaTable.js
View File

@ -20,7 +20,8 @@ const messageMap = {
uniqueItems: '元素是否都不同',
itemType: 'item 类型',
format: 'format',
itemFormat: 'format'
itemFormat: 'format',
mock: 'mock'
};
const columns = [
@ -78,7 +79,7 @@ const columns = [
title: '其他信息',
dataIndex: 'sub',
key: 'sub',
width: 80,
width: 180,
render: text => {
return Object.keys(text || []).map((item, index) => {
let name = messageMap[item];

3
client/containers/Project/Interface/InterfaceList/Edit.scss
View File

@ -77,7 +77,8 @@
text-overflow:ellipsis;
white-space: nowrap;
padding-right: 24px;
line-height: 100%;
// line-height: 100%;
vertical-align: middle;
}
.opened {

33
client/containers/Project/Interface/InterfaceList/InterfaceEditForm.js
View File

@ -11,10 +11,10 @@ import EasyDragSort from '../../../../components/EasyDragSort/EasyDragSort.js';
import mockEditor from 'client/components/AceEditor/mockEditor';
import AceEditor from 'client/components/AceEditor/AceEditor';
import axios from 'axios';
import { MOCK_SOURCE } from '../../../../constants/variable.js';
const jSchema = require('json-schema-editor-visual');
const ResBodySchema = jSchema({ lang: 'zh_CN' });
const ReqBodySchema = jSchema({ lang: 'zh_CN' });
const ResBodySchema = jSchema({ lang: 'zh_CN', mock: MOCK_SOURCE });
const ReqBodySchema = jSchema({ lang: 'zh_CN', mock: MOCK_SOURCE });
const TabPane = Tabs.TabPane;
require('codemirror/lib/codemirror.css'); // codemirror
@ -547,10 +547,10 @@ class InterfaceEditForm extends Component {
labelCol: { span: 4 },
wrapperCol: { span: 18 }
};
const res_body_use_schema_editor = checkIsJsonSchema(this.state.res_body) || ''
const req_body_other_use_schema_editor = checkIsJsonSchema(this.state.req_body_other) || ''
const res_body_use_schema_editor = checkIsJsonSchema(this.state.res_body) || '';
const req_body_other_use_schema_editor = checkIsJsonSchema(this.state.req_body_other) || '';
const queryTpl = (data, index) => {
return (
@ -744,7 +744,7 @@ class InterfaceEditForm extends Component {
});
const DEMOPATH = '/api/user/{id}';
return (
<Form onSubmit={this.handleSubmit}>
<h2 className="interface-title" style={{ marginTop: 0 }}>
@ -784,7 +784,10 @@ class InterfaceEditForm extends Component {
<Tooltip
title={
<div>
<p>1. 支持动态路由,例如:{DEMOPATH}</p>
<p>
1. 支持动态路由,例如:
{DEMOPATH}
</p>
<p>
2. 支持 ?controller=xxx 的QueryRouter,非router的Query参数请定义到
Request设置-&#62;Query
@ -985,7 +988,14 @@ class InterfaceEditForm extends Component {
: 'hide')
}
>
<span>JSON-SCHEMA:&nbsp;</span>
<span>
JSON-SCHEMA:&nbsp;
{!projectMsg.is_json5 && (
<Tooltip title="项目 -> 设置 开启 json5">
<Icon type="question-circle-o" />{' '}
</Tooltip>
)}
</span>
{getFieldDecorator('req_body_is_json_schema', {
valuePropName: 'checked',
initialValue: this.state.req_body_is_json_schema
@ -1056,6 +1066,11 @@ class InterfaceEditForm extends Component {
<h2 className="interface-title">
返回数据设置&nbsp;
{!projectMsg.is_json5 && (
<Tooltip title="项目 -> 设置 开启 json5">
<Icon type="question-circle-o" />{' '}
</Tooltip>
)}
{getFieldDecorator('res_body_is_json_schema', {
valuePropName: 'checked',
initialValue: this.state.res_body_is_json_schema || !projectMsg.is_json5

1
client/containers/Project/Interface/interface.scss
View File

@ -132,7 +132,6 @@
display: inline-block;
overflow: hidden;
top: 0px;
line-height: 100%;
}
.interface-item-nav{
line-height:25px;

2
client/containers/Project/Setting/ProjectMessage/ProjectMessage.js
View File

@ -396,7 +396,7 @@ class ProjectMessage extends Component {
label={
<span>
tag 信息&nbsp;
<Tooltip title="用户可以在这里定义 tag 信息">
<Tooltip title="定义 tag 信息，过滤接口">
<Icon type="question-circle-o" />
</Tooltip>
</span>

15
common/shema-transformTo-table.js
View File

@ -116,7 +116,8 @@ const SchemaString = data => {
minLength: data.minLength,
enum: data.enum,
enumDesc: data.enumDesc,
format: data.format
format: data.format,
mock: data.mock && data.mock.mock
};
return item;
};
@ -149,7 +150,8 @@ const SchemaNumber = data => {
default: data.default,
format: data.format,
enum: data.enum,
enumDesc: data.enumDesc
enumDesc: data.enumDesc,
mock: data.mock && data.mock.mock
};
return item;
};
@ -162,7 +164,8 @@ const SchemaInt = data => {
default: data.default,
format: data.format,
enum: data.enum,
enumDesc: data.enumDesc
enumDesc: data.enumDesc,
mock: data.mock && data.mock.mock
};
return item;
};
@ -171,7 +174,8 @@ const SchemaBoolean = data => {
let item = {
desc: data.description,
default: data.default,
enum: data.enum
enum: data.enum,
mock: data.mock && data.mock.mock
};
return item;
};
@ -179,7 +183,8 @@ const SchemaBoolean = data => {
const SchemaOther = data => {
let item = {
desc: data.description,
default: data.default
default: data.default,
mock: data.mock && data.mock.mock
};
return item;
};

4
server/controllers/project.js
View File

@ -1117,10 +1117,8 @@ class projectController extends baseController {
async swaggerUrl(ctx) {
try {
let url = ctx.request.query.url;
console.log('url', url);
let result = await axios.get(url);
let result = await axios.get(url);
ctx.body = yapi.commons.resReturn(result.data);
} catch (err) {
ctx.body = yapi.commons.resReturn(null, 402, err.message);