Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
8f09b254
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,发现更多精彩内容 >>
提交
8f09b254
编写于
4月 24, 2020
作者:
C
chenjianxing
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix bug
上级
6705bd98
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
36 addition
and
29 deletion
+36
-29
backend/src/main/java/io/metersphere/excel/listener/TestCaseDataListener.java
...a/io/metersphere/excel/listener/TestCaseDataListener.java
+4
-4
backend/src/main/java/io/metersphere/service/TestCaseService.java
...src/main/java/io/metersphere/service/TestCaseService.java
+5
-3
frontend/src/business/components/common/components/MsTableOperator.vue
...business/components/common/components/MsTableOperator.vue
+3
-3
frontend/src/business/components/common/components/MsTableOperatorButton.vue
...ss/components/common/components/MsTableOperatorButton.vue
+5
-5
frontend/src/business/components/track/case/components/TestCaseEdit.vue
...usiness/components/track/case/components/TestCaseEdit.vue
+19
-14
未找到文件。
backend/src/main/java/io/metersphere/excel/listener/TestCaseDataListener.java
浏览文件 @
8f09b254
...
...
@@ -23,15 +23,15 @@ public class TestCaseDataListener extends EasyExcelListener<TestCaseExcelData> {
Set
<
String
>
testCaseNames
;
Set
<
String
>
user
Name
s
;
Set
<
String
>
user
Id
s
;
public
TestCaseDataListener
(
TestCaseService
testCaseService
,
String
projectId
,
Set
<
String
>
testCaseNames
,
Set
<
String
>
user
Name
s
,
Class
<
TestCaseExcelData
>
clazz
)
{
Set
<
String
>
testCaseNames
,
Set
<
String
>
user
Id
s
,
Class
<
TestCaseExcelData
>
clazz
)
{
super
(
clazz
);
this
.
testCaseService
=
testCaseService
;
this
.
projectId
=
projectId
;
this
.
testCaseNames
=
testCaseNames
;
this
.
user
Names
=
userName
s
;
this
.
user
Ids
=
userId
s
;
}
@Override
...
...
@@ -44,7 +44,7 @@ public class TestCaseDataListener extends EasyExcelListener<TestCaseExcelData> {
if
(
nodePath
.
trim
().
contains
(
" "
))
{
stringBuilder
.
append
(
"所属模块不能包含空格"
);
}
if
(!
user
Name
s
.
contains
(
data
.
getMaintainer
()))
{
if
(!
user
Id
s
.
contains
(
data
.
getMaintainer
()))
{
stringBuilder
.
append
(
"该工作空间下无该用户:"
+
data
.
getMaintainer
()
+
";"
);
}
if
(
testCaseNames
.
contains
(
data
.
getName
()))
{
...
...
backend/src/main/java/io/metersphere/service/TestCaseService.java
浏览文件 @
8f09b254
...
...
@@ -16,6 +16,7 @@ import io.metersphere.excel.domain.TestCaseExcelData;
import
io.metersphere.excel.listener.EasyExcelListener
;
import
io.metersphere.excel.listener.TestCaseDataListener
;
import
io.metersphere.excel.utils.EasyExcelUtil
;
import
io.metersphere.user.SessionUser
;
import
io.metersphere.user.SessionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.ibatis.session.ExecutorType
;
...
...
@@ -181,10 +182,10 @@ public class TestCaseService {
UserExample
userExample
=
new
UserExample
();
userExample
.
createCriteria
().
andLastWorkspaceIdEqualTo
(
currentWorkspaceId
);
List
<
User
>
users
=
userMapper
.
selectByExample
(
userExample
);
Set
<
String
>
user
Names
=
users
.
stream
().
map
(
User:
:
getName
).
collect
(
Collectors
.
toSet
());
Set
<
String
>
user
Ids
=
users
.
stream
().
map
(
User:
:
getId
).
collect
(
Collectors
.
toSet
());
EasyExcelListener
easyExcelListener
=
new
TestCaseDataListener
(
this
,
projectId
,
testCaseNames
,
user
Name
s
,
TestCaseExcelData
.
class
);
testCaseNames
,
user
Id
s
,
TestCaseExcelData
.
class
);
EasyExcelFactory
.
read
(
file
.
getInputStream
(),
TestCaseExcelData
.
class
,
easyExcelListener
).
sheet
().
doRead
();
List
<
ExcelErrData
<
TestCaseExcelData
>>
errList
=
easyExcelListener
.
getErrList
();
...
...
@@ -228,6 +229,7 @@ public class TestCaseService {
StringBuilder
path
=
new
StringBuilder
(
""
);
List
<
String
>
types
=
Arrays
.
asList
(
"functional"
,
"performance"
,
"api"
);
List
<
String
>
methods
=
Arrays
.
asList
(
"manual"
,
"auto"
);
SessionUser
user
=
SessionUtils
.
getUser
();
for
(
int
i
=
1
;
i
<=
5
;
i
++)
{
TestCaseExcelData
data
=
new
TestCaseExcelData
();
data
.
setName
(
"测试用例"
+
i
);
...
...
@@ -239,7 +241,7 @@ public class TestCaseService {
data
.
setPrerequisite
(
"前置条件选填"
);
data
.
setStepDesc
(
"1. 每个步骤以换行分隔\n2. 步骤前可标序号\n3. 测试步骤和结果选填"
);
data
.
setStepResult
(
"1. 每条结果以换行分隔\n2. 结果前可标序号\n3. 测试步骤和结果选填"
);
data
.
setMaintainer
(
"admin"
);
data
.
setMaintainer
(
user
.
getId
()
);
data
.
setRemark
(
"备注选填"
);
list
.
add
(
data
);
}
...
...
frontend/src/business/components/common/components/MsTableOperator.vue
浏览文件 @
8f09b254
<
template
>
<span>
<ms-table-operator-button
icon=
"el-icon-edit"
@
click
=
"editClick"
@
click.stop=
"editClickStop"
/>
:exec
=
"editClick"
@
click.stop=
"editClickStop"
/>
<ms-table-operator-button
icon=
"el-icon-delete"
type=
"danger"
@
click=
"delet
Click"
@
click.stop=
"deleteClickStop"
/>
:exec=
"delete
Click"
@
click.stop=
"deleteClickStop"
/>
</span>
</
template
>
...
...
@@ -20,7 +20,7 @@
editClickStop
()
{
this
.
$emit
(
'
editClickStop
'
);
},
deletClick
()
{
delet
e
Click
()
{
this
.
$emit
(
'
deleteClick
'
);
},
deleteClickStop
()
{
...
...
frontend/src/business/components/common/components/MsTableOperatorButton.vue
浏览文件 @
8f09b254
<
template
>
<el-button
@
click=
"
click
"
<el-button
@
click=
"
exec
"
@
click.stop=
"clickStop"
:type=
"type"
:icon=
"icon"
size=
"mini"
circle
/
>
:icon=
"icon"
size=
"mini"
circle
></el-button
>
</
template
>
<
script
>
...
...
@@ -17,12 +17,12 @@
type
:
{
type
:
String
,
default
:
'
primary
'
},
exec
:
{
type
:
Function
}
},
methods
:
{
click
()
{
this
.
$emit
(
'
click
'
);
},
clickStop
()
{
this
.
$emit
(
'
clickStop
'
);
}
...
...
frontend/src/business/components/track/case/components/TestCaseEdit.vue
浏览文件 @
8f09b254
...
...
@@ -319,22 +319,27 @@
}
},
resetForm
()
{
//防止点击修改后,点击新建触发校验
if
(
this
.
$refs
[
'
caseFrom
'
])
{
this
.
$refs
[
'
caseFrom
'
].
resetFields
();
this
.
$refs
[
'
caseFrom
'
].
validate
((
valid
)
=>
{
this
.
$refs
[
'
caseFrom
'
].
resetFields
();
this
.
form
.
name
=
''
;
this
.
form
.
module
=
''
;
this
.
form
.
type
=
''
;
this
.
form
.
method
=
''
;
this
.
form
.
maintainer
=
''
;
this
.
form
.
priority
=
''
;
this
.
form
.
prerequisite
=
''
;
this
.
form
.
remark
=
''
;
this
.
form
.
steps
=
[{
num
:
1
,
desc
:
''
,
result
:
''
}];
return
true
;
});
}
this
.
form
.
name
=
''
;
this
.
form
.
module
=
''
;
this
.
form
.
type
=
''
;
this
.
form
.
method
=
''
;
this
.
form
.
maintainer
=
''
;
this
.
form
.
priority
=
''
;
this
.
form
.
prerequisite
=
''
;
this
.
form
.
remark
=
''
;
this
.
form
.
steps
=
[{
num
:
1
,
desc
:
''
,
result
:
''
}];
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录