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

fix(接口定义): 用例执行dubbo协议不强制选择环境

This commit is contained in:
fit2-zhao 2021-03-24 10:15:36 +08:00
parent 3cc4c181b8
commit b02868245b
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,9 +129,10 @@
import MsJmxStep from "../step/JmxStep"; import MsJmxStep from "../step/JmxStep";
import ApiResponseComponent from "../../../automation/scenario/component/ApiResponseComponent"; import ApiResponseComponent from "../../../automation/scenario/component/ApiResponseComponent";
import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn"; import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/); const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
const esbDefinition = (requireComponent!=null&&requireComponent.keys().length) > 0 ? requireComponent("./apidefinition/EsbDefinition.vue") : {}; const esbDefinition = (requireComponent != null && requireComponent.keys().length) > 0 ? requireComponent("./apidefinition/EsbDefinition.vue") : {};
const esbDefinitionResponse = (requireComponent!=null&&requireComponent.keys().length) > 0 ? requireComponent("./apidefinition/EsbDefinitionResponse.vue") : {}; const esbDefinitionResponse = (requireComponent != null && requireComponent.keys().length) > 0 ? requireComponent("./apidefinition/EsbDefinitionResponse.vue") : {};
export default { export default {
name: "ApiCaseItem", name: "ApiCaseItem",
@ -157,7 +158,7 @@
return { return {
result: {}, result: {},
grades: [], grades: [],
showXpackCompnent:false, showXpackCompnent: false,
isReadOnly: false, isReadOnly: false,
selectedEvent: Object, selectedEvent: Object,
priorities: PRIORITY, priorities: PRIORITY,
@ -198,7 +199,7 @@
isCaseEdit: Boolean, isCaseEdit: Boolean,
}, },
created() { created() {
if (requireComponent != null && JSON.stringify(esbDefinition) != '{}'&& JSON.stringify(esbDefinitionResponse) != '{}') { if (requireComponent != null && JSON.stringify(esbDefinition) != '{}' && JSON.stringify(esbDefinitionResponse) != '{}') {
this.showXpackCompnent = true; this.showXpackCompnent = true;
} }
}, },
@ -224,7 +225,7 @@
}); });
}, },
singleRun(data) { singleRun(data) {
if (!this.environment) { if (this.api.protocol != "DUBBO" && this.api.protocol != "dubbo://" && !this.environment) {
this.$warning(this.$t('api_test.environment.select_environment')); this.$warning(this.$t('api_test.environment.select_environment'));
return; return;
} }
@ -316,10 +317,10 @@
} }
} }
if(tmp.request.esbDataStruct != null){ if (tmp.request.esbDataStruct != null) {
tmp.esbDataStruct = JSON.stringify(tmp.request.esbDataStruct); tmp.esbDataStruct = JSON.stringify(tmp.request.esbDataStruct);
} }
if(tmp.request.backEsbDataStruct != null){ if (tmp.request.backEsbDataStruct != null) {
tmp.backEsbDataStruct = JSON.stringify(tmp.request.backEsbDataStruct); tmp.backEsbDataStruct = JSON.stringify(tmp.request.backEsbDataStruct);
} }

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

@ -280,7 +280,7 @@
}, },
singleRun(row) { singleRun(row) {
if (!this.environment) { if (this.currentApi.protocol != "DUBBO" && this.currentApi.protocol != "dubbo://" && !this.environment) {
this.$warning(this.$t('api_test.environment.select_environment')); this.$warning(this.$t('api_test.environment.select_environment'));
return; return;
} }
@ -298,7 +298,7 @@
}, },
batchRun() { batchRun() {
if (!this.environment) { if (this.currentApi.protocol != "DUBBO" && this.currentApi.protocol != "dubbo://" && !this.environment) {
this.$warning(this.$t('api_test.environment.select_environment')); this.$warning(this.$t('api_test.environment.select_environment'));
return; return;
} }