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

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

Browse Source
This commit is contained in:
qitmac000249 2017-08-18 11:34:18 +08:00
commit ba8b735f92
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,6 +109,7 @@ class InterfaceEditForm extends Component {
container: 'req_body_json',
data: that.state.req_body_json,
onChange: function (d) {
if(d.format !== true) return false;
that.setState({
req_body_json: d.text
})
@ -119,6 +120,7 @@ class InterfaceEditForm extends Component {
container: 'res_body_json',
data: that.state.res_body,
onChange: function (d) {
if(d.format !== true) return false;
mockPreview.editor.setValue(d.mockText)
that.setState({
res_body: d.text,

35
client/containers/Project/Interface/InterfaceList/mockEditor.js
View File

@ -6,9 +6,6 @@ require("brace/ext/language_tools.js");
var json5 = require('json5');
var langTools = ace.acequire("ace/ext/language_tools"),
editor,
mockEditor,
rhymeCompleter,
wordList = [
{ name: '字符串', mock: '@string' },
{ name: '自然数', mock: '@natural' },
@ -60,6 +57,22 @@ var langTools = ace.acequire("ace/ext/language_tools"),
];
function run(options) {
var editor,
mockEditor,
rhymeCompleter;
function handleJson(json) {
var curData = mockEditor.curData;
try {
var obj = json5.parse(json);
curData.text = json;
curData.format = true;
curData.jsonData = obj;
curData.mockData = Mock.mock(obj);
curData.mockText = JSON.stringify(curData.mockData, null, " ");
} catch (e) {
curData.format = e.message;
}
}
options = options || {};
var container, data;
container = options.container || 'mock-editor';
@ -73,7 +86,7 @@ function run(options) {
editor.$blockScrolling = Infinity;
editor.getSession().setMode('ace/mode/javascript');
//editor.renderer.setShowGutter(true);
if(options.readOnly === true){
if (options.readOnly === true) {
editor.setReadOnly(true);
}
editor.setTheme('ace/theme/xcode');
@ -125,19 +138,7 @@ function run(options) {
function handleJson(json) {
var curData = mockEditor.curData;
try {
var obj = json5.parse(json);
curData.text = json;
curData.format = true;
curData.jsonData = obj;
curData.mockData = Mock.mock(obj);
curData.mockText = JSON.stringify(curData.mockData, null, " ");
} catch (e) {
curData.format = e.message;
}
}
/**
* mockEditor({