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:
chenjianxing 2020-12-15 20:42:06 +08:00
parent 1344e94e94
commit 884fc213dd
7 changed files with 12 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioModuleMapper.xml
View File

@ -5,7 +5,7 @@
select
<include refid="io.metersphere.base.mapper.ApiScenarioModuleMapper.Base_Column_List"/>
from api_scenario_module
where api_module.project_id = #{projectId}
where api_scenario_module.project_id = #{projectId}
order by create_time asc
</select>
</mapper>

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

@ -1 +1 @@
Subproject commit 61397c16728a63493507679f7e0940d9099f337f
Subproject commit bb494fc68a2367359c9048fa7250c7618de4afb6

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

@ -1,8 +1,6 @@
<template>
<ms-container>
<ms-aside-container>
<!--<ms-api-scenario-module @selectModule="selectModule" @getApiModuleTree="initTree"-->
<!--@refresh="refresh" @saveAsEdit="editScenario"/>-->
<ms-api-scenario-module
@nodeSelectEvent="nodeChange"
@refreshTable="refresh"

4
frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue
View File

@ -95,9 +95,9 @@
this.visible = false;
if (saveAs) {
this.scenarioForm.request = JSON.stringify(this.scenarioForm.request);
this.$parent.saveAsEdit(this.scenarioForm);
this.$emit('saveAsEdit', this.httpForm);
} else {
this.$parent.refresh(this.currentModule);
this.$emit('refresh');
}
});
} else {

37
frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
View File

@ -24,7 +24,10 @@
</ms-node-tree>
<ms-add-basis-scenario ref="basisScenario"/>
<ms-add-basis-scenario
@saveAsEdit="saveAsEdit"
@refresh="refresh"
ref="basisScenario"/>
</div>
</template>
@ -65,6 +68,9 @@
'condition.filterText'(val) {
this.$refs.nodeTree.filter(val);
},
'condition.trashEnable'() {
this.$emit('enableTrash', this.condition.trashEnable);
},
},
methods: {
@ -145,36 +151,7 @@
},
enableTrash() {
this.condition.trashEnable = true;
this.$emit('enableTrash', this.condition.trashEnable);
}
// refresh(data) {
// this.$emit('refresh', data);
// },
// saveAsEdit(data) {
// this.$emit('saveAsEdit', data);
// },
// filterNode(value, data) {
// if (!value) return true;
// return data.name.indexOf(value) !== -1;
// },
// addScenario() {
// this.$refs.basisScenario.open(this.currentModule);
// },
// nodeExpand(data) {
// if (data.id) {
// this.expandedNode.push(data.id);
// }
// },
// nodeCollapse(data) {
// if (data.id) {
// this.expandedNode.splice(this.expandedNode.indexOf(data.id), 1);
// }
// },
// changeProtocol() {
// this.getApiModuleTree();
// this.$emit('changeProtocol', this.protocol);
// }
}
}
</script>

1
frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue
View File

@ -61,7 +61,6 @@
import {REQ_METHOD} from "../../model/JsonData";
import {getCurrentProjectID, getCurrentUser, getUUID} from "../../../../../../common/js/utils";
import {createComponent, Request} from "../jmeter/components";
import HeaderManager from "../jmeter/components/configurations/header-manager";
export default {
name: "MsAddBasisApi",

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit aaeb324621dc3197c1bcbd3920600c0963fdea08
Subproject commit a22a3005d9bd254793fcf634d72539cbdf31be3a