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

This commit is contained in:
gaoxiaolin.gao 2017-11-03 10:17:15 +08:00
commit 1c20d68270
14 changed files with 101 additions and 47 deletions

View File

@ -222,9 +222,9 @@ export default class Run extends Component {
if(resBody === false){
resBody = bodyOther;
}else{
reqBody = this.handleJson(resBody)
reqBody = this.handleJson(resBody)
}
}
this.setState({ loading: true })
@ -238,7 +238,7 @@ export default class Run extends Component {
file: bodyType === 'file' ? 'single-file' : null,
timeout: 8240000, //因浏览器限制,超时时间最多为两分钟
success: (res, header, third) => {
console.log('suc', third);
// console.log('suc', third);
this.setState({
resStatusCode: third.res.status,
resStatusText: third.res.statusText
@ -404,7 +404,7 @@ export default class Run extends Component {
bodyForm[index].enable = true;
if (bodyForm[index].type === 'file') {
bodyForm[index].value = 'file_' + index
} else {
} else {
bodyForm[index].value = v
}
} else if (key === 'enable') {
@ -516,7 +516,7 @@ export default class Run extends Component {
}else{
return data;
}
return data;
return data;
}
bindAceEditor = () => {
@ -551,11 +551,11 @@ export default class Run extends Component {
}, 0);
}
@autobind
fileChange(e, index) {
console.log(e)
console.log(index)
}
// @autobind
// fileChange(e, index) {
// console.log(e)
// console.log(index)
// }
@autobind
onTestSwitched(checked) {

View File

@ -180,7 +180,7 @@ export default class InterfaceColMenu extends Component {
if (!res.data.errcode) {
message.success('删除用例成功');
// 如果删除当前选中 case切换路由到集合
// 如果删除当前选中 case切换路由到集合
if (+caseId === +that.props.currCaseId) {
that.props.history.push('/project/' + params.id + '/interface/col/')
} else {
@ -287,8 +287,6 @@ export default class InterfaceColMenu extends Component {
// });
// this.props.interfaceColList.caseList = caseList;
// }
return (
<div>
<div className="interface-filter">

View File

@ -71,7 +71,10 @@ body, h1, h2, h3, h4, h5, h6 {
text-align: center;
font-family: 'Dosis', 'Source Sans Pro', 'Helvetica Neue', Arial, sans-serif;
}
.ydoc .ydoc-banner-bg {
background: url(https://ws1.sinaimg.cn/large/006cGJIjly1fl42tf966mj31dr0aqahp.jpg) 0 top repeat-x;
background-color: #232323;
}
.ydoc .ydoc-banner-home .home-desc{
padding: 0 1rem .16rem;
font-weight: normal;
@ -80,16 +83,41 @@ body, h1, h2, h3, h4, h5, h6 {
.logo {
align-items: center;
padding: 0 .24rem;
display: flex;
justify-content: center;
}
.logo .name{
font-size: 50px
.logo .name {
font-size: 50px;
color: #fff;
margin-left: 16px;
-webkit-font-smoothing: antialiased;
}
.ydoc .ydoc-banner-home {
padding: .6rem 0;
}
.ydoc .ydoc-banner-home .home-desc {
color: #fff;
-webkit-font-smoothing: antialiased;
}
.svg {
animation: spin 5s linear infinite;
}
.ydoc-container {
background-color: #fff;
}
.ydoc-container-content {
box-shadow: none;
}
.ydoc-banner-area h1 {
-webkit-font-smoothing: antialiased;
color: #fff;
}
.ydoc .ydoc-banner-bg .desc {
-webkit-font-smoothing: antialiased;
color: #fff;
}
@keyframes spin
{
@ -99,4 +127,4 @@ body, h1, h2, h3, h4, h5, h6 {
to {
transform: rotate(360deg);
}
}
}

View File

@ -141,15 +141,15 @@
<ul class="nav docs-sidenav-extend" >
<li >
<a href="#Mock_期望">Mock 期望</a>
<a href="#Mock 期望">Mock 期望</a>
</li>
<li >
<a href="#自定义_Mock_脚本">自定义 Mock 脚本</a>
<a href="#自定义 Mock 脚本">自定义 Mock 脚本</a>
</li>
<li >
<a href="#Mock_优先级说明">Mock 优先级说明</a>
<a href="#Mock 优先级说明">Mock 优先级说明</a>
</li>
</ul>

View File

@ -157,15 +157,15 @@
</li>
<li >
<a href="#Postman_数据导入">Postman 数据导入</a>
<a href="#Postman 数据导入">Postman 数据导入</a>
</li>
<li >
<a href="#HAR_数据导入">HAR 数据导入</a>
<a href="#HAR 数据导入">HAR 数据导入</a>
</li>
<li >
<a href="#Swagger_数据导入">Swagger 数据导入</a>
<a href="#Swagger 数据导入">Swagger 数据导入</a>
</li>
</ul>

View File

@ -108,7 +108,7 @@
<!-- <li > -->
<li >
<a href="#配置邮箱__仅支持_SMTP_">配置邮箱 (仅支持 SMTP)</a>
<a href="#配置邮箱 (仅支持 SMTP)">配置邮箱 (仅支持 SMTP)</a>
</li>
</ul>

View File

@ -89,7 +89,7 @@
<filter x="-85.4%" y="-68.3%" width="270.7%" height="270.7%" filterUnits="objectBoundingBox" id="filter-3">
<feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset><feGaussianBlur stdDeviation="1.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.159703351 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix></filter></defs><g id="首页" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="大屏幕">
<g id="Icon"><circle id="Oval-1" fill="url(#linearGradient-1)" cx="32" cy="32" r="32"></circle><path d="M36.7078009,31.8054514 L36.7078009,51.7110548 C36.7078009,54.2844537 34.6258634,56.3695395 32.0579205,56.3695395 C29.4899777,56.3695395 27.4099998,54.0704461 27.4099998,51.7941246 L27.4099998,31.8061972 C27.4099998,29.528395 29.4909575,27.218453 32.0589004,27.230043 C34.6268432,27.241633 36.7078009,29.528395 36.7078009,31.8054514 Z" id="blue" fill="#2359F1" fill-rule="nonzero"></path><path d="M45.2586091,17.1026914 C45.2586091,17.1026914 45.5657231,34.0524383 45.2345291,37.01141 C44.9033351,39.9703817 43.1767091,41.6667796 40.6088126,41.6667796 C38.040916,41.6667796 35.9609757,39.3676862 35.9609757,37.0913646 L35.9609757,17.1034372 C35.9609757,14.825635 38.0418959,12.515693 40.6097924,12.527283 C43.177689,12.538873 45.2586091,14.825635 45.2586091,17.1026914 Z" id="green" fill="#57CF27" fill-rule="nonzero" transform="translate(40.674608, 27.097010) rotate(60.000000) translate(-40.674608, -27.097010) "></path><path d="M28.0410158,17.0465598 L28.0410158,36.9521632 C28.0410158,39.525562 25.9591158,41.6106479 23.3912193,41.6106479 C20.8233227,41.6106479 18.7433824,39.3115545 18.7433824,37.035233 L18.7433824,17.0473055 C18.7433824,14.7695034 20.8243026,12.4595614 23.3921991,12.4711513 C25.9600956,12.4827413 28.0410158,14.7695034 28.0410158,17.0465598 Z" id="red" fill="#FF561B" fill-rule="nonzero" transform="translate(23.392199, 27.040878) rotate(-60.000000) translate(-23.392199, -27.040878) "></path><g id="inner-round"><use fill="black" fill-opacity="1" filter="url(#filter-3)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#path-2"></use><use fill="#F7F7F7" fill-rule="evenodd" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#path-2"></use></g></g></g></g></svg>
<span class="name">YAPI</span></div></h1>
<span class="name"> YApi</span></div></h1>
<p class="desc home-desc">高效、易用、功能强大的 api 管理平台,旨在为开发、产品、测试人员提供更优雅的接口管理服务。</p>

View File

@ -139,19 +139,19 @@
</li>
<li >
<a href="#定义_mock_数据示例">定义 mock 数据示例</a>
<a href="#定义 mock 数据示例">定义 mock 数据示例</a>
</li>
<li >
<a href="#YApi-Mock_跟_Mockjs_区别">YApi-Mock 跟 Mockjs 区别</a>
<a href="#YApi-Mock 跟 Mockjs 区别">YApi-Mock 跟 Mockjs 区别</a>
</li>
<li >
<a href="#如何使用_Mock">如何使用 Mock</a>
<a href="#如何使用 Mock">如何使用 Mock</a>
</li>
<li >
<a href="#Mock_语法规范">Mock 语法规范</a>
<a href="#Mock 语法规范">Mock 语法规范</a>
</li>
</ul>

View File

@ -119,7 +119,7 @@
</li>
<li >
<a href="#index.js_配置说明">index.js 配置说明</a>
<a href="#index.js 配置说明">index.js 配置说明</a>
</li>
<li >

View File

@ -117,11 +117,11 @@
<ul class="nav docs-sidenav-extend" >
<li >
<a href="#后端_hookList">后端 hookList</a>
<a href="#后端 hookList">后端 hookList</a>
</li>
<li >
<a href="#前端_hookList">前端 hookList</a>
<a href="#前端 hookList">前端 hookList</a>
</li>
</ul>

View File

@ -90,25 +90,25 @@
<!-- <li > -->
<li >
<a href="#Q1__怎样联系组长?">Q1: 怎样联系组长?</a>
<a href="#Q1: 怎样联系组长?">Q1: 怎样联系组长?</a>
</li>
<!-- <li > -->
<li >
<a href="#Q2__怎么快速迁移旧项目?">Q2: 怎么快速迁移旧项目?</a>
<a href="#Q2: 怎么快速迁移旧项目?">Q2: 怎么快速迁移旧项目?</a>
</li>
<!-- <li > -->
<li >
<a href="#Q3__忘记密码怎么办?">Q3: 忘记密码怎么办?</a>
<a href="#Q3: 忘记密码怎么办?">Q3: 忘记密码怎么办?</a>
</li>
<!-- <li > -->
<li >
<a href="#04__发现了_Bug_怎么办?">04: 发现了 Bug 怎么办?</a>
<a href="#04: 发现了 Bug 怎么办?">04: 发现了 Bug 怎么办?</a>
</li>
</ul>

View File

@ -109,7 +109,7 @@
</li>
<li >
<a href="#Bug_Fixed">Bug Fixed</a>
<a href="#Bug Fixed">Bug Fixed</a>
</li>
</ul>
@ -127,7 +127,7 @@
</li>
<li >
<a href="#Bug_Fixed">Bug Fixed</a>
<a href="#Bug Fixed">Bug Fixed</a>
</li>
</ul>
@ -145,7 +145,7 @@
</li>
<li >
<a href="#Bug_Fixed">Bug Fixed</a>
<a href="#Bug Fixed">Bug Fixed</a>
</li>
</ul>
@ -187,7 +187,7 @@
<ul class="nav docs-sidenav-extend" >
<li >
<a href="#Fix_Bug">Fix Bug</a>
<a href="#Fix Bug">Fix Bug</a>
</li>
<li >

View File

@ -71,7 +71,10 @@ body, h1, h2, h3, h4, h5, h6 {
text-align: center;
font-family: 'Dosis', 'Source Sans Pro', 'Helvetica Neue', Arial, sans-serif;
}
.ydoc .ydoc-banner-bg {
background: url(https://ws1.sinaimg.cn/large/006cGJIjly1fl42tf966mj31dr0aqahp.jpg) 0 top repeat-x;
background-color: #232323;
}
.ydoc .ydoc-banner-home .home-desc{
padding: 0 1rem .16rem;
font-weight: normal;
@ -80,16 +83,41 @@ body, h1, h2, h3, h4, h5, h6 {
.logo {
align-items: center;
padding: 0 .24rem;
display: flex;
justify-content: center;
}
.logo .name{
font-size: 50px
.logo .name {
font-size: 50px;
color: #fff;
margin-left: 16px;
-webkit-font-smoothing: antialiased;
}
.ydoc .ydoc-banner-home {
padding: .6rem 0;
}
.ydoc .ydoc-banner-home .home-desc {
color: #fff;
-webkit-font-smoothing: antialiased;
}
.svg {
animation: spin 5s linear infinite;
}
.ydoc-container {
background-color: #fff;
}
.ydoc-container-content {
box-shadow: none;
}
.ydoc-banner-area h1 {
-webkit-font-smoothing: antialiased;
color: #fff;
}
.ydoc .ydoc-banner-bg .desc {
-webkit-font-smoothing: antialiased;
color: #fff;
}
@keyframes spin
{
@ -99,4 +127,4 @@ body, h1, h2, h3, h4, h5, h6 {
to {
transform: rotate(360deg);
}
}
}

View File

@ -63,7 +63,7 @@ module.exports = {
<filter x="-85.4%" y="-68.3%" width="270.7%" height="270.7%" filterUnits="objectBoundingBox" id="filter-3">
<feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset><feGaussianBlur stdDeviation="1.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.159703351 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix></filter></defs><g id="" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="">
<g id="Icon"><circle id="Oval-1" fill="url(#linearGradient-1)" cx="32" cy="32" r="32"></circle><path d="M36.7078009,31.8054514 L36.7078009,51.7110548 C36.7078009,54.2844537 34.6258634,56.3695395 32.0579205,56.3695395 C29.4899777,56.3695395 27.4099998,54.0704461 27.4099998,51.7941246 L27.4099998,31.8061972 C27.4099998,29.528395 29.4909575,27.218453 32.0589004,27.230043 C34.6268432,27.241633 36.7078009,29.528395 36.7078009,31.8054514 Z" id="blue" fill="#2359F1" fill-rule="nonzero"></path><path d="M45.2586091,17.1026914 C45.2586091,17.1026914 45.5657231,34.0524383 45.2345291,37.01141 C44.9033351,39.9703817 43.1767091,41.6667796 40.6088126,41.6667796 C38.040916,41.6667796 35.9609757,39.3676862 35.9609757,37.0913646 L35.9609757,17.1034372 C35.9609757,14.825635 38.0418959,12.515693 40.6097924,12.527283 C43.177689,12.538873 45.2586091,14.825635 45.2586091,17.1026914 Z" id="green" fill="#57CF27" fill-rule="nonzero" transform="translate(40.674608, 27.097010) rotate(60.000000) translate(-40.674608, -27.097010) "></path><path d="M28.0410158,17.0465598 L28.0410158,36.9521632 C28.0410158,39.525562 25.9591158,41.6106479 23.3912193,41.6106479 C20.8233227,41.6106479 18.7433824,39.3115545 18.7433824,37.035233 L18.7433824,17.0473055 C18.7433824,14.7695034 20.8243026,12.4595614 23.3921991,12.4711513 C25.9600956,12.4827413 28.0410158,14.7695034 28.0410158,17.0465598 Z" id="red" fill="#FF561B" fill-rule="nonzero" transform="translate(23.392199, 27.040878) rotate(-60.000000) translate(-23.392199, -27.040878) "></path><g id="inner-round"><use fill="black" fill-opacity="1" filter="url(#filter-3)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#path-2"></use><use fill="#F7F7F7" fill-rule="evenodd" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#path-2"></use></g></g></g></g></svg>
<span class="name">YAPI</span></div>`,
<span class="name"> YApi</span></div>`,
"description": "高效、易用、功能强大的 api 管理平台,旨在为开发、产品、测试人员提供更优雅的接口管理服务。"
},
"content": "./doc/home.md"