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

Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8

This commit is contained in:
fit2-zhao 2021-03-30 19:54:35 +08:00
parent 5d78d51091 1a858c619d
commit db11b495d0
6 changed files with 750 additions and 742 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
View File

@ -441,18 +441,14 @@ export default {
}
});
if (this.$refs.scenarioTable) {
setTimeout(() => {
this.$refs.scenarioTable.doLayout();
this.result.loading = false;
}, 500)
}
if (!this.condition.selectAll) {
this.condition.unSelectIds = response.data.listObject.map(s => s.id);
}
this.$nextTick(function () {
if (this.$refs.scenarioTable) {
this.$refs.scenarioTable.doLayout();
}
this.checkTableRowIsSelect();
})
});
@ -732,8 +728,8 @@ export default {
// let ids = [row.id];
let param = {};
this.buildBatchParam(param);
if(param.ids && param.ids.length <=0){
param.ids =[row.id];
if (param.ids && param.ids.length <= 0) {
param.ids = [row.id];
}
this.$post('/api/automation/removeToGcByBatch/', param, () => {
// this.$post('/api/automation/removeToGc/', ids, () => {
@ -838,4 +834,8 @@ export default {
/deep/ .el-card__header {
padding: 10px;
}
/deep/ .el-table__fixed-body-wrapper {
top: 60px !important;
}
</style>

26
frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
View File

@ -313,7 +313,7 @@ export default {
this.condition.status = "Trash";
this.condition.moduleIds = [];
}
if(!this.selectAll){
if (!this.selectAll) {
this.selectAll = false;
this.unSelection = [];
this.selectDataCounts = 0;
@ -342,7 +342,7 @@ export default {
this.total = response.data.itemCount;
this.tableData = response.data.listObject;
if(!this.selectAll){
if (!this.selectAll) {
this.unSelection = response.data.listObject.map(s => s.id);
}
@ -351,13 +351,11 @@ export default {
item.tags = JSON.parse(item.tags);
}
})
this.$nextTick(function () {
if (this.$refs.caseTable) {
setTimeout(() => {
this.$refs.caseTable.doLayout();
this.result.loading = false;
}, 500)
}
this.$nextTick(function(){
this.checkTableRowIsSelect();
})
});
@ -365,20 +363,20 @@ export default {
getLabel(this, API_CASE_LIST);
},
checkTableRowIsSelect(){
checkTableRowIsSelect() {
//如果默认全选的话，则选中应该选中的行
if(this.selectAll){
if (this.selectAll) {
let unSelectIds = this.unSelection;
this.tableData.forEach(row=>{
if(unSelectIds.indexOf(row.id)<0){
this.$refs.caseTable.toggleRowSelection(row,true);
this.tableData.forEach(row => {
if (unSelectIds.indexOf(row.id) < 0) {
this.$refs.caseTable.toggleRowSelection(row, true);
//默认全选，需要把选中对行添加到selectRows中。不然会影响到勾选函数统计
if (!this.selectRows.has(row)) {
this.$set(row, "showMore", true);
this.selectRows.add(row);
}
}else{
} else {
//不勾选的行，也要判断是否被加入了selectRow中。加入了的话就去除。
if (this.selectRows.has(row)) {
this.$set(row, "showMore", false);
@ -694,4 +692,8 @@ export default {
/deep/ .el-table__fixed {
height: 100% !important;
}
/deep/ .el-table__fixed-body-wrapper {
top: 60px !important;
}
</style>

144
frontend/src/business/components/api/definition/components/list/ApiList.vue
View File

@ -116,7 +116,8 @@
min-width="120px"
:key="index">
<template v-slot:default="scope">
<ms-tag v-for="(itemName,index) in scope.row.tags" :key="index" type="success" effect="plain" :show-tooltip="true" :content="itemName" style="margin-left: 0px; margin-right: 2px"/>
<ms-tag v-for="(itemName,index) in scope.row.tags" :key="index" type="success" effect="plain" :show-tooltip="true" :content="itemName"
style="margin-left: 0px; margin-right: 2px"/>
</template>
</el-table-column>
@ -211,41 +212,45 @@
<script>
import MsTableHeader from '../../../../common/components/MsTableHeader';
import MsTableOperator from "../../../../common/components/MsTableOperator";
import MsTableOperatorButton from "../../../../common/components/MsTableOperatorButton";
import MsTableButton from "../../../../common/components/MsTableButton";
import MsTablePagination from "../../../../common/pagination/TablePagination";
import MsTag from "../../../../common/components/MsTag";
import MsApiCaseList from "../case/ApiCaseList";
import MsContainer from "../../../../common/components/MsContainer";
import MsBottomContainer from "../BottomContainer";
import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
import MsBatchEdit from "../basis/BatchEdit";
import {API_METHOD_COLOUR, API_STATUS, DUBBO_METHOD, REQ_METHOD, SQL_METHOD, TCP_METHOD} from "../../model/JsonData";
import {checkoutTestManagerOrTestUser, downloadFile, getUUID} from "@/common/js/utils";
import {PROJECT_NAME} from '@/common/js/constants';
import {API_LIST, TEST_CASE_LIST, WORKSPACE_ID} from '@/common/js/constants';
import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
import ApiStatus from "@/business/components/api/definition/components/list/ApiStatus";
import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
import {API_DEFINITION_CONFIGS} from "@/business/components/common/components/search/search-components";
import MsTipButton from "@/business/components/common/components/MsTipButton";
import CaseBatchMove from "@/business/components/api/definition/components/basis/BatchMove";
import {
import MsTableHeader from '../../../../common/components/MsTableHeader';
import MsTableOperator from "../../../../common/components/MsTableOperator";
import MsTableOperatorButton from "../../../../common/components/MsTableOperatorButton";
import MsTableButton from "../../../../common/components/MsTableButton";
import MsTablePagination from "../../../../common/pagination/TablePagination";
import MsTag from "../../../../common/components/MsTag";
import MsApiCaseList from "../case/ApiCaseList";
import MsContainer from "../../../../common/components/MsContainer";
import MsBottomContainer from "../BottomContainer";
import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
import MsBatchEdit from "../basis/BatchEdit";
import {API_METHOD_COLOUR, API_STATUS, DUBBO_METHOD, REQ_METHOD, SQL_METHOD, TCP_METHOD} from "../../model/JsonData";
import {downloadFile} from "@/common/js/utils";
import {API_LIST, PROJECT_NAME, WORKSPACE_ID} from '@/common/js/constants';
import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
import ApiStatus from "@/business/components/api/definition/components/list/ApiStatus";
import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
import {API_DEFINITION_CONFIGS} from "@/business/components/common/components/search/search-components";
import MsTipButton from "@/business/components/common/components/MsTipButton";
import CaseBatchMove from "@/business/components/api/definition/components/basis/BatchMove";
import {
_filter,
_handleSelect,
_handleSelectAll, buildBatchParam, getLabel,
getSelectDataCounts, initCondition,
setUnSelectIds, toggleAllSelection
} from "@/common/js/tableUtils";
import {_filter, _sort} from "@/common/js/tableUtils";
import {Api_List} from "@/business/components/common/model/JsonData";
import HeaderCustom from "@/business/components/common/head/HeaderCustom";
import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
import {Body} from "@/business/components/api/definition/model/ApiTestModel";
_handleSelectAll,
_sort,
buildBatchParam,
getLabel,
getSelectDataCounts,
initCondition,
setUnSelectIds,
toggleAllSelection
} from "@/common/js/tableUtils";
import {Api_List} from "@/business/components/common/model/JsonData";
import HeaderCustom from "@/business/components/common/head/HeaderCustom";
import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
import {Body} from "@/business/components/api/definition/model/ApiTestModel";
export default {
export default {
name: "ApiList",
components: {
HeaderLabelOperate,
@ -385,11 +390,11 @@
},
watch: {
selectNodeIds() {
initCondition(this.condition,false);
initCondition(this.condition, false);
this.initTable();
},
currentProtocol() {
initCondition(this.condition,false);
initCondition(this.condition, false);
this.initTable();
},
trashEnable() {
@ -399,7 +404,7 @@
} else {
this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
}
initCondition(this.condition,false);
initCondition(this.condition, false);
this.initTable();
}
},
@ -412,7 +417,7 @@
},
initTable() {
this.selectRows = new Set();
initCondition(this.condition,this.condition.selectAll);
initCondition(this.condition, this.condition.selectAll);
this.selectDataCounts = 0;
this.condition.moduleIds = this.selectNodeIds;
this.condition.projectId = this.projectId;
@ -454,38 +459,32 @@
item.tags = JSON.parse(item.tags);
}
})
if (this.$refs.apiDefinitionTable) {
setTimeout(() => {
this.$refs.apiDefinitionTable.doLayout();
this.result.loading = false;
}, 500)
}
// nexttick:表格加载完成之后触发。判断是否需要勾选行
this.$nextTick(function(){
// if (this.$refs.apiDefinitionTable) {
// this.$refs.apiDefinitionTable.doLayout();
// this.result.loading = false;
// }
this.$nextTick(function () {
if (this.$refs.apiDefinitionTable) {
this.$refs.apiDefinitionTable.doLayout();
}
this.checkTableRowIsSelect();
})
});
}
getLabel(this, API_LIST);
},
checkTableRowIsSelect(){
checkTableRowIsSelect() {
//如果默认全选的话，则选中应该选中的行
if(this.condition.selectAll){
if (this.condition.selectAll) {
let unSelectIds = this.condition.unSelectIds;
this.tableData.forEach(row=>{
if(unSelectIds.indexOf(row.id)<0){
this.$refs.apiDefinitionTable.toggleRowSelection(row,true);
this.tableData.forEach(row => {
if (unSelectIds.indexOf(row.id) < 0) {
this.$refs.apiDefinitionTable.toggleRowSelection(row, true);
//默认全选，需要把选中对行添加到selectRows中。不然会影响到勾选函数统计
if (!this.selectRows.has(row)) {
this.$set(row, "showMore", true);
this.selectRows.add(row);
}
}else{
} else {
//不勾选的行，也要判断是否被加入了selectRow中。加入了的话就去除。
if (this.selectRows.has(row)) {
this.$set(row, "showMore", false);
@ -763,8 +762,7 @@
obj.protocol = this.currentProtocol;
this.buildApiPath(obj.data);
downloadFile("Metersphere_Api_" + localStorage.getItem(PROJECT_NAME) + ".json", JSON.stringify(obj));
}
else {
} else {
downloadFile("Swagger_Api_" + localStorage.getItem(PROJECT_NAME) + ".json", JSON.stringify(obj));
}
});
@ -802,40 +800,44 @@
this.$refs.searchBar.open();
}
},
}
}
</script>
<style scoped>
.operate-button > div {
.operate-button > div {
display: inline-block;
margin-left: 10px;
}
}
.request-method {
.request-method {
padding: 0 5px;
color: #1E90FF;
}
}
.api-el-tag {
.api-el-tag {
color: white;
}
}
.search-input {
.search-input {
float: right;
width: 300px;
margin-right: 10px;
}
}
.el-tag {
.el-tag {
margin-left: 10px;
}
}
.ms-select-all >>> th:first-child {
.ms-select-all >>> th:first-child {
margin-top: 20px;
}
}
.ms-select-all >>> th:nth-child(2) .el-icon-arrow-down {
.ms-select-all >>> th:nth-child(2) .el-icon-arrow-down {
top: -2px;
}
}
/deep/ .el-table__fixed-body-wrapper {
top: 60px !important;
}
</style>

41
frontend/src/business/components/track/case/components/TestCaseList.vue
View File

@ -160,15 +160,17 @@ import {
_filter,
_handleSelect,
_handleSelectAll,
_sort, buildBatchParam, getLabel,
getSelectDataCounts, initCondition,
_sort,
buildBatchParam,
getLabel,
getSelectDataCounts,
initCondition,
setUnSelectIds,
toggleAllSelection
} from "@/common/js/tableUtils";
import BatchMove from "./BatchMove";
import {Track_Test_Case} from "@/business/components/common/model/JsonData";
import HeaderCustom from "@/business/components/common/head/HeaderCustom";
import i18n from "@/i18n/i18n";
import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
import PlanStatusTableItem from "@/business/components/track/common/tableItems/plan/PlanStatusTableItem";
@ -314,7 +316,7 @@ export default {
watch: {
selectNodeIds() {
this.currentPage = 1;
initCondition(this.condition,false);
initCondition(this.condition, false);
this.initTableData();
},
condition() {
@ -334,7 +336,7 @@ export default {
this.condition.planId = "";
this.condition.nodeIds = [];
//initCondition(this.condition);
initCondition(this.condition,this.condition.selectAll);
initCondition(this.condition, this.condition.selectAll);
this.selectDataCounts = 0;
if (this.planId) {
// param.planId = this.planId;
@ -392,33 +394,30 @@ export default {
this.tableData.forEach((item) => {
item.tags = JSON.parse(item.tags);
})
if (this.$refs.table) {
setTimeout(() => {
this.$refs.table.doLayout();
this.result.loading = false;
}, 500)
}
this.$nextTick(function(){
this.$nextTick(() => {
if (this.$refs.table) {
this.$refs.table.doLayout();
}
this.checkTableRowIsSelect();
})
});
}
},
checkTableRowIsSelect(){
checkTableRowIsSelect() {
//如果默认全选的话，则选中应该选中的行
if(this.condition.selectAll){
if (this.condition.selectAll) {
let unSelectIds = this.condition.unSelectIds;
this.tableData.forEach(row=>{
if(unSelectIds.indexOf(row.id)<0){
this.$refs.table.toggleRowSelection(row,true);
this.tableData.forEach(row => {
if (unSelectIds.indexOf(row.id) < 0) {
this.$refs.table.toggleRowSelection(row, true);
//默认全选，需要把选中对行添加到selectRows中。不然会影响到勾选函数统计
if (!this.selectRows.has(row)) {
this.$set(row, "showMore", true);
this.selectRows.add(row);
}
}else{
} else {
//不勾选的行，也要判断是否被加入了selectRow中。加入了的话就去除。
if (this.selectRows.has(row)) {
this.$set(row, "showMore", false);
@ -446,7 +445,7 @@ export default {
handleCopy(testCase) {
this.$get('test/case/get/' + testCase.id, response => {
let testCase = response.data;
testCase.name='copy_'+testCase.name
testCase.name = 'copy_' + testCase.name
this.$emit('testCaseCopy', testCase);
});
},
@ -662,4 +661,8 @@ export default {
.el-tag {
margin-left: 10px;
}
/deep/ .el-table__fixed-body-wrapper {
top: 60px !important;
}
</style>

7
frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
View File

@ -473,10 +473,7 @@ export default {
}
this.selectRows.clear();
if (this.$refs.table) {
setTimeout(() => {
this.$refs.table.doLayout();
this.result.loading = false;
}, 500)
}
});
}
@ -718,4 +715,8 @@ export default {
.ms-table-header >>> .table-title {
height: 0px;
}
/deep/ .el-table__fixed-body-wrapper {
top: 60px !important;
}
</style>

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd
Subproject commit afb50f22464b832e4f458f3f7947e6d8f982707e