fix(测试跟踪): 关联UI及场景用例弹窗左侧模块树筛选问题
--bug=1025458 --user=宋昌昌 【测试跟踪】-测试用例-编辑用例-关联UI/场景用例-筛选用例-模块树数量显示不变 https://www.tapd.cn/55049933/s/1363349
This commit is contained in:
parent
76f078e12d
commit
6fc1763bc3
|
@ -6,3 +6,7 @@ export function apiAutomationModuleProjectList(projectId) {
|
|||
return get(BASE_URL + `list/${projectId}`);
|
||||
}
|
||||
|
||||
export function getAutomationModuleListByParam(projectId, params) {
|
||||
return post(BASE_URL + `list/${projectId}`, params);
|
||||
}
|
||||
|
||||
|
|
|
@ -5,3 +5,7 @@ const BASE_URL = '/ui/scenario/module/';
|
|||
export function uiScenarioModuleProjectList(projectId) {
|
||||
return get(BASE_URL + `list/${projectId}`);
|
||||
}
|
||||
|
||||
export function getUiScenarioModuleListByCondition(projectId, type, params) {
|
||||
return post(BASE_URL + `list/${projectId}/${type}`, params);
|
||||
}
|
||||
|
|
|
@ -41,7 +41,7 @@ import MsNodeTree from "metersphere-frontend/src/components/new-ui/MsNodeTree";
|
|||
import { buildTree } from "metersphere-frontend/src/model/NodeTree";
|
||||
import MsSearchBar from "metersphere-frontend/src/components/search/MsSearchBar";
|
||||
import { getCurrentProjectID } from "@/business/utils/sdk-utils";
|
||||
import { apiAutomationModuleProjectList } from "@/api/remote/api/api-automation-module";
|
||||
import { getAutomationModuleListByParam } from "@/api/remote/api/api-automation-module";
|
||||
import { apiAutomationModulePlanList } from "@/api/remote/plan/test-plan-scenario";
|
||||
|
||||
export default {
|
||||
|
@ -75,6 +75,7 @@ export default {
|
|||
return getCurrentProjectID();
|
||||
},
|
||||
},
|
||||
caseCondition: Object
|
||||
},
|
||||
computed: {
|
||||
isPlanModel() {
|
||||
|
@ -132,13 +133,12 @@ export default {
|
|||
this.getData(response);
|
||||
});
|
||||
} else if (this.isRelevanceModel) {
|
||||
apiAutomationModuleProjectList(this.relevanceProjectId).then(
|
||||
(response) => {
|
||||
getAutomationModuleListByParam(this.relevanceProjectId, this.caseCondition).then((response) => {
|
||||
this.getData(response);
|
||||
}
|
||||
);
|
||||
} else {
|
||||
apiAutomationModuleProjectList(projectId).then((response) => {
|
||||
getAutomationModuleListByParam(projectId, this.caseCondition).then((response) => {
|
||||
this.getData(response);
|
||||
});
|
||||
}
|
||||
|
@ -176,7 +176,7 @@ export default {
|
|||
this.getNohupReloadData(response, selectNodeId);
|
||||
});
|
||||
} else if (this.isRelevanceModel) {
|
||||
apiAutomationModuleProjectList(this.relevanceProjectId).then(
|
||||
getAutomationModuleListByParam(this.relevanceProjectId, this.caseCondition).then(
|
||||
(response) => {
|
||||
this.getNohupReloadData(response, selectNodeId);
|
||||
}
|
||||
|
|
|
@ -179,6 +179,7 @@ export default {
|
|||
testCaseId: String,
|
||||
},
|
||||
created: function () {
|
||||
this.$emit('setCondition', this.condition);
|
||||
this.getVersionOptions();
|
||||
this.initTable();
|
||||
},
|
||||
|
@ -216,6 +217,7 @@ export default {
|
|||
}
|
||||
this.condition.notInIds = this.notInIds;
|
||||
this.condition.testCaseId = this.testCaseId;
|
||||
this.$emit('setCondition', this.condition);
|
||||
getTestCaseRelevanceScenarioList(
|
||||
this.currentPage,
|
||||
this.pageSize,
|
||||
|
|
|
@ -123,10 +123,8 @@ import MsSingleTag from "metersphere-frontend/src/components/new-ui/MsSingleTag"
|
|||
import { TEST_CASE_RELEVANCE_API_CASE_CONFIGS } from "metersphere-frontend/src/components/search/search-components";
|
||||
import { getVersionFilters } from "@/business/utils/sdk-utils";
|
||||
import MxVersionSelect from "metersphere-frontend/src/components/version/MxVersionSelect";
|
||||
import {
|
||||
getTestCaseRelevanceScenarioList,
|
||||
getTestCaseRelevanceUiScenarioList,
|
||||
} from "@/api/testCase";
|
||||
import { getTestCaseRelevanceUiScenarioList } from "@/api/testCase";
|
||||
import {getCurrentProjectID} from "metersphere-frontend/src/utils/token";
|
||||
import {getTagToolTips, parseColumnTag} from "@/business/case/test-case";
|
||||
|
||||
export default {
|
||||
|
@ -177,6 +175,7 @@ export default {
|
|||
testCaseId: String,
|
||||
},
|
||||
created: function () {
|
||||
this.$emit('setCondition', this.condition);
|
||||
this.getVersionOptions();
|
||||
this.initTable();
|
||||
},
|
||||
|
@ -216,6 +215,7 @@ export default {
|
|||
|
||||
this.condition.notInIds = this.notInIds;
|
||||
this.condition.testCaseId = this.testCaseId;
|
||||
this.$emit('setCondition', this.condition);
|
||||
getTestCaseRelevanceUiScenarioList(
|
||||
this.currentPage,
|
||||
this.pageSize,
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
@setModuleOptions="setModuleOptions"
|
||||
@enableTrash="false"
|
||||
:is-read-only="true"
|
||||
:case-condition="condition"
|
||||
ref="nodeTree"
|
||||
/>
|
||||
</template>
|
||||
|
@ -25,6 +26,7 @@
|
|||
:versionEnable="versionEnable"
|
||||
:test-case-id="caseId"
|
||||
@selectCountChange="setSelectCounts"
|
||||
@setCondition="setCondition"
|
||||
ref="apiCaseList"
|
||||
/>
|
||||
</test-case-relevance-base>
|
||||
|
@ -110,6 +112,10 @@ export default {
|
|||
setSelectCounts(data) {
|
||||
this.$refs.baseRelevance.selectCounts = data;
|
||||
},
|
||||
setCondition(data) {
|
||||
this.condition = data;
|
||||
this.$refs.nodeTree.list(this.projectId);
|
||||
}
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
@setModuleOptions="setModuleOptions"
|
||||
@enableTrash="false"
|
||||
:is-read-only="true"
|
||||
:case-condition="condition"
|
||||
ref="nodeTree"
|
||||
/>
|
||||
</template>
|
||||
|
@ -25,6 +26,7 @@
|
|||
:versionEnable="versionEnable"
|
||||
:test-case-id="caseId"
|
||||
@selectCountChange="setSelectCounts"
|
||||
@setCondition="setCondition"
|
||||
ref="apiCaseList"
|
||||
/>
|
||||
</test-case-relevance-base>
|
||||
|
@ -112,6 +114,10 @@ export default {
|
|||
setSelectCounts(data) {
|
||||
this.$refs.baseRelevance.selectCounts = data;
|
||||
},
|
||||
setCondition(data) {
|
||||
this.condition = data;
|
||||
this.$refs.nodeTree.list(this.projectId);
|
||||
}
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<div>
|
||||
<slot name="header"></slot>
|
||||
|
||||
|
||||
<ms-node-tree
|
||||
:is-display="getIsRelevance"
|
||||
v-loading="loading"
|
||||
|
@ -20,27 +20,27 @@
|
|||
@nodeSelectEvent="nodeChange"
|
||||
class="element-node-tree"
|
||||
ref="nodeTree">
|
||||
|
||||
|
||||
<template v-slot:header>
|
||||
<ms-search-bar
|
||||
:show-operator="showOperator"
|
||||
:condition="condition"
|
||||
:commands="null"/>
|
||||
</template>
|
||||
|
||||
|
||||
</ms-node-tree>
|
||||
</div>
|
||||
|
||||
|
||||
</template>
|
||||
|
||||
|
||||
<script>
|
||||
import MsNodeTree from "metersphere-frontend/src/components/new-ui/MsNodeTree";
|
||||
import {buildTree} from "metersphere-frontend/src/model/NodeTree";
|
||||
import MsSearchBar from "metersphere-frontend/src/components/search/MsSearchBar";
|
||||
import {getCurrentProjectID} from "@/business/utils/sdk-utils";
|
||||
import {uiScenarioModulePlanList} from "@/api/remote/ui/test-plan-ui-scenario-case";
|
||||
import {uiScenarioModuleProjectList} from "@/api/remote/ui/ui-scenario-module";
|
||||
|
||||
import {getUiScenarioModuleListByCondition} from "@/api/remote/ui/ui-scenario-module";
|
||||
|
||||
export default {
|
||||
name: 'UiScenarioModule',
|
||||
components: {
|
||||
|
@ -63,7 +63,8 @@
|
|||
showCaseNum: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
}
|
||||
},
|
||||
caseCondition: Object
|
||||
},
|
||||
computed: {
|
||||
isPlanModel() {
|
||||
|
@ -128,7 +129,7 @@
|
|||
});
|
||||
} else {
|
||||
this.loading = true;
|
||||
uiScenarioModuleProjectList(projectId ? projectId : this.projectId)
|
||||
getUiScenarioModuleListByCondition(projectId ? projectId : this.projectId, 'scenario', this.caseCondition)
|
||||
.then(r => {
|
||||
if (r && r.data) {
|
||||
this.loading = false;
|
||||
|
@ -156,18 +157,18 @@
|
|||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
<style scoped>
|
||||
.node-tree {
|
||||
margin-top: 15px;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
|
||||
.ms-el-input {
|
||||
height: 25px;
|
||||
line-height: 25px;
|
||||
}
|
||||
|
||||
|
||||
.custom-tree-node {
|
||||
flex: 1 1 auto;
|
||||
display: flex;
|
||||
|
@ -177,15 +178,15 @@
|
|||
padding-right: 8px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
|
||||
.father .child {
|
||||
display: none;
|
||||
}
|
||||
|
||||
|
||||
.father:hover .child {
|
||||
display: block;
|
||||
}
|
||||
|
||||
|
||||
.node-title {
|
||||
width: 0;
|
||||
text-overflow: ellipsis;
|
||||
|
@ -194,28 +195,27 @@
|
|||
padding: 0 5px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
|
||||
.node-operate > i {
|
||||
color: #409eff;
|
||||
margin: 0 5px;
|
||||
}
|
||||
|
||||
|
||||
:deep(.el-tree-node__content) {
|
||||
height: 33px;
|
||||
}
|
||||
|
||||
|
||||
.ms-api-buttion {
|
||||
width: 30px;
|
||||
}
|
||||
|
||||
|
||||
.element-node-tree {
|
||||
width: 100%;
|
||||
/* min-width: 290px; */
|
||||
}
|
||||
|
||||
|
||||
:deep(.element-node-tree .recycle .el-col.el-col-3) {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
|
||||
</style>
|
||||
|
Loading…
Reference in New Issue