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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Captain.B 2021-01-27 12:51:02 +08:00
parent af69dfe7ba 33e05223e9
commit 77a1235ff6
19 changed files with 213 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
View File

@ -20,9 +20,6 @@ import lombok.EqualsAndHashCode;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.CSVDataSet;
import org.apache.jmeter.config.RandomVariableConfig;
import org.apache.jmeter.modifiers.CounterConfig;
import org.apache.jmeter.save.SaveService;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jorphan.collections.HashTree;
@ -68,7 +65,8 @@ public class MsScenario extends MsTestElement {
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
ApiScenarioWithBLOBs scenario = apiAutomationService.getApiScenario(this.getId());
JSONObject element = JSON.parseObject(scenario.getScenarioDefinition());
hashTree = mapper.readValue(element.getString("hashTree"), new TypeReference<LinkedList<MsTestElement>>() {});
hashTree = mapper.readValue(element.getString("hashTree"), new TypeReference<LinkedList<MsTestElement>>() {
});
} catch (Exception ex) {
ex.printStackTrace();
}
@ -88,9 +86,9 @@ public class MsScenario extends MsTestElement {
}
// 场景变量和环境变量
tree.add(arguments(config));
addCsvDataSet(tree);
addCounter(tree);
addRandom(tree);
this.addCsvDataSet(tree, variables);
this.addCounter(tree, variables);
this.addRandom(tree, variables);
if (CollectionUtils.isNotEmpty(hashTree)) {
for (MsTestElement el : hashTree) {
el.toHashTree(tree, el.getHashTree(), config);
@ -133,71 +131,5 @@ public class MsScenario extends MsTestElement {
return arguments;
}
private void addCsvDataSet(HashTree tree) {
if (CollectionUtils.isNotEmpty(this.getVariables())) {
List<ScenarioVariable> list = variables.stream().filter(ScenarioVariable::isCSVValid).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(list)) {
list.forEach(item -> {
CSVDataSet csvDataSet = new CSVDataSet();
csvDataSet.setEnabled(true);
csvDataSet.setProperty(TestElement.TEST_CLASS, CSVDataSet.class.getName());
csvDataSet.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
csvDataSet.setName(item.getName());
csvDataSet.setProperty("fileEncoding", item.getEncoding());
csvDataSet.setProperty("variableNames", item.getName());
if (CollectionUtils.isNotEmpty(item.getFiles())) {
csvDataSet.setProperty("filename", BODY_FILE_DIR + "/" + item.getFiles().get(0).getId() + "_" + item.getFiles().get(0).getName());
}
csvDataSet.setIgnoreFirstLine(false);
csvDataSet.setProperty("delimiter", item.getDelimiter());
csvDataSet.setComment(item.getDescription());
tree.add(csvDataSet);
});
}
}
}
private void addCounter(HashTree tree) {
if (CollectionUtils.isNotEmpty(this.getVariables())) {
List<ScenarioVariable> list = variables.stream().filter(ScenarioVariable::isCounterValid).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(list)) {
list.forEach(item -> {
CounterConfig counterConfig = new CounterConfig();
counterConfig.setEnabled(true);
counterConfig.setProperty(TestElement.TEST_CLASS, CounterConfig.class.getName());
counterConfig.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("CounterConfigGui"));
counterConfig.setName(item.getName());
counterConfig.setStart(item.getStartNumber());
counterConfig.setEnd(item.getEndNumber());
counterConfig.setVarName(item.getName());
counterConfig.setIncrement(item.getIncrement());
counterConfig.setFormat(item.getValue());
counterConfig.setComment(item.getDescription());
tree.add(counterConfig);
});
}
}
}
private void addRandom(HashTree tree) {
if (CollectionUtils.isNotEmpty(this.getVariables())) {
List<ScenarioVariable> list = variables.stream().filter(ScenarioVariable::isRandom).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(list)) {
list.forEach(item -> {
RandomVariableConfig randomVariableConfig = new RandomVariableConfig();
randomVariableConfig.setEnabled(true);
randomVariableConfig.setProperty(TestElement.TEST_CLASS, RandomVariableConfig.class.getName());
randomVariableConfig.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
randomVariableConfig.setName(item.getName());
randomVariableConfig.setProperty("variableName", item.getName());
randomVariableConfig.setProperty("outputFormat", item.getValue());
randomVariableConfig.setProperty("minimumValue", item.getMinNumber());
randomVariableConfig.setProperty("maximumValue", item.getMaxNumber());
randomVariableConfig.setComment(item.getDescription());
tree.add(randomVariableConfig);
});
}
}
}
}

74
backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java
View File

@ -22,6 +22,7 @@ import io.metersphere.api.dto.definition.request.sampler.MsHTTPSamplerProxy;
import io.metersphere.api.dto.definition.request.sampler.MsJDBCSampler;
import io.metersphere.api.dto.definition.request.sampler.MsTCPSampler;
import io.metersphere.api.dto.definition.request.timer.MsConstantTimer;
import io.metersphere.api.dto.definition.request.variable.ScenarioVariable;
import io.metersphere.api.dto.scenario.KeyValue;
import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
import io.metersphere.api.service.ApiDefinitionService;
@ -33,6 +34,9 @@ import io.metersphere.commons.utils.LogUtil;
import lombok.Data;
import org.apache.commons.collections.CollectionUtils;
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.CSVDataSet;
import org.apache.jmeter.config.RandomVariableConfig;
import org.apache.jmeter.modifiers.CounterConfig;
import org.apache.jmeter.protocol.http.control.AuthManager;
import org.apache.jmeter.save.SaveService;
import org.apache.jmeter.testelement.TestElement;
@ -42,6 +46,7 @@ import org.apache.jorphan.collections.ListedHashTree;
import java.io.ByteArrayOutputStream;
import java.util.LinkedList;
import java.util.List;
import java.util.stream.Collectors;
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "type")
@JsonSubTypes({
@ -91,6 +96,7 @@ public abstract class MsTestElement {
@JSONField(ordinal = 10)
private LinkedList<MsTestElement> hashTree;
private static final String BODY_FILE_DIR = "/opt/metersphere/data/body";
// 公共环境逐层传递，如果自身有环境 以自身引用环境为准否则以公共环境作为请求环境
public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
for (MsTestElement el : hashTree) {
@ -166,6 +172,74 @@ public abstract class MsTestElement {
}
return null;
}
protected void addCsvDataSet(HashTree tree,List<ScenarioVariable> variables) {
if (CollectionUtils.isNotEmpty(variables)) {
List<ScenarioVariable> list = variables.stream().filter(ScenarioVariable::isCSVValid).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(list)) {
list.forEach(item -> {
CSVDataSet csvDataSet = new CSVDataSet();
csvDataSet.setEnabled(true);
csvDataSet.setProperty(TestElement.TEST_CLASS, CSVDataSet.class.getName());
csvDataSet.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
csvDataSet.setName(item.getName());
csvDataSet.setProperty("fileEncoding", item.getEncoding());
csvDataSet.setProperty("variableNames", item.getName());
if (CollectionUtils.isNotEmpty(item.getFiles())) {
csvDataSet.setProperty("filename", BODY_FILE_DIR + "/" + item.getFiles().get(0).getId() + "_" + item.getFiles().get(0).getName());
}
csvDataSet.setIgnoreFirstLine(false);
csvDataSet.setProperty("delimiter", item.getDelimiter());
csvDataSet.setComment(item.getDescription());
tree.add(csvDataSet);
});
}
}
}
protected void addCounter(HashTree tree,List<ScenarioVariable> variables) {
if (CollectionUtils.isNotEmpty(variables)) {
List<ScenarioVariable> list = variables.stream().filter(ScenarioVariable::isCounterValid).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(list)) {
list.forEach(item -> {
CounterConfig counterConfig = new CounterConfig();
counterConfig.setEnabled(true);
counterConfig.setProperty(TestElement.TEST_CLASS, CounterConfig.class.getName());
counterConfig.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("CounterConfigGui"));
counterConfig.setName(item.getName());
counterConfig.setStart(item.getStartNumber());
counterConfig.setEnd(item.getEndNumber());
counterConfig.setVarName(item.getName());
counterConfig.setIncrement(item.getIncrement());
counterConfig.setFormat(item.getValue());
counterConfig.setComment(item.getDescription());
tree.add(counterConfig);
});
}
}
}
protected void addRandom(HashTree tree,List<ScenarioVariable> variables) {
if (CollectionUtils.isNotEmpty(variables)) {
List<ScenarioVariable> list = variables.stream().filter(ScenarioVariable::isRandom).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(list)) {
list.forEach(item -> {
RandomVariableConfig randomVariableConfig = new RandomVariableConfig();
randomVariableConfig.setEnabled(true);
randomVariableConfig.setProperty(TestElement.TEST_CLASS, RandomVariableConfig.class.getName());
randomVariableConfig.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
randomVariableConfig.setName(item.getName());
randomVariableConfig.setProperty("variableName", item.getName());
randomVariableConfig.setProperty("outputFormat", item.getValue());
randomVariableConfig.setProperty("minimumValue", item.getMinNumber());
randomVariableConfig.setProperty("maximumValue", item.getMaxNumber());
randomVariableConfig.setComment(item.getDescription());
tree.add(randomVariableConfig);
});
}
}
}
}

6
backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsLoopController.java
View File

@ -60,6 +60,12 @@ public class MsLoopController extends MsTestElement {
config.setStepType("LOOP");
final HashTree groupTree = controller(tree);
if (CollectionUtils.isNotEmpty(config.getVariables())) {
this.addCsvDataSet(groupTree, config.getVariables());
this.addCounter(groupTree, config.getVariables());
this.addRandom(groupTree, config.getVariables());
}
// 循环下都增加一个计数器，用于结果统计
groupTree.add(addCounterConfig());
// 不打开执行成功后轮询功能，则成功后就停止循环

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

@ -27,6 +27,7 @@ import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.*;
import io.metersphere.i18n.Translator;
import io.metersphere.job.sechedule.ApiScenarioTestJob;
import io.metersphere.job.sechedule.TestPlanTestJob;
import io.metersphere.service.ScheduleService;
import io.metersphere.track.dto.TestPlanDTO;
import io.metersphere.track.request.testcase.ApiCaseRelevanceRequest;
@ -630,8 +631,14 @@ public class ApiAutomationService {
}
private void addOrUpdateApiScenarioCronJob(Schedule request) {
scheduleService.addOrUpdateCronJob(
request, ApiScenarioTestJob.getJobKey(request.getResourceId()), ApiScenarioTestJob.getTriggerKey(request.getResourceId()), ApiScenarioTestJob.class);
if(StringUtils.equals(request.getGroup(),ScheduleGroup.TEST_PLAN_TEST.name())){
scheduleService.addOrUpdateCronJob(
request, TestPlanTestJob.getJobKey(request.getResourceId()), TestPlanTestJob.getTriggerKey(request.getResourceId()), TestPlanTestJob.class);
}else{
scheduleService.addOrUpdateCronJob(
request, ApiScenarioTestJob.getJobKey(request.getResourceId()), ApiScenarioTestJob.getTriggerKey(request.getResourceId()), ApiScenarioTestJob.class);
}
}
public JmxInfoDTO genPerformanceTestJmx(RunScenarioRequest request) throws Exception {

6
backend/src/main/java/io/metersphere/job/sechedule/TestPlanTestJob.java
View File

@ -133,7 +133,6 @@ public class TestPlanTestJob extends MsScheduleJob {
performanceRequest.setId(caseID);
performanceRequest.setTestPlanLoadId(caseID);
performanceRequest.setTriggerMode(ReportTriggerMode.TEST_PLAN_SCHEDULE.name());
String reportId = null;
try {
reportId = performanceTestService.run(performanceRequest);
@ -148,6 +147,11 @@ public class TestPlanTestJob extends MsScheduleJob {
}catch (Exception e){
e.printStackTrace();
}
//更新关联处的报告
TestPlanLoadCase loadCase = new TestPlanLoadCaseDTO();
loadCase.setId(id);
loadCase.setLoadReportId(reportId);
testPlanLoadCaseService.update(loadCase);
}
if(!performaneReportIDList.isEmpty()){

1
backend/src/main/java/io/metersphere/track/service/TestPlanService.java
View File

@ -150,6 +150,7 @@ public class TestPlanService {
public List<TestPlan> getTestPlanByName(String name) {
TestPlanExample example = new TestPlanExample();
example.createCriteria().andWorkspaceIdEqualTo(SessionUtils.getCurrentWorkspaceId())
.andProjectIdEqualTo(SessionUtils.getCurrentProjectId())
.andNameEqualTo(name);
return testPlanMapper.selectByExample(example);
}

2
frontend/src/business/components/api/automation/scenario/MsInputTag.vue
View File

@ -21,7 +21,7 @@
v-if="!readOnly"
class="tag-input el-input"
v-model="newTag"
placeholder="输入回车添加"
placeholder="$t('commons.tag_tip)"
@keydown.delete.stop="removeLastTag"
@keydown="addNew"
@blur="addNew"/>

13
frontend/src/business/components/api/automation/scenario/variable/EditConstant.vue
View File

@ -1,7 +1,7 @@
<template>
<el-form :model="editData" label-position="right" label-width="80px" size="small" ref="form">
<el-form-item :label="$t('api_test.variable_name')" prop="name">
<el-input v-model="editData.name" :placeholder="$t('api_test.variable_name')"></el-input>
<el-input v-model="editData.name" :placeholder="$t('api_test.variable_name')" ref="nameInput"></el-input>
</el-form-item>
<el-form-item :label="$t('commons.description')" prop="description">
@ -25,6 +25,17 @@
props: {
editData: {},
},
created() {
this.$nextTick(() => {
this.$refs.nameInput.focus();
});
},
watch: {
editData() {
this.$refs.nameInput.focus();
}
}
}
</script>

2
frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
View File

@ -37,7 +37,7 @@
<div style="margin:20px">
<el-button style="margin-right:10px" @click="deleteVariable">{{$t('commons.delete')}}</el-button>
<el-dropdown split-button type="primary" @command="handleClick" placement="top-end">
<el-dropdown split-button type="primary" @command="handleClick" @click="handleClick('CONSTANT')" placement="top-end">
{{$t('commons.add')}}
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="CONSTANT">常量</el-dropdown-item>

25
frontend/src/business/components/api/definition/components/ApiConfig.vue
View File

@ -77,16 +77,16 @@
document.removeEventListener("keydown", this.createCtrlSHandle);
},
createCtrlSHandle(event) {
if(this.$refs.httpApi) {
if (this.$refs.httpApi) {
handleCtrlSEvent(event, this.$refs.httpApi.saveApi);
}
else if(this.$refs.tcpApi) {
else if (this.$refs.tcpApi) {
handleCtrlSEvent(event, this.$refs.tcpApi.saveApi);
}
else if(this.$refs.dubboApi) {
else if (this.$refs.dubboApi) {
handleCtrlSEvent(event, this.$refs.dubboApi.saveApi);
}
else if(this.$refs.sqlApi) {
else if (this.$refs.sqlApi) {
handleCtrlSEvent(event, this.$refs.sqlApi.saveApi);
}
},
@ -192,27 +192,10 @@
let bodyFiles = this.getBodyUploadFiles(data);
this.$fileUpload(this.reqUrl, null, bodyFiles, data, () => {
this.$success(this.$t('commons.save_success'));
if (this.reqUrl.endsWith('/create')) {
this.saveTestCase(data);
}
this.reqUrl = "/api/definition/update";
this.$emit('saveApi', data);
});
},
saveTestCase(row) {
let tmp = {request: JSON.parse(JSON.stringify(row.request))};
tmp.projectId = getCurrentProjectID();
tmp.active = true;
tmp.priority = "P0";
tmp.name = row.name;
tmp.request.path = row.path;
tmp.request.method = row.method;
tmp.apiDefinitionId = row.id;
let bodyFiles = this.getBodyUploadFiles(tmp);
let url = "/api/testcase/create";
this.$fileUpload(url, null, bodyFiles, tmp, (response) => {
});
},
setParameters(data) {
data.projectId = this.projectId;
this.request.name = this.currentApi.name;

39
frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
View File

@ -108,7 +108,7 @@
</template>
<script>
import {_getBodyUploadFiles, getCurrentProjectID} from "../../../../../../common/js/utils";
import {_getBodyUploadFiles, getCurrentProjectID, getUUID} from "@/common/js/utils";
import {PRIORITY, RESULT_MAP} from "../../model/JsonData";
import MsTag from "../../../../common/components/MsTag";
import MsTipButton from "../../../../common/components/MsTipButton";
@ -236,7 +236,32 @@
this.saveTestCase(row);
}
},
saveTestCase(row) {
setParameters(data) {
data.projectId = getCurrentProjectID();
data.request.name = data.name;
if (data.protocol === "DUBBO" || data.protocol === "dubbo://") {
data.request.protocol = "dubbo://";
} else {
data.request.protocol = data.protocol;
}
data.id = data.request.id;
if (!data.method) {
data.method = data.protocol;
}
},
saveApi(row) {
let data = this.api;
data.name = this.apiCase.name;
this.setParameters(data);
let bodyFiles = this.getBodyUploadFiles(data);
this.$fileUpload("/api/definition/create", null, bodyFiles, data, () => {
if (row) {
this.api.saved = false;
this.saveCase(row);
}
});
},
saveCase(row) {
let tmp = JSON.parse(JSON.stringify(row));
this.isShowInput = false;
if (this.validate(tmp)) {
@ -267,6 +292,14 @@
}
});
},
saveTestCase(row) {
if (this.api.saved) {
this.saveApi(row);
} else {
this.saveCase(row);
}
},
showInput(row) {
// row.type = "create";
this.isShowInput = true;
@ -293,7 +326,7 @@
}
},
showExecResult(item) {
item.active = false;
item.active = true;
item.isActive = true;
},
getBodyUploadFiles(row) {

6
frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
View File

@ -144,6 +144,12 @@
this.getApiTest(true);
this.visible = true;
},
saveApiAndCase(api) {
this.visible = true;
this.api = api;
console.log(api)
this.addCase();
},
setEnvironment(environment) {
this.environment = environment;
},

12
frontend/src/business/components/api/definition/components/debug/DebugDubboPage.vue
View File

@ -26,6 +26,9 @@
<div v-if="scenario">
<el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as')"> {{$t('commons.save')}}</el-button>
</div>
<!-- 加载用例 -->
<ms-api-case-list :loaded="false" ref="caseList"/>
</div>
</template>
@ -40,10 +43,11 @@
import MsRequestResultTail from "../response/RequestResultTail";
import MsBasisParameters from "../request/dubbo/BasisParameters";
import MsJmxStep from "../step/JmxStep";
import MsApiCaseList from "../case/ApiCaseList";
export default {
name: "ApiConfig",
components: {MsRequestResultTail, MsResponseResult, MsRequestMetric, MsResponseText, MsRun, MsBasisParameters, MsJmxStep},
components: {MsRequestResultTail, MsResponseResult, MsRequestMetric, MsResponseText, MsRun, MsBasisParameters, MsJmxStep, MsApiCaseList},
props: {
currentProtocol: String,
scenario: Boolean,
@ -120,7 +124,11 @@
saveAs() {
let obj = {request: this.request};
obj.request.id = getUUID();
this.$emit('saveAs', obj);
obj.saved = true;
obj.protocol = this.currentProtocol;
obj.status = "Underway";
obj.method = this.currentProtocol;
this.$refs.caseList.saveApiAndCase(obj);
}
}
}

21
frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue
View File

@ -41,6 +41,8 @@
<div v-if="scenario">
<el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as')"> {{$t('commons.save')}}</el-button>
</div>
<!-- 加载用例 -->
<ms-api-case-list :loaded="false" ref="caseList"/>
</div>
</template>
@ -56,10 +58,11 @@
import MsRequestResultTail from "../response/RequestResultTail";
import MsJmxStep from "../step/JmxStep";
import {KeyValue} from "../../model/ApiTestModel";
import MsApiCaseList from "../case/ApiCaseList";
export default {
name: "ApiConfig",
components: {MsRequestResultTail, MsResponseResult, MsApiRequestForm, MsRequestMetric, MsResponseText, MsRun, MsJmxStep},
components: {MsRequestResultTail, MsResponseResult, MsApiRequestForm, MsRequestMetric, MsResponseText, MsRun, MsJmxStep, MsApiCaseList},
props: {
currentProtocol: String,
testCase: {},
@ -92,6 +95,7 @@
runData: [],
reportId: "",
reqOptions: REQ_METHOD,
createCase: "",
request: {},
}
},
@ -156,13 +160,17 @@
saveAs() {
this.$refs['debugForm'].validate((valid) => {
if (valid) {
this.debugForm.id = null;
this.request.id = getUUID();
this.request.method = this.debugForm.method;
this.request.path = this.debugForm.path;
this.protocol = this.currentProtocol;
this.debugForm.id = this.request.id;
this.debugForm.request = this.request;
this.debugForm.userId = getCurrentUser().id;
this.debugForm.status = "Underway";
this.debugForm.protocol = this.currentProtocol;
this.$emit('saveAs', this.debugForm);
this.debugForm.saved = true;
this.$refs.caseList.saveApiAndCase(this.debugForm);
}
else {
return false;
@ -170,10 +178,13 @@
})
},
urlChange() {
if (!this.debugForm.url || this.debugForm.url.indexOf('?') === -1) return;
if (!this.debugForm.url) return;
let url = this.getURL(this.addProtocol(this.debugForm.url));
if (url) {
this.debugForm.url = decodeURIComponent(this.debugForm.url.substr(0, this.debugForm.url.indexOf("?")));
if (this.debugForm.url.indexOf('?') != -1) {
this.debugForm.url = decodeURIComponent(this.debugForm.url.substr(0, this.debugForm.url.indexOf("?")));
}
this.debugForm.path = url.pathname;
}
},
addProtocol(url) {

11
frontend/src/business/components/api/definition/components/debug/DebugJdbcPage.vue
View File

@ -27,6 +27,8 @@
<div v-if="scenario">
<el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as')"> {{$t('commons.save')}}</el-button>
</div>
<!-- 加载用例 -->
<ms-api-case-list :loaded="false" ref="caseList"/>
</div>
@ -43,10 +45,11 @@
import MsRequestResultTail from "../response/RequestResultTail";
import MsBasisParameters from "../request/database/BasisParameters";
import MsJmxStep from "../step/JmxStep";
import MsApiCaseList from "../case/ApiCaseList";
export default {
name: "ApiConfig",
components: {MsRequestResultTail, MsResponseResult, MsRequestMetric, MsResponseText, MsRun, MsBasisParameters, MsJmxStep},
components: {MsRequestResultTail, MsResponseResult, MsRequestMetric, MsResponseText, MsRun, MsBasisParameters, MsJmxStep,MsApiCaseList},
props: {
currentProtocol: String,
scenario: Boolean,
@ -123,7 +126,11 @@
saveAs() {
let obj = {request: this.request};
obj.request.id = getUUID();
this.$emit('saveAs', obj);
obj.saved = true;
obj.protocol = this.currentProtocol;
obj.status = "Underway";
obj.method = this.currentProtocol;
this.$refs.caseList.saveApiAndCase(obj);
}
}
}

17
frontend/src/business/components/api/definition/components/debug/DebugTcpPage.vue
View File

@ -37,6 +37,9 @@
<div v-if="scenario">
<el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as')"> {{$t('commons.save')}}</el-button>
</div>
<!-- 加载用例 -->
<ms-api-case-list :loaded="false" ref="caseList"/>
</div>
</template>
@ -53,13 +56,15 @@
import MsRequestResultTail from "../response/RequestResultTail";
import TcpBasisParameters from "../request/tcp/TcpBasisParameters";
import MsJmxStep from "../step/JmxStep";
import MsApiCaseList from "../case/ApiCaseList";
export default {
name: "ApiConfig",
components: {
MsJmxStep,
TcpBasisParameters,
MsRequestResultTail, MsResponseResult, MsApiRequestForm, MsRequestMetric, MsResponseText, MsRun},
MsRequestResultTail, MsResponseResult, MsApiRequestForm, MsRequestMetric, MsResponseText, MsRun, MsApiCaseList
},
props: {
currentProtocol: String,
scenario: Boolean,
@ -135,8 +140,16 @@
},
saveAs() {
let obj = {request: this.request};
obj.request.server = this.debugForm.server;
obj.request.port = this.debugForm.port;
obj.server = this.debugForm.server;
obj.port = this.debugForm.port;
obj.request.id = getUUID();
this.$emit('saveAs', obj);
obj.saved = true;
obj.protocol = this.currentProtocol;
obj.status = "Underway";
obj.method = this.currentProtocol;
this.$refs.caseList.saveApiAndCase(obj);
}
}
}

1
frontend/src/i18n/en-US.js
View File

@ -132,6 +132,7 @@ export default {
batch_add: "Batch add",
check_project_tip: "Create or select the project first",
auth_redirect_tip: 'Jump to the authentication source page for authentication',
tag_tip: "Enter Enter to Add Label",
table: {
select_tip: "Item {0} data is selected"
},

1
frontend/src/i18n/zh-CN.js
View File

@ -133,6 +133,7 @@ export default {
batch_add: "批量添加",
check_project_tip: "请先创建或选择项目",
auth_redirect_tip: '即将跳转到认证源页面进行认证',
tag_tip: "输入回车添加标签",
table: {
select_tip: "已选中 {0} 条数据"
},

1
frontend/src/i18n/zh-TW.js
View File

@ -133,6 +133,7 @@ export default {
batch_add: "批量添加",
check_project_tip: "請先創建或選擇項目",
auth_redirect_tip: '即將跳轉到認證源頁面進行認證',
tag_tip: "輸入回車添加標簽",
table: {
select_tip: "已选中 {0} 条数据"
},