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

Merge branch 'master' of https://github.com/metersphere/metersphere

This commit is contained in:
chenjianxing 2021-01-27 14:24:58 +08:00
parent d8c4bf0789 90e57f12d8
commit a404fbfaf5
10 changed files with 62 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/config/MybatisConfig.java
View File

@ -2,6 +2,7 @@ package io.metersphere.config;
import com.github.pagehelper.PageInterceptor;
import io.metersphere.base.domain.ApiTestReportDetail;
import io.metersphere.base.domain.AuthSource;
import io.metersphere.base.domain.FileContent;
import io.metersphere.base.domain.TestResource;
import io.metersphere.commons.utils.CompressUtils;
@ -45,6 +46,7 @@ public class MybatisConfig {
configList.add(new MybatisInterceptorConfig(FileContent.class, "file", CompressUtils.class, "zip", "unzip"));
configList.add(new MybatisInterceptorConfig(ApiTestReportDetail.class, "content", CompressUtils.class, "compress", "decompress"));
configList.add(new MybatisInterceptorConfig(TestResource.class, "configuration"));
configList.add(new MybatisInterceptorConfig(AuthSource.class, "configuration"));
interceptor.setInterceptorConfigList(configList);
return interceptor;
}

2
backend/src/main/java/io/metersphere/xpack

@ -1 +1 @@
Subproject commit bb9c0309161c91bf7d0a9f85cc44bc0eb0fc11ac
Subproject commit 387ca56312b62ae5edb3d7f34afa08946d86d621

6
frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
View File

@ -143,7 +143,7 @@
highlight-current
@node-expand="nodeExpand"
@node-collapse="nodeCollapse"
:allow-drop="allowDrop" @node-drag-end="allowDrag" @node-click="nodeClick" v-if="!loading" draggable class="ms-is-leaf">
:allow-drop="allowDrop" @node-drag-end="allowDrag" @node-click="nodeClick" v-if="!loading" draggable>
<span class="custom-tree-node father" slot-scope="{ node, data}" style="width: 96%">
<!-- 步骤组件-->
<ms-component-config :type="data.type" :scenario="data" :response="response" :currentScenario="currentScenario"
@ -1037,11 +1037,11 @@
z-index: 1;
}
/deep/ .el-tree-node__expand-icon.expanded {
.ms-expanded >>> .el-tree-node__expand-icon.expanded {
color: #7C3985;
}
/deep/ .el-icon-caret-right {
.ms-el-icon-caret-right .el-icon-caret-right {
color: #7C3985;
}

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

@ -271,12 +271,13 @@
let bodyFiles = this.getBodyUploadFiles(tmp);
tmp.projectId = getCurrentProjectID();
tmp.active = true;
tmp.request.path = this.api.path;
tmp.request.method = this.api.method;
tmp.apiDefinitionId = tmp.apiDefinitionId || this.api.id;
let url = "/api/testcase/create";
if (tmp.id) {
url = "/api/testcase/update";
} else {
tmp.request.path = this.api.path;
tmp.request.method = this.api.method;
}
if (tmp.tags instanceof Array) {
tmp.tags = JSON.stringify(tmp.tags);

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

@ -24,7 +24,7 @@
<ms-run :debug="true" :reportId="reportId" :run-data="runData" @runRefresh="runRefresh" ref="runTest"/>
</el-card>
<div v-if="scenario">
<el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as')"> {{$t('commons.save')}}</el-button>
<el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as_api')"> {{$t('commons.save')}}</el-button>
</div>
<!-- 加载用例 -->
<ms-api-case-list :loaded="false" ref="caseList"/>
@ -103,7 +103,10 @@
handleCommand(e) {
if (e === "save_as") {
this.saveAs();
} else {
} else if (e === 'save_as_api') {
this.saveAsApi();
}
else {
this.runDebug();
}
},
@ -121,6 +124,11 @@
this.loading = false;
this.$refs.debugResult.reload();
},
saveAsApi() {
let obj = {request: this.request};
obj.request.id = getUUID();
this.$emit('saveAs', obj);
},
saveAs() {
let obj = {request: this.request};
obj.request.id = getUUID();

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

@ -39,7 +39,7 @@
</el-card>
<div v-if="scenario">
<el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as')"> {{$t('commons.save')}}</el-button>
<el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as_api')"> {{$t('commons.save')}}</el-button>
</div>
<!-- 加载用例 -->
<ms-api-case-list :loaded="false" ref="caseList"/>
@ -131,7 +131,10 @@
handleCommand(e) {
if (e === "save_as") {
this.saveAs();
} else {
} else if (e === 'save_as_api') {
this.saveAsApi();
}
else {
this.runDebug();
}
},
@ -157,6 +160,22 @@
this.loading = false;
this.$refs.debugResult.reload();
},
saveAsApi() {
this.$refs['debugForm'].validate((valid) => {
if (valid) {
this.debugForm.id = null;
this.request.id = getUUID();
this.debugForm.request = this.request;
this.debugForm.userId = getCurrentUser().id;
this.debugForm.status = "Underway";
this.debugForm.protocol = this.currentProtocol;
this.$emit('saveAs', this.debugForm);
}
else {
return false;
}
})
},
saveAs() {
this.$refs['debugForm'].validate((valid) => {
if (valid) {

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

@ -25,7 +25,7 @@
<ms-run :debug="true" :reportId="reportId" :run-data="runData" @runRefresh="runRefresh" ref="runTest"/>
</el-card>
<div v-if="scenario">
<el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as')"> {{$t('commons.save')}}</el-button>
<el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as_api')"> {{$t('commons.save')}}</el-button>
</div>
<!-- 加载用例 -->
<ms-api-case-list :loaded="false" ref="caseList"/>
@ -105,7 +105,10 @@
handleCommand(e) {
if (e === "save_as") {
this.saveAs();
} else {
} else if (e === 'save_as_api') {
this.saveAsApi();
}
else {
this.$refs['requestForm'].validate();
}
},
@ -123,6 +126,11 @@
this.loading = false;
this.$refs.debugResult.reload();
},
saveAsApi() {
let obj = {request: this.request};
obj.request.id = getUUID();
this.$emit('saveAs', obj);
},
saveAs() {
let obj = {request: this.request};
obj.request.id = getUUID();

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

@ -35,7 +35,7 @@
<ms-run :debug="true" :reportId="reportId" :run-data="runData" @runRefresh="runRefresh" ref="runTest"/>
</el-card>
<div v-if="scenario">
<el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as')"> {{$t('commons.save')}}</el-button>
<el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as_api')"> {{$t('commons.save')}}</el-button>
</div>
<!-- 加载用例 -->
<ms-api-case-list :loaded="false" ref="caseList"/>
@ -120,6 +120,8 @@
handleCommand(e) {
if (e === "save_as") {
this.saveAs();
} else if (e === 'save_as_api') {
this.saveAsApi();
} else {
this.$refs['requestForm'].validate();
}
@ -138,6 +140,11 @@
this.loading = false;
this.$refs.debugResult.reload();
},
saveAsApi() {
let obj = {request: this.request};
obj.request.id = getUUID();
this.$emit('saveAs', obj);
},
saveAs() {
let obj = {request: this.request};
obj.request.server = this.debugForm.server;

4
frontend/src/business/components/api/definition/components/response/ResponseResult.vue
View File

@ -15,7 +15,9 @@
<!--</el-tab-pane>-->
<el-tab-pane :label="$t('api_test.definition.request.console')" name="console" class="pane">
<pre>{{response.responseResult.console}}</pre>
<div style="width: 400px">
<pre>{{response.responseResult.console}}</pre>
</div>
</el-tab-pane>
<el-tab-pane :label="$t('api_report.assertions')" name="assertions" class="pane assertions">

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 3a3363c7d651f340cc37fca74c1edb92af484915
Subproject commit 2b0af7c05f8148046fd17e4f2c06129367d69ac9