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

fix(接口测试): 修复插件数据源不能动态切换问题

This commit is contained in:
fit2-zhao 2022-04-21 14:07:08 +08:00 committed by fit2-zhao
parent 9ad0401fe3
commit fc1d966cb2
5 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/dto/automation/parse/ApiScenarioImportUtil.java
View File

@ -210,6 +210,7 @@ public class ApiScenarioImportUtil {
object.put("resourceId", test.getId());
object.put("projectId", projectId);
object.put("useEnvironment","");
object.put("environmentId","");
object.put("url","");
JSONObject objectNew = JSONObject.parseObject(object.toJSONString(), Feature.DisableSpecialKeyDetect);
objectNew.remove("refType");
@ -252,6 +253,7 @@ public class ApiScenarioImportUtil {
object.put("resourceId", apiTestCase.getId());
object.put("projectId", projectId);
object.put("useEnvironment","");
object.put("environmentId","");
JSONObject objectNew = JSONObject.parseObject(object.toJSONString(),Feature.DisableSpecialKeyDetect);
objectNew.remove("refType");
objectNew.remove("referenced");

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

@ -43,7 +43,7 @@
<div class="el-step__icon-inner">{{ request.preSize }}</div>
</div>
</span>
<ms-jmx-step :request="request" :apiId="request.id" :response="response" :tab-type="'pre'" ref="preStep"/>
<ms-jmx-step :request="request" :apiId="request.id" :is-scenario="true" :response="response" :tab-type="'pre'" ref="preStep"/>
</el-tab-pane>
<el-tab-pane :label="$t('api_test.definition.request.post_operation')" name="postOperate">
<span class="item-tabs" effect="dark" placement="top-start" slot="label">
@ -52,7 +52,7 @@
<div class="el-step__icon-inner">{{ request.postSize }}</div>
</div>
</span>
<ms-jmx-step :request="request" :apiId="request.id" :response="response" :tab-type="'post'" ref="postStep"/>
<ms-jmx-step :request="request" :apiId="request.id" :is-scenario="true" :response="response" :tab-type="'post'" ref="postStep"/>
</el-tab-pane>
<el-tab-pane :label="$t('api_test.definition.request.assertions_rule')" name="assertionsRule">
<span class="item-tabs" effect="dark" placement="top-start" slot="label">
@ -62,7 +62,7 @@
</div>
</span>
<div style="margin-right: 20px">
<ms-jmx-step :request="request" :apiId="request.id" :response="response" @reload="reload" :tab-type="'assertionsRule'" ref="assertionsRule"/>
<ms-jmx-step :request="request" :apiId="request.id" :is-scenario="true" :response="response" @reload="reload" :tab-type="'assertionsRule'" ref="assertionsRule"/>
</div>
</el-tab-pane>

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

@ -348,11 +348,15 @@ export default {
});
},
singleRun(data) {
if (this.api.protocol !== "SQL" && this.api.protocol != "DUBBO" && this.api.protocol != "dubbo://" && !this.environment) {
if (data.apiMethod !== "SQL" && data.apiMethod !== "DUBBO" && data.apiMethod !== "dubbo://" && data.apiMethod !== "TCP" && !this.environment) {
this.$warning(this.$t('api_test.environment.select_environment'));
return;
}
data.request.useEnvironment = this.environment;
if (data.apiMethod !== "SQL" && data.apiMethod !== "DUBBO" && data.apiMethod !== "dubbo://" && data.apiMethod !== "TCP") {
data.request.useEnvironment = this.environment;
} else {
data.request.useEnvironment = data.request.environmentId;
}
this.$emit('singleRun', data);
},
stop(data) {

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

@ -386,7 +386,7 @@ export default {
this.$emit('showExecResult', row);
},
singleRun(row) {
if (this.currentApi.protocol !== "SQL" && this.currentApi.protocol !== "DUBBO" && this.currentApi.protocol !== "dubbo://" && !this.environment) {
if (row.apiMethod !== "SQL" && row.apiMethod !== "DUBBO" && row.apiMethod !== "dubbo://" && row.apiMethod !== "TCP" && !this.environment) {
this.$warning(this.$t('api_test.environment.select_environment'));
return;
}
@ -394,7 +394,11 @@ export default {
this.singleLoading = true;
this.singleRunId = row.id;
row.request.name = row.id;
row.request.useEnvironment = this.environment;
if (row.apiMethod !== "SQL" && row.apiMethod !== "DUBBO" && row.apiMethod !== "dubbo://" && row.apiMethod !== "TCP") {
row.request.useEnvironment = this.environment;
} else {
row.request.useEnvironment = row.request.environmentId;
}
row.request.projectId = this.projectId;
row.request.id = row.id;
this.runData.push(row.request);

5
frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue
View File

@ -63,10 +63,7 @@
:description="$t('api_test.scenario.kv_description')"/>
</el-tab-pane>
<el-tab-pane :label="$t('api_test.request.sql.sql_script')" name="sql">
<div class="sql-content">
<ms-code-edit mode="sql" :read-only="isReadOnly" :modes="['sql']" :data.sync="request.query"
theme="eclipse" ref="codeEdit"/>
</div>
<ms-code-edit mode="sql" :read-only="isReadOnly" :modes="['sql']" :data.sync="request.query" :height="200" theme="eclipse" ref="codeEdit"/>
</el-tab-pane>
<!-- 脚本步骤/断言步骤 -->
<el-tab-pane :label="$t('api_test.definition.request.pre_operation')" name="preOperate" v-if="showScript">