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

fix(接口测试): 修复场景报告高级搜索状态和列表页状态不一致的缺陷 

--bug=1025572 --user=王孝刚 【接口测试】报告-场景-高级搜索-状态下拉字段和列表状态下拉字段不一致
https://www.tapd.cn/55049933/s/1364024
This commit is contained in:
wxg0103 2023-04-18 19:27:45 +08:00 committed by 刘瑞斌
parent bc40cee1b4
commit 0e8aea00df
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api-test/frontend/src/business/automation/report/ApiReportList.vue
View File

@ -182,7 +182,7 @@
</template> </template>
<script> <script>
import { getCurrentProjectID } from 'metersphere-frontend/src/utils/token'; import { getCurrentProjectID } from 'metersphere-frontend/src/utils/token';
import { REPORT_CASE_CONFIGS, REPORT_CONFIGS } from 'metersphere-frontend/src/components/search/search-components'; import { REPORT_CASE_CONFIGS, REPORT_SCENARIO_CONFIGS } from 'metersphere-frontend/src/components/search/search-components';
import { _filter, _sort } from 'metersphere-frontend/src/utils/tableUtils'; import { _filter, _sort } from 'metersphere-frontend/src/utils/tableUtils';
import MsRenameReportDialog from 'metersphere-frontend/src/components/report/MsRenameReportDialog'; import MsRenameReportDialog from 'metersphere-frontend/src/components/report/MsRenameReportDialog';
import MsTableColumn from 'metersphere-frontend/src/components/table/MsTableColumn'; import MsTableColumn from 'metersphere-frontend/src/components/table/MsTableColumn';
@ -219,7 +219,7 @@ export default {
reportId: '', reportId: '',
debugVisible: false, debugVisible: false,
condition: { condition: {
components: REPORT_CONFIGS, components: REPORT_SCENARIO_CONFIGS,
}, },
tableData: [], tableData: [],
multipleSelection: [], multipleSelection: [],
@ -496,7 +496,7 @@ export default {
if (tabType === 'right') { if (tabType === 'right') {
this.condition.components = REPORT_CASE_CONFIGS; this.condition.components = REPORT_CASE_CONFIGS;
} else { } else {
this.condition.components = REPORT_CONFIGS; this.condition.components = REPORT_SCENARIO_CONFIGS;
} }
this.loadIsOver = false; this.loadIsOver = false;
this.$nextTick(() => { this.$nextTick(() => {

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

@ -147,13 +147,14 @@ export const STATUS = {
options: [OPERATORS.IN, OPERATORS.NOT_IN] options: [OPERATORS.IN, OPERATORS.NOT_IN]
}, },
options: [ options: [
{label: 'Running', value: 'Running'}, { label: 'Pending', value: 'PENDING' },
{label: 'Success', value: 'Success'}, { label: 'Running', value: 'RUNNING' },
{label: 'Stopped', value: 'stop'}, { label: 'Rerunning', value: 'RERUNNING' },
{label: 'NotExecute', value: 'unexecute'}, { label: 'Success', value: 'SUCCESS' },
{label: 'Error', value: 'Error'}, { label: 'Error', value: 'ERROR' },
{label: "FakeError", value: 'errorReportResult'}, { label: 'FakeError', value: 'FAKE_ERROR' },
{label: 'Rerunning', value: 'Rerunning'}, { label: 'Stopped', value: 'STOPPED' },
], ],
props: { // 尾部控件的props，一般为element ui控件的props props: { // 尾部控件的props，一般为element ui控件的props
multiple: true multiple: true
@ -951,6 +952,8 @@ export const TEST_CONFIGS = [ID, NAME, UPDATE_TIME, CREATE_TIME, STATUS, CREATOR
export const PROJECT_CONFIGS = [NAME, UPDATE_TIME, CREATE_TIME, CREATOR]; export const PROJECT_CONFIGS = [NAME, UPDATE_TIME, CREATE_TIME, CREATOR];
export const REPORT_SCENARIO_CONFIGS = [NAME, TEST_NAME, CREATE_TIME, STATUS, CREATOR, TRIGGER_MODE];
export const REPORT_CONFIGS = [NAME, TEST_NAME, CREATE_TIME, PERFORMANCE_REPORT_STATUS, CREATOR, TRIGGER_MODE]; export const REPORT_CONFIGS = [NAME, TEST_NAME, CREATE_TIME, PERFORMANCE_REPORT_STATUS, CREATOR, TRIGGER_MODE];
export const REPORT_CASE_CONFIGS = [NAME, CREATE_TIME, STATUS, CREATOR, TRIGGER_MODE]; export const REPORT_CASE_CONFIGS = [NAME, CREATE_TIME, STATUS, CREATOR, TRIGGER_MODE];