Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
5761f433
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
5761f433
编写于
9月 16, 2019
作者:
F
Filipa Lacerda
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Follow up after review
上级
9e618107
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
12 deletion
+8
-12
app/assets/javascripts/jobs/components/log/duration_badge.vue
...assets/javascripts/jobs/components/log/duration_badge.vue
+1
-1
app/assets/javascripts/jobs/components/log/log.vue
app/assets/javascripts/jobs/components/log/log.vue
+1
-1
app/assets/javascripts/jobs/store/utils.js
app/assets/javascripts/jobs/store/utils.js
+6
-9
app/assets/stylesheets/framework/job_log.scss
app/assets/stylesheets/framework/job_log.scss
+0
-1
未找到文件。
app/assets/javascripts/jobs/components/log/duration_badge.vue
浏览文件 @
5761f433
...
...
@@ -9,5 +9,5 @@ export default {
};
</
script
>
<
template
>
<div
class=
"duration rounded align-self-start p
r-2 pl
-2 ml-2 flex-shrink-0"
>
{{
duration
}}
</div>
<div
class=
"duration rounded align-self-start p
x
-2 ml-2 flex-shrink-0"
>
{{
duration
}}
</div>
</
template
>
app/assets/javascripts/jobs/components/log/log.vue
浏览文件 @
5761f433
...
...
@@ -20,7 +20,7 @@ export default {
};
</
script
>
<
template
>
<code
class=
"job-log"
>
<code
class=
"job-log
d-block
"
>
<template
v-for=
"(section, index) in trace"
>
<template
v-if=
"section.isHeader"
>
<log-line-header
...
...
app/assets/javascripts/jobs/store/utils.js
浏览文件 @
5761f433
...
...
@@ -25,6 +25,8 @@ export const parseLine = (line = {}, lineNumber) => ({
export
const
logLinesParser
=
(
lines
=
[],
lineNumberStart
)
=>
lines
.
reduce
((
acc
,
line
,
index
)
=>
{
const
lineNumber
=
lineNumberStart
?
lineNumberStart
+
index
:
index
;
const
last
=
acc
[
acc
.
length
-
1
];
if
(
line
.
section_header
)
{
acc
.
push
({
isClosed
:
true
,
...
...
@@ -32,15 +34,10 @@ export const logLinesParser = (lines = [], lineNumberStart) =>
line
:
parseLine
(
line
,
lineNumber
),
lines
:
[],
});
}
else
if
(
acc
.
length
&&
acc
[
acc
.
length
-
1
].
isHeader
&&
!
line
.
section_duration
&&
line
.
content
.
length
)
{
acc
[
acc
.
length
-
1
].
lines
.
push
(
parseLine
(
line
,
lineNumber
));
}
else
if
(
acc
.
length
&&
acc
[
acc
.
length
-
1
].
isHeader
&&
line
.
section_duration
)
{
acc
[
acc
.
length
-
1
].
section_duration
=
line
.
section_duration
;
}
else
if
(
acc
.
length
&&
last
.
isHeader
&&
!
line
.
section_duration
&&
line
.
content
.
length
)
{
last
.
lines
.
push
(
parseLine
(
line
,
lineNumber
));
}
else
if
(
acc
.
length
&&
last
.
isHeader
&&
line
.
section_duration
)
{
last
.
section_duration
=
line
.
section_duration
;
}
else
if
(
line
.
content
.
length
)
{
acc
.
push
(
parseLine
(
line
,
lineNumber
));
}
...
...
app/assets/stylesheets/framework/job_log.scss
浏览文件 @
5761f433
.job-log
{
font-family
:
$monospace-font
;
display
:
block
;
padding
:
$gl-padding-8
$input-horizontal-padding
;
margin
:
0
0
$gl-padding-8
;
font-size
:
13px
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录