Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
xiaofang li
MeterSphere
Commits
97f9c3d5
Commit
97f9c3d5
authored
3 years ago
by
chenjianxing
Browse files
Options
Download
Email Patches
Plain Diff
fix: 测试计划关联用例全选失效
parent
8771f820
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
backend/src/main/java/io/metersphere/api/dto/automation/parse/MsScenarioParser.java
+4
-1
...etersphere/api/dto/automation/parse/MsScenarioParser.java
frontend/src/business/components/common/components/table/MsTable.vue
+2
-0
...c/business/components/common/components/table/MsTable.vue
frontend/src/business/components/track/case/components/StepChangeItem.vue
+6
-3
...iness/components/track/case/components/StepChangeItem.vue
frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
+1
-1
...plan/view/comonents/functional/FunctionalTestCaseEdit.vue
frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
+1
-1
...s/track/review/view/components/TestReviewTestCaseEdit.vue
with
14 additions
and
6 deletions
+14
-6
backend/src/main/java/io/metersphere/api/dto/automation/parse/MsScenarioParser.java
+
4
-
1
View file @
97f9c3d5
...
...
@@ -89,7 +89,10 @@ public class MsScenarioParser extends MsAbstractParser<ScenarioImport> {
if
(
CollectionUtils
.
isNotEmpty
(
hashTree
))
{
for
(
int
i
=
0
;
i
<
hashTree
.
size
();
i
++)
{
JSONObject
object
=
(
JSONObject
)
hashTree
.
get
(
i
);
object
.
put
(
"referenced"
,
"Copy"
);
String
referenced
=
object
.
getString
(
"referenced"
);
if
(
StringUtils
.
isNotBlank
(
referenced
)
&&
StringUtils
.
equals
(
referenced
,
"REF"
))
{
object
.
put
(
"referenced"
,
"Copy"
);
}
if
(
CollectionUtils
.
isNotEmpty
(
object
.
getJSONArray
(
"hashTree"
)))
{
setCopy
(
object
.
getJSONArray
(
"hashTree"
));
}
...
...
This diff is collapsed.
Click to expand it.
frontend/src/business/components/common/components/table/MsTable.vue
+
2
-
0
View file @
97f9c3d5
...
...
@@ -168,6 +168,7 @@ export default {
_handleSelectAll
(
this
,
selection
,
this
.
data
,
this
.
selectRows
);
setUnSelectIds
(
this
.
data
,
this
.
condition
,
this
.
selectRows
);
this
.
selectDataCounts
=
getSelectDataCounts
(
this
.
condition
,
this
.
total
,
this
.
selectRows
);
this
.
selectIds
=
Array
.
from
(
this
.
selectRows
).
map
(
o
=>
o
.
id
);
},
handleSelect
(
selection
,
row
)
{
_handleSelect
(
this
,
selection
,
row
,
this
.
selectRows
);
...
...
@@ -185,6 +186,7 @@ export default {
this
.
condition
.
unSelectIds
=
[];
//更新统计信息
this
.
selectDataCounts
=
getSelectDataCounts
(
this
.
condition
,
this
.
total
,
this
.
selectRows
);
this
.
selectIds
=
Array
.
from
(
this
.
selectRows
).
map
(
o
=>
o
.
id
);
},
headerDragend
(
newWidth
,
oldWidth
,
column
,
event
)
{
// let finalWidth = newWidth;
...
...
This diff is collapsed.
Click to expand it.
frontend/src/business/components/track/case/components/StepChangeItem.vue
+
6
-
3
View file @
97f9c3d5
...
...
@@ -5,11 +5,11 @@
{{
$t
(
'
test_track.case.change_type
'
)
}}
<i
class=
"el-icon-arrow-down el-icon--right"
/>
</span>
<el-dropdown-menu>
<el-dropdown-item
command=
"STEP"
>
<el-dropdown-item
:disabled=
"disable"
command=
"STEP"
>
<div>
{{
$t
(
'
test_track.case.step_describe
'
)
}}
</div>
<!--
<div>
{{
$t
(
'
test_track.case.step_describe_tip
'
)
}}
</div>
-->
</el-dropdown-item>
<el-dropdown-item
command=
"TEXT"
>
<el-dropdown-item
:disabled=
"disable"
command=
"TEXT"
>
<div>
{{
$t
(
'
test_track.case.text_describe
'
)
}}
</div>
<!--
<div>
{{
$t
(
'
test_track.case.text_describe_tip
'
)
}}
</div>
-->
</el-dropdown-item>
...
...
@@ -21,7 +21,7 @@
<
script
>
export
default
{
name
:
"
StepChangeItem
"
,
props
:
[
'
form
'
,
'
labelWidth
'
],
props
:
[
'
form
'
,
'
labelWidth
'
,
'
disable
'
],
created
()
{
if
(
!
this
.
form
.
stepModel
)
{
this
.
form
.
stepModel
=
"
STEP
"
;
...
...
@@ -29,6 +29,9 @@ export default {
},
methods
:
{
handleCommand
(
value
)
{
if
(
this
.
disable
)
{
return
;
}
this
.
form
.
stepModel
=
value
;
}
}
...
...
This diff is collapsed.
Click to expand it.
frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
+
1
-
1
View file @
97f9c3d5
...
...
@@ -77,7 +77,7 @@
</el-form>
<form-rich-text-item
:label-width=
"formLabelWidth"
:disabled=
"true"
:title=
"$t('test_track.case.prerequisite')"
:data=
"testCase"
prop=
"prerequisite"
/>
<step-change-item
:label-width=
"formLabelWidth"
:form=
"testCase"
/>
<step-change-item
:disable=
"true"
:label-width=
"formLabelWidth"
:form=
"testCase"
/>
<test-plan-case-step-results-item
:label-width=
"formLabelWidth"
:is-read-only=
"isReadOnly"
v-if=
"testCase.stepModel === 'STEP'"
:test-case=
"testCase"
/>
<form-rich-text-item
:label-width=
"formLabelWidth"
v-if=
"testCase.stepModel === 'TEXT'"
:disabled=
"true"
:title=
"$t('test_track.case.step_desc')"
:data=
"testCase"
prop=
"stepDescription"
/>
<form-rich-text-item
:label-width=
"formLabelWidth"
v-if=
"testCase.stepModel === 'TEXT'"
:disabled=
"true"
:title=
"$t('test_track.case.expected_results')"
:data=
"testCase"
prop=
"expectedResult"
/>
...
...
This diff is collapsed.
Click to expand it.
frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
+
1
-
1
View file @
97f9c3d5
...
...
@@ -92,7 +92,7 @@
<form-rich-text-item
:label-width=
"formLabelWidth"
:disabled=
"true"
:title=
"$t('test_track.case.prerequisite')"
:data=
"testCase"
prop=
"prerequisite"
/>
<step-change-item
:label-width=
"formLabelWidth"
:form=
"testCase"
/>
<step-change-item
:disable=
"true"
:label-width=
"formLabelWidth"
:form=
"testCase"
/>
<form-rich-text-item
:label-width=
"formLabelWidth"
:disabled=
"true"
v-if=
"testCase.stepModel === 'TEXT'"
:title=
"$t('test_track.case.step_desc')"
:data=
"testCase"
prop=
"stepDescription"
/>
<form-rich-text-item
:label-width=
"formLabelWidth"
:disabled=
"true"
v-if=
"testCase.stepModel === 'TEXT'"
:title=
"$t('test_track.case.expected_results')"
:data=
"testCase"
prop=
"expectedResult"
/>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help