test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
liqiang-fit2cloud 2022-10-17 10:54:11 +08:00
parent 63302677ce ec3fea3458
commit 7d45a1ad06
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
framework/sdk-parent/frontend/src/components/search/search-components.js
View File

@ -603,12 +603,11 @@ export const PLAN_CASE_STATUS = {
options: [OPERATORS.IN, OPERATORS.NOT_IN]
},
options: [
{label: "test_track.plan.plan_status_prepare", value: "Prepare"},
{label: "api_test.home_page.detail_card.unexecute", value: "Prepare"},
{label: "test_track.plan_view.pass", value: "Pass"},
{label: "test_track.plan_view.failure", value: "Failure"},
{label: "test_track.plan_view.blocking", value: "Blocking"},
{label: "test_track.plan_view.skip", value: "Skip"},
{label: "test_track.plan.plan_status_running", value: "Underway"},
],
props: {
multiple: true

12
test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java
View File

@ -1727,12 +1727,7 @@ public class TestCaseService {
if (StringUtils.isNotBlank(field.getValue())) {
Object value = JSON.parseObject(field.getValue());
Map<String, String> optionMap = customSelectValueMap.get(id);
if (value instanceof String) {
if (MapUtils.isNotEmpty(optionMap) && optionMap.containsKey(value)) {
value = optionMap.get(value);
}
map.put(customNameMap.get(id), value.toString());
} else if (value instanceof List) {
if (value instanceof List) {
List<String> results = new ArrayList<>();
List values = (List) value;
values.forEach(item -> {
@ -1741,6 +1736,11 @@ public class TestCaseService {
}
});
map.put(customNameMap.get(id), results.toString());
} else {
if (MapUtils.isNotEmpty(optionMap) && optionMap.containsKey(value)) {
value = optionMap.get(value);
}
map.put(customNameMap.get(id), value.toString());
}
}
}

2
test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseList.vue
View File

@ -367,7 +367,7 @@ export default {
{text: this.$t('test_track.case.auto'), value: 'auto'}
],
statusFilters: [
{text: this.$t('test_track.plan.plan_status_prepare'), value: 'Prepare'},
{text: this.$t('api_test.home_page.detail_card.unexecute'), value: 'Prepare'},
{text: this.$t('test_track.plan_view.pass'), value: 'Pass'},
{text: this.$t('test_track.plan_view.failure'), value: 'Failure'},
{text: this.$t('test_track.plan_view.blocking'), value: 'Blocking'},