fix: 服务端测试页面样式调整

This commit is contained in:
gaoxiaolin.gao 2018-07-19 15:49:47 +08:00
parent d8571f07c9
commit 2a978f8141
4 changed files with 63 additions and 73 deletions

View File

@ -133,6 +133,7 @@ class userController extends baseController {
*/
async getLdapAuth(ctx) {
try {
const { email, password } = ctx.request.body;
// const username = email.split(/\@/g)[0];
const { info: ldapInfo } = await ldap.ldapQuery(email, password);
@ -204,7 +205,7 @@ class userController extends baseController {
return true;
} catch (e) {
console.error('third_login:', e.message); // eslint-disable-line
throw new Error(`third_login: ${e.message}`)
throw new Error(`third_login: ${e.message}`);
return false;
}
}

View File

@ -37,7 +37,7 @@ blockquote {
background: rgba(0, 0, 0, 0.2);
}
body {
.yapi-run-auto-test {
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", SimSun, sans-serif;
font-size: 13px;
line-height: 25px;
@ -45,41 +45,41 @@ body {
position: relative;
}
table {
.yapi-run-auto-test table {
margin: 10px 0 15px 0;
border-collapse: collapse;
}
td,
.yapi-run-auto-test td,
th {
border: 1px solid #ddd;
padding: 3px 10px;
}
th {
.yapi-run-auto-test th {
padding: 5px 10px;
}
a, a:link, a:visited {
.yapi-run-auto-test a, a:link, a:visited {
color: #34495e;
text-decoration: none;
}
a:hover, a:focus {
.yapi-run-auto-test a:hover, a:focus {
color: #59d69d;
text-decoration: none;
}
a img {
.yapi-run-auto-test a img {
border: none;
}
p {
.yapi-run-auto-test p {
padding-left: 10px;
margin-bottom: 9px;
}
h1,
.yapi-run-auto-test h1,
h2,
h3,
h4,
@ -89,7 +89,7 @@ h6 {
line-height: 36px;
}
h1 {
.yapi-run-auto-test h1 {
color: #2c3e50;
font-weight: 600;
font-size: 32px;
@ -97,13 +97,13 @@ h1 {
line-height: 50px;
}
h2 {
.yapi-run-auto-test h2 {
font-size: 28px;
padding-top: 10px;
padding-bottom: 10px;
}
h3 {
.yapi-run-auto-test h3 {
clear: both;
font-weight: 400;
margin-top: 20px;
@ -113,39 +113,39 @@ h3 {
font-size: 18px;
}
h4 {
.yapi-run-auto-test h4 {
font-size: 16px;
}
h5 {
.yapi-run-auto-test h5 {
font-size: 14px;
}
h6 {
.yapi-run-auto-test h6 {
font-size: 13px;
}
hr {
.yapi-run-auto-test hr {
margin: 0 0 19px;
border: 0;
border-bottom: 1px solid #ccc;
}
blockquote {
.yapi-run-auto-test blockquote {
padding: 13px 13px 21px 15px;
margin-bottom: 18px;
font-family: georgia, serif;
font-style: italic;
}
blockquote:before {
.yapi-run-auto-test blockquote:before {
font-size: 40px;
margin-left: -10px;
font-family: georgia, serif;
color: #eee;
}
blockquote p {
.yapi-run-auto-test blockquote p {
font-size: 14px;
font-weight: 300;
line-height: 18px;
@ -153,12 +153,12 @@ blockquote p {
font-style: italic;
}
code,
.yapi-run-auto-test code,
pre {
font-family: Monaco, Andale Mono, Courier New, monospace;
}
code {
.yapi-run-auto-test code {
background-color: #fee9cc;
color: rgba(0, 0, 0, 0.75);
padding: 1px 3px;
@ -168,7 +168,7 @@ code {
border-radius: 3px;
}
pre {
.yapi-run-auto-test pre {
display: block;
padding: 14px;
margin: 0 0 18px;
@ -180,14 +180,14 @@ pre {
overflow-x: auto;
}
pre code {
.yapi-run-auto-test pre code {
background-color: #f6f6f6;
color: #737373;
font-size: 11px;
padding: 0;
}
sup {
.yapi-run-auto-test sup {
font-size: 0.83em;
vertical-align: super;
line-height: 0;
@ -220,7 +220,7 @@ body {
height: 100%;
}
.menu-left {
.yapi-run-auto-test .menu-left {
position: fixed;
top: 61px;
left: 0;
@ -230,7 +230,7 @@ body {
width: 260px;
}
.menu-left > .list-content {
.yapi-run-auto-test .menu-left > .list-content {
overflow: auto;
margin: 0px;
box-sizing: border-box;
@ -240,7 +240,7 @@ body {
padding: 16px 8px 0 20px;
}
.list {
.yapi-run-auto-test .list {
padding: 2px 0px;
text-decoration: none;
font-size: 14px;
@ -249,29 +249,29 @@ body {
}
.content-right {
.yapi-run-auto-test .content-right {
max-width: 700px;
margin-left: 290px;
padding-left: 70px;
flex-grow: 1;
}
.content-right h2:target {
.yapi-run-auto-test .content-right h2:target {
padding-top: 80px;
}
body > p {
.yapi-run-auto-test > p {
margin-left: 30px;
}
body > table {
.yapi-run-auto-test > table {
margin-left: 30px;
}
body > pre {
.yapi-run-auto-test > pre {
margin-left: 30px;
}
.curProject {
.yapi-run-auto-test .curProject {
position: fixed;
top: 20px;
font-size: 25px;
@ -283,17 +283,17 @@ body > pre {
box-sizing: border-box;
}
.g-doc {
.yapi-run-auto-test .g-doc {
margin-top: 56px;
padding-top: 24px;
display: flex;
}
.curproject-name {
.yapi-run-auto-test .curproject-name {
font-size: 42px;
}
.m-header {
.yapi-run-auto-test .m-header {
background: #32363a;
height: 56px;
line-height: 56px;
@ -306,7 +306,7 @@ body > pre {
left: 0;
right: 0;
}
.m-header .title {
.yapi-run-auto-test .m-header .title {
font-size: 22px;
color: #fff;
font-weight: normal;
@ -317,29 +317,29 @@ body > pre {
line-height: 56px;
border: none;
}
.m-header .nav {
.yapi-run-auto-test .m-header .nav {
color: #fff;
font-size: 16px;
position: absolute;
right: 32px;
top: 0;
}
.m-header .nav a {
.yapi-run-auto-test .m-header .nav a {
color: #fff;
margin-left: 16px;
padding: 8px;
transition: color .2s;
}
.m-header .nav a:hover {
.yapi-run-auto-test .m-header .nav a:hover {
color: #59d69d;
}
.m-footer {
.yapi-run-auto-test .m-footer {
border-top: 1px solid #ddd;
padding-top: 16px;
padding-bottom: 16px;
}
.row{
.yapi-run-auto-test .row{
position: relative;
height: auto;
zoom: 1;
@ -347,30 +347,30 @@ body > pre {
box-sizing: border-box;
}
.case-report {
.yapi-run-auto-test .case-report {
margin: 10px;
display: flex;
}
.case-report .case-report-title {
.yapi-run-auto-test .case-report .case-report-title {
font-size: 14px;
text-align: right;
padding-right: 20px;
}
.col-3 {
.yapi-run-auto-test .col-3 {
display: block;
box-sizing: border-box;
width: 12.5%;
}
.col-21 {
.yapi-run-auto-test .col-21 {
display: block;
box-sizing: border-box;
width: 87.5%;
}
.icon {
.yapi-run-auto-test .icon {
display: inline-block;
font-style: normal;
vertical-align: baseline;
@ -383,36 +383,36 @@ body > pre {
font-weight: 700;
}
.icon-check-circle:before {
.yapi-run-auto-test .icon-check-circle:before {
content: "\2713";
}
.icon-close-circle:before {
.yapi-run-auto-test .icon-close-circle:before {
content: "\2715";
}
.icon-warning-circle:before {
.yapi-run-auto-test .icon-warning-circle:before {
content: "!";
}
.icon:before {
.yapi-run-auto-test .icon:before {
display: block;
font-family: "anticon" !important;
}
.summary {
.yapi-run-auto-test .summary {
border-bottom: 1px solid #ddd;
padding-bottom: 8px;
font-size: 18px;
}
.success{
.yapi-run-auto-test .success{
color: #208054;
font-weight: 700;
}
.status {
.yapi-run-auto-test .status {
flex-shrink: 0;
margin: 0 5px;
width: 20px;
@ -425,19 +425,17 @@ body > pre {
align-items: center;
}
.status-ok {
.yapi-run-auto-test .status-ok {
background-color: #17c5a6;
}
.status-ok:hover {
}
.status-ko {
.yapi-run-auto-test .status-ko {
background-color: #fd3c3c;
}
.status-warning {
.yapi-run-auto-test .status-warning {
background-color: #ffb74c;
}

View File

@ -37,8 +37,8 @@ function createHtml5(left, tp, msg, runTime) {
message += `<div>一共 <span class="success">${msg.successNum}</span> 测试用例, 全部验证通过(${runTime})</div>`
} else{
message += `<div>一共 ${msg.len} 测试用例,<span class="success"> ${msg.successNum}</span> 个验证通过, ${msg.failedNum} 个未通过(${runTime})</div>`
}
}
//html5模板
let html = `<!DOCTYPE html>
@ -48,7 +48,7 @@ function createHtml5(left, tp, msg, runTime) {
<meta charset="utf-8" />
${defaultTheme}
</head>
<body>
<body class="yapi-run-auto-test">
<div class="m-header">
<a href="#" style="display: inherit;"><svg class="svg" width="32px" height="32px" viewBox="0 0 64 64" version="1.1"><title>Icon</title><desc>Created with Sketch.</desc><defs><linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1"><stop stop-color="#FFFFFF" offset="0%"></stop><stop stop-color="#F2F2F2" offset="100%"></stop></linearGradient><circle id="path-2" cx="31.9988602" cy="31.9988602" r="2.92886048"></circle><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></a>
<a href="#"><h1 class="title">YAPI 测试结果文档</h1></a>

View File

@ -191,15 +191,6 @@ module.exports = {
loader: 'json-loader'
});
baseConfig.module.preLoaders.push({
test: /\.(gif|jpg|jpeg|png|woff|woff2|eot|ttf|svg)(\?v=.+)?$/,
loader: 'url-loader',
options: {
limit: 20480,
name: ['[path][name].[ext]?[sha256:hash:base64:8]']
}
});
if (this.env == 'prd') {
baseConfig.plugins.push(assetsPluginInstance);
baseConfig.plugins.push(compressPlugin);