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

refactor: 合并分支 feature_1000439 解决冲突 

合并分支 feature_1000439 解决冲突
This commit is contained in:
song.tianyang 2021-01-07 15:26:20 +08:00
parent 1909c4267f
commit a70b8b31ab
3 changed files with 340 additions and 335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/controller/APITestController.java
View File

@ -387,7 +387,7 @@ public class APITestController {
HashTree hashTree = runRequest.getTestElement().generateHashTree();
String jmxString = runRequest.getTestElement().getJmx(hashTree);
JmxInfoDTO dto = new JmxInfoDTO();
dto.setName(runRequest.getName()+".JMX");
dto.setName(runRequest.getName()+".jmx");
dto.setXml(jmxString);
return dto;
}

2
backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
View File

@ -610,7 +610,7 @@ public class ApiAutomationService {
testPlan.toHashTree(jmeterHashTree, testPlan.getHashTree(), new ParameterConfig());
String jmx = testPlan.getJmx(jmeterHashTree);
String name = request.getName() + ".JMX";
String name = request.getName() + ".jmx";
JmxInfoDTO dto = new JmxInfoDTO();
dto.setName(name);

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

@ -4,7 +4,8 @@
:is-api-list-enable="isApiListEnable"
@isApiListEnableChange="isApiListEnableChange">
<el-input placeholder="搜索" @blur="search" @keyup.enter.native="search" class="search-input" size="small" v-model="condition.name"/>
<el-input placeholder="搜索" @blur="search" @keyup.enter.native="search" class="search-input" size="small"
v-model="condition.name"/>
<el-table v-loading="result.loading"
ref="caseTable"
@ -72,8 +73,12 @@
<el-table-column v-if="!isReadOnly" :label="$t('commons.operating')" min-width="130" align="center">
<template v-slot:default="scope">
<!--<el-button type="text" @click="reductionApi(scope.row)" v-if="trashEnable">{{$t('commons.reduction')}}</el-button>-->
<el-button type="text" @click="handleTestCase(scope.row)" v-if="!trashEnable">{{$t('commons.edit')}}</el-button>
<el-button type="text" @click="handleDelete(scope.row)" style="color: #F56C6C">{{$t('commons.delete')}}</el-button>
<el-button type="text" @click="handleTestCase(scope.row)" v-if="!trashEnable">{{ $t('commons.edit') }}
</el-button>
<el-button type="text" @click="handleDelete(scope.row)" style="color: #F56C6C">{{ $t('commons.delete') }}
</el-button>
<ms-api-case-table-extend-btns @showCaseRef="showCaseRef" @showEnvironment="showEnvironment" @createPerformance="createPerformance" :row="scope.row" v-tester/>
</template>
</el-table-column>
@ -105,8 +110,9 @@
import MsBottomContainer from "../BottomContainer";
import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
import MsBatchEdit from "../basis/BatchEdit";
import {API_METHOD_COLOUR, CASE_PRIORITY} from "../../model/JsonData";
import {getCurrentProjectID} from "@/common/js/utils";
import {API_METHOD_COLOUR, CASE_PRIORITY, REQ_METHOD} from "../../model/JsonData";
import {getBodyUploadFiles,getCurrentProjectID} from "@/common/js/utils";
import ApiListContainer from "./ApiListContainer";
import PriorityTableItem from "../../../../track/common/tableItems/planview/PriorityTableItem";
import ApiCaseList from "../case/ApiCaseList";
@ -479,7 +485,6 @@
this.clickRow = row;
this.$refs.setEnvironment.open(row);
},
},
createPerformance(row, environment) {
/**
* 思路：调用后台创建性能测试的方法，把当前案例的hashTree在后台转化为jmx并文件创建性能测试。
@ -506,7 +511,8 @@
runData.forEach(item => {
threadGroup.hashTree.push(item);
})
let reqObj = {id: row.id,
let reqObj = {
id: row.id,
testElement: testPlan,
name: row.name,
projectId: getCurrentProjectID(),
@ -536,7 +542,6 @@
}, erro => {
this.$emit('runRefresh', {});
});
},
},
}