Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
9107a21d
M
metersphere
项目概览
MeterSphere
/
metersphere
上一次同步 大约 3 年
通知
25
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
metersphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9107a21d
编写于
3月 31, 2021
作者:
C
chenjianxing
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8
上级
b68a0a45
ca11ff4b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
29 addition
and
10 deletion
+29
-10
backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
...java/io/metersphere/api/service/ApiAutomationService.java
+4
-1
backend/src/main/java/io/metersphere/excel/listener/TestCaseDataListener.java
...a/io/metersphere/excel/listener/TestCaseDataListener.java
+10
-0
frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
...components/api/definition/components/case/ApiCaseItem.vue
+9
-7
frontend/src/business/components/api/homepage/components/SceneInfoCard.vue
...ness/components/api/homepage/components/SceneInfoCard.vue
+6
-2
未找到文件。
backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
浏览文件 @
9107a21d
...
...
@@ -30,6 +30,7 @@ import io.metersphere.commons.utils.*;
import
io.metersphere.controller.request.ScheduleRequest
;
import
io.metersphere.i18n.Translator
;
import
io.metersphere.job.sechedule.ApiScenarioTestJob
;
import
io.metersphere.job.sechedule.SwaggerUrlImportJob
;
import
io.metersphere.job.sechedule.TestPlanTestJob
;
import
io.metersphere.service.ScheduleService
;
import
io.metersphere.track.dto.TestPlanDTO
;
...
...
@@ -816,7 +817,9 @@ public class ApiAutomationService {
if
(
StringUtils
.
equals
(
request
.
getGroup
(),
ScheduleGroup
.
TEST_PLAN_TEST
.
name
()))
{
scheduleService
.
addOrUpdateCronJob
(
request
,
TestPlanTestJob
.
getJobKey
(
request
.
getResourceId
()),
TestPlanTestJob
.
getTriggerKey
(
request
.
getResourceId
()),
TestPlanTestJob
.
class
);
}
else
{
}
else
if
(
StringUtils
.
equals
(
request
.
getGroup
(),
ScheduleGroup
.
SWAGGER_IMPORT
.
name
())){
scheduleService
.
addOrUpdateCronJob
(
request
,
SwaggerUrlImportJob
.
getJobKey
(
request
.
getResourceId
()),
SwaggerUrlImportJob
.
getTriggerKey
(
request
.
getResourceId
()),
SwaggerUrlImportJob
.
class
);
}
else
{
scheduleService
.
addOrUpdateCronJob
(
request
,
ApiScenarioTestJob
.
getJobKey
(
request
.
getResourceId
()),
ApiScenarioTestJob
.
getTriggerKey
(
request
.
getResourceId
()),
ApiScenarioTestJob
.
class
);
}
...
...
backend/src/main/java/io/metersphere/excel/listener/TestCaseDataListener.java
浏览文件 @
9107a21d
...
...
@@ -67,6 +67,16 @@ public class TestCaseDataListener extends EasyExcelListener<TestCaseExcelData> {
break
;
}
}
//增加字数校验,每一层不能超过100字
for
(
int
i
=
0
;
i
<
nodes
.
length
;
i
++)
{
String
nodeStr
=
nodes
[
i
];
if
(
StringUtils
.
isNotEmpty
(
nodeStr
)){
if
(
nodeStr
.
trim
().
length
()>
100
){
stringBuilder
.
append
(
Translator
.
get
(
"module"
)
+
Translator
.
get
(
"test_track.length_less_than"
)
+
"100:"
+
nodeStr
);
break
;
}
}
}
}
// if (StringUtils.equals(data.getType(), TestCaseConstants.Type.Functional.getValue()) && StringUtils.equals(data.getMethod(), TestCaseConstants.Method.Auto.getValue())) {
...
...
frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
浏览文件 @
9107a21d
...
...
@@ -27,7 +27,7 @@
<i
class=
"icon el-icon-arrow-right"
:class=
"
{'is-active': apiCase.active}" @click="active(apiCase)"/>
<el-input
v-if=
"!apiCase.id || isShowInput"
size=
"small"
v-model=
"apiCase.name"
:name=
"index"
:key=
"index"
class=
"ms-api-header-select"
style=
"width: 180px"
@
blur=
"saveTestCase(apiCase)"
:placeholder=
"$t('commons.input_name')"
ref=
"nameEdit"
/>
@
blur=
"saveTestCase(apiCase
,true
)"
:placeholder=
"$t('commons.input_name')"
ref=
"nameEdit"
/>
<span
v-else
>
{{
apiCase
.
id
?
apiCase
.
name
:
''
}}
<i
class=
"el-icon-edit"
style=
"cursor:pointer"
@
click=
"showInput(apiCase)"
v-tester
/>
...
...
@@ -48,7 +48,7 @@
<el-col
:span=
"4"
>
<div
class=
"tag-item"
@
click.stop
>
<ms-input-tag
:currentScenario=
"apiCase"
ref=
"tag"
@
keyup.enter.native=
"saveTestCase(apiCase)"
/>
<ms-input-tag
:currentScenario=
"apiCase"
ref=
"tag"
@
keyup.enter.native=
"saveTestCase(apiCase
,true
)"
/>
</div>
</el-col>
...
...
@@ -291,7 +291,7 @@
}
});
},
saveCase
(
row
)
{
saveCase
(
row
,
hideAlert
)
{
let
tmp
=
JSON
.
parse
(
JSON
.
stringify
(
row
));
this
.
isShowInput
=
false
;
if
(
this
.
validate
(
tmp
))
{
...
...
@@ -328,16 +328,18 @@
row
.
createTime
=
data
.
createTime
;
row
.
updateTime
=
data
.
updateTime
;
if
(
!
row
.
message
)
{
this
.
$success
(
this
.
$t
(
'
commons.save_success
'
));
this
.
$emit
(
'
refresh
'
);
if
(
!
hideAlert
){
this
.
$success
(
this
.
$t
(
'
commons.save_success
'
));
this
.
$emit
(
'
refresh
'
);
}
}
});
},
saveTestCase
(
row
)
{
saveTestCase
(
row
,
hideAlert
)
{
if
(
this
.
api
.
saved
)
{
this
.
addModule
(
row
);
}
else
{
this
.
saveCase
(
row
);
this
.
saveCase
(
row
,
hideAlert
);
}
},
showInput
(
row
)
{
...
...
frontend/src/business/components/api/homepage/components/SceneInfoCard.vue
浏览文件 @
9107a21d
...
...
@@ -68,7 +68,7 @@
</el-aside>
<el-main
style=
"padding: 0px 0px 0px 0px; line-height: 40px; text-align: center;"
>
<span
v-if=
"interfaceCoverage === 'waitting...'"
>
{{
interfaceCoverage
}}
<i
class=
"el-icon-loading lading-icon"
></i>
</span>
<span
v-else
class=
"rows-count-number"
>
{{
interfaceCoverage
}}
...
...
@@ -161,7 +161,11 @@ export default {
color
:
var
(
--count_number
);
margin
:
20px
auto
;
}
.lading-icon
{
font-size
:
25px
;
color
:
var
(
--count_number
);
font-weight
:
bold
;
}
.main-number-show
{
width
:
100px
;
height
:
100px
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录