diff --git a/test-track/frontend/src/business/case/components/TestCaseEdit.vue b/test-track/frontend/src/business/case/components/TestCaseEdit.vue
index f58c8467f4..30222b003e 100644
--- a/test-track/frontend/src/business/case/components/TestCaseEdit.vue
+++ b/test-track/frontend/src/business/case/components/TestCaseEdit.vue
@@ -17,7 +17,10 @@
@@ -586,7 +589,8 @@ export default {
createVersionId: null,
editableState: false,
isNameEdit: false,
- useUserStore: {}
+ useUserStore: {},
+ priorityOptions: []
};
},
props: {
@@ -1153,6 +1157,7 @@ export default {
this.testCaseTemplate.customFields.forEach((field) => {
if (field.name === "用例等级") {
field.defaultValue = this.form.priority;
+ this.priorityOptions = field.options;
} else if (field.name === "责任人") {
field.defaultValue = this.form.maintainer;
} else if (field.name === "用例状态") {
diff --git a/test-track/frontend/src/business/case/components/TestCaseList.vue b/test-track/frontend/src/business/case/components/TestCaseList.vue
index 9bd899195b..4ff3e2a5ac 100644
--- a/test-track/frontend/src/business/case/components/TestCaseList.vue
+++ b/test-track/frontend/src/business/case/components/TestCaseList.vue
@@ -202,7 +202,7 @@
+ :value="getCustomFieldValue(scope.row, field, scope.row.priority)" :priority-options="priorityOptions"/>
@@ -488,7 +488,8 @@ export default {
selectCounts: 0,
refreshBySearch: false,
enableVersionColumn: false,
- projectId: ''
+ projectId: '',
+ priorityOptions: []
};
},
props: {
@@ -676,6 +677,7 @@ export default {
}
if (item.name === '用例等级') {
item.columnKey = 'priority';
+ this.priorityOptions = item.options;
} else if (item.name === '责任人') {
item.columnKey = 'maintainer';
} else if (item.name === '用例状态') {
diff --git a/test-track/frontend/src/business/common/tableItems/planview/PriorityTableItem.vue b/test-track/frontend/src/business/common/tableItems/planview/PriorityTableItem.vue
index 211e06def4..3f6839d4e8 100644
--- a/test-track/frontend/src/business/common/tableItems/planview/PriorityTableItem.vue
+++ b/test-track/frontend/src/business/common/tableItems/planview/PriorityTableItem.vue
@@ -13,7 +13,7 @@
{{ value }}
- {{ value }}
+ {{ getPriorityText() }}
@@ -26,7 +26,19 @@
components: {MsTag},
props: {
value: {
- type: String
+ type: String,
+ },
+ priorityOptions: {
+ type: Array,
+ default() {
+ return [];
+ }
+ }
+ },
+ methods: {
+ getPriorityText() {
+ let priorityItem = this.priorityOptions.find(item => item.value === this.value);
+ return priorityItem ? priorityItem.text : '';
}
}
}
diff --git a/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalRelevance.vue b/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalRelevance.vue
index b3c037f7a5..ba6e8466aa 100644
--- a/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalRelevance.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalRelevance.vue
@@ -74,7 +74,7 @@
:label="$t('test_track.case.priority')"
width="120px">
-
+
@@ -185,7 +185,8 @@ export default {
],
versionFilters: null,
testCaseTemplate: {},
- pageRefresh: false
+ pageRefresh: false,
+ priorityOptions: []
};
},
props: {
@@ -328,6 +329,11 @@ export default {
getTestTemplate(projectId).then(data => {
this.testCaseTemplate = data;
this.page.condition.components = initTestCaseConditionComponents(this.page.condition, this.testCaseTemplate.customFields);
+ this.testCaseTemplate.customFields.forEach(item => {
+ if (item.name === '用例等级') {
+ this.priorityOptions = item.options;
+ }
+ });
});
},
getTagToolTips(tags) {
diff --git a/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseList.vue b/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseList.vue
index 61547610e8..86c637665b 100644
--- a/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseList.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseList.vue
@@ -82,7 +82,10 @@
min-width="120px"
:label="$t('test_track.case.priority')">
-
+
@@ -241,7 +244,7 @@
+ :value="getCustomFieldValue(scope.row, field)" :priority-options="priorityOptions"/>
{{ getCustomFieldValue(scope.row, field, scope.row.status) }}
@@ -414,7 +417,8 @@ export default {
},
selectDataRange: "all",
testCaseTemplate: {},
- versionFilters: []
+ versionFilters: [],
+ priorityOptions: []
};
},
props: {
@@ -574,6 +578,11 @@ export default {
Promise.all([p1, p2]).then((data) => {
let template = data[1];
this.testCaseTemplate = template;
+ this.testCaseTemplate.customFields.forEach(item => {
+ if (item.name === '用例等级') {
+ this.priorityOptions = item.options;
+ }
+ });
this.testCaseTemplate.customFields = this.testCaseTemplate.customFields.filter(item => item.name === '用例状态' && item.system);
this.fields = getTableHeaderWithCustomFields(this.tableHeaderKey, this.testCaseTemplate.customFields);
let comp = getAdvSearchCustomField(this.condition, this.testCaseTemplate.customFields);