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

refactor(接口测试): 场景步骤代码优化

This commit is contained in:
fit2-zhao 2022-03-10 18:47:18 +08:00 committed by fit2-zhao
parent 074de74591
commit 990ecd17c2
4 changed files with 207 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -385,6 +385,9 @@ export default {
this.isSave = false;
this.isLeave = false;
}
if (this.tabs && this.tabs.length === 0) {
this.refreshAll();
}
},
handleCommand(e) {
switch (e) {
@ -466,6 +469,9 @@ export default {
this.isSave = false;
this.removeTab(targetName);
}
if (this.tabs && this.tabs.length === 0) {
this.refreshAll();
}
},
removeTab(targetName) {
this.tabs = this.tabs.filter(tab => tab.name !== targetName);
@ -496,12 +502,7 @@ export default {
},
refresh(data) {
this.setTabTitle(data);
this.$refs.apiScenarioList.search(data);
if (this.$refs.apiTrashScenarioList) {
this.$refs.apiTrashScenarioList.search(data);
}
this.isSave = true;
this.$refs.nodeTree.list();
},
refreshTree() {
if (this.$refs.nodeTree) {
@ -518,7 +519,7 @@ export default {
setTabTitle(data) {
for (let index in this.tabs) {
let tab = this.tabs[index];
if (tab.name === this.activeName) {
if (tab && tab.name === this.activeName) {
tab.label = data.name;
break;
}

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

@ -345,18 +345,14 @@
width="100%">
<scenario-diff
v-if="dialogVisible"
:old-data="oldData"
:new-data="newData"
:custom-num="customNum"
:currentScenarioId="currentScenario.id"
:dffScenarioId="dffScenarioId"
:scenarioRefId="scenarioRefId"
:module-options="moduleOptions"
:old-scenario-definition="oldScenarioDefinition"
:new-scenario-definition="newScenarioDefinition"
:project-env-map="projectEnvMap"
:new-project-env-map="newProjectEnvMap"
:old-enable-cookie-share="enableCookieShare"
:new-enable-cookie-share="newEnableCookieShare"
:old-on-sample-error="onSampleError"
:new-on-sample-error="newOnSampleError"
:project-list="projectList"
:type="type"/>
</el-dialog>
@ -435,7 +431,6 @@ export default {
data() {
return {
onSampleError: true,
newOnSampleError: true,
showConfigButtonWithOutPermission: false,
props: {
label: "label",
@ -476,26 +471,21 @@ export default {
debugVisible: false,
customizeRequest: {protocol: "HTTP", type: "API", hashTree: [], referenced: 'Created', active: false},
operatingElements: [],
currentRow: {cases: [], apis: [], referenced: true},
selectedTreeNode: undefined,
selectedNode: undefined,
expandedNode: [],
scenarioDefinition: [],
scenarioDefinitionOrg: [],
path: "/api/automation/create",
debugData: {},
reportId: "",
enableCookieShare: false,
newEnableCookieShare: false,
globalOptions: {
spacing: 30
},
response: {},
projectIds: new Set,
projectEnvMap: new Map,
newProjectEnvMap: new Map,
projectList: [],
debugResult: new Map,
drawer: false,
isFullUrl: true,
expandedStatus: false,
@ -527,16 +517,14 @@ export default {
environmentType: ENV_TYPE.JSON,
executeType: "",
versionData: [],
newData: [],
oldData: [],
dialogVisible: false,
newScenarioDefinition: [],
oldScenarioDefinition: [],
currentItem: {},
pluginDelStep: false,
isBatchProcess: false,
isCheckedAll: false,
selectDataCounts: 0,
dffScenarioId: "",
scenarioRefId: "",
batchOperators: [
{
name: this.$t('api_test.automation.bulk_activation_steps'),
@ -566,14 +554,6 @@ export default {
],
}
},
watch: {
scenarioDefinition: {
handler(v) {
this.currentScenario.scenarioDefinition = v;
},
deep: true
},
},
created() {
if (!this.currentScenario.apiScenarioModuleId) {
this.currentScenario.apiScenarioModuleId = "";
@ -1496,6 +1476,7 @@ export default {
this.currentScenario.tags = JSON.parse(this.currentScenario.tags);
}
this.pluginDelStep = false;
this.$emit('refresh', this.currentScenario);
resolve();
});
}
@ -1552,21 +1533,6 @@ export default {
this.environmentType = response.data.environmentType;
}
this.currentScenario.variables = [];
let index = 1;
if (obj.variables) {
obj.variables.forEach(item => {
// 兼容历史数据
if (item.name) {
if (!item.type) {
item.type = "CONSTANT";
item.id = getUUID();
}
item.num = index;
this.currentScenario.variables.push(item);
index++;
}
})
}
if (obj.headers) {
this.currentScenario.headers = obj.headers;
}
@ -1578,18 +1544,6 @@ export default {
}
this.dataProcessing(obj.hashTree);
this.scenarioDefinition = obj.hashTree;
let v1 = {
apiScenarioModuleId: this.currentScenario.apiScenarioModuleId,
name: this.currentScenario.name,
status: this.currentScenario.status,
principal: this.currentScenario.principal,
level: this.currentScenario.level,
tags: this.currentScenario.tags,
description: this.currentScenario.description,
scenarioDefinition: this.scenarioDefinition
};
this.currentScenario.scenarioDefinitionOrg = v1
this.oldScenarioDefinition = obj.hashTree;
}
}
if (this.currentScenario.copy) {
@ -1606,13 +1560,27 @@ export default {
});
}
this.loading = false;
this.setDomain();
this.sort();
this.commandTreeNode();
this.cancelBatchProcessing();
// 初始化resourceId
if (this.scenarioDefinition) {
this.resetResourceId(this.scenarioDefinition);
}
// 记录初始化数据
let v1 = {
apiScenarioModuleId: this.currentScenario.apiScenarioModuleId,
name: this.currentScenario.name,
status: this.currentScenario.status,
principal: this.currentScenario.principal,
level: this.currentScenario.level,
tags: this.currentScenario.tags,
description: this.currentScenario.description,
scenarioDefinition: this.scenarioDefinition
};
this.currentScenario.scenarioDefinitionOrg = JSON.parse(JSON.stringify(v1));
this.currentScenario.scenarioDefinition = this.scenarioDefinition;
})
}
},
@ -1750,8 +1718,6 @@ export default {
},
detailRefresh(result) {
// 把执行结果分发给各个请求
this.debugResult = result;
this.sort()
},
fullScreen() {
this.drawer = true;
@ -1900,68 +1866,14 @@ export default {
});
},
compare(row) {
this.$get('/api/automation/get/' + row.id + "/" + this.currentScenario.refId, response => {
this.$get("/api/automation/getApiScenario/" + response.data.id, res => {
if (res.data) {
if (res.data.scenarioDefinition != null) {
let obj = JSON.parse(res.data.scenarioDefinition);
if (obj) {
if (obj.hashTree) {
for (let i = 0; i < obj.hashTree.length; i++) {
if (!obj.hashTree[i].index) {
obj.hashTree[i].index = i + 1;
}
obj.hashTree[i].disabled = true;
if (!obj.hashTree[i].requestResult) {
obj.hashTree[i].requestResult = [{responseResult: {}}];
}
}
this.newEnableCookieShare = obj.enableCookieShare;
if (obj.onSampleError === undefined) {
this.newOnSampleError = true;
} else {
this.newOnSampleError = obj.onSampleError;
}
}
this.dataProcessing(obj.hashTree);
this.newScenarioDefinition = obj.hashTree;
for (let i = 0; i < this.oldScenarioDefinition.length; i++) {
this.oldScenarioDefinition[i].disabled = true;
}
if (response.data.environmentJson) {
this.newProjectEnvMap = objToStrMap(JSON.parse(response.data.environmentJson));
} else {
// 兼容历史数据
this.newProjectEnvMap.set(this.projectId, obj.environmentId);
}
}
}
res.data.userName = response.data.userName
this.dealWithTag(res.data);
this.oldData = this.currentScenario;
this.newData = res.data;
this.closeExpansion()
}
this.sort();
this.dialogVisible = true;
});
})
this.scenarioRefId = this.currentScenario.refId;
this.dffScenarioId = row.id;
this.dialogVisible = true;
},
closeDiff() {
this.oldScenarioDefinition = []
},
dealWithTag(newScenario) {
if (newScenario.tags) {
if (Object.prototype.toString.call(newScenario.tags) === "[object String]") {
newScenario.tags = JSON.parse(newScenario.tags);
}
}
if (this.currentScenario.tags) {
if (Object.prototype.toString.call(this.currentScenario.tags) === "[object String]") {
this.currentScenario.tags = JSON.parse(this.currentScenario.tags);
}
}
},
checkout(row) {
let api = this.versionData.filter(v => v.versionId === row.id)[0];
if (api.tags && api.tags.length > 0) {

265
frontend/src/business/components/api/automation/version/ScenarioDiff.vue
View File

@ -2,20 +2,22 @@
<div>
<el-row>
<el-col :span="12">
<el-tag>当前{{oldData.versionName }}</el-tag><span style="margin-left: 10px">{{oldData.userName}}</span><span style="margin-left: 10px">{{oldData.createTime | timestampFormatDate }}</span>
<el-tag>当前{{ oldData.versionName }}</el-tag>
<span style="margin-left: 10px">{{ oldData.userName }}</span><span style="margin-left: 10px">{{ oldData.createTime | timestampFormatDate }}</span>
</el-col>
<el-col :span="12">
<el-tag>{{ newData.versionName }}</el-tag><span style="margin-left: 10px">{{newData.userName}}</span><span style="margin-left: 10px">{{newData.createTime | timestampFormatDate }}</span>
<el-tag>{{ newData.versionName }}</el-tag>
<span style="margin-left: 10px">{{ newData.userName }}</span><span style="margin-left: 10px">{{ newData.createTime | timestampFormatDate }}</span>
</el-col>
</el-row>
<div class="compare-class" v-loading="isReloadData">
<el-card ref="old" style="width: 50%">
<el-card>
<div class="card-content">
<div class="ms-main-div" @click="showAll" >
<div class="ms-main-div" @click="showAll">
<div class="tip">{{ $t('test_track.plan_view.base_info') }}</div>
<el-form :model="oldData" label-position="right" label-width="80px" size="small" :rules="rules" :disabled="true"
<el-form :model="oldData" label-position="right" label-width="80px" size="small" :rules="rules" :disabled="true"
ref="currentScenario" style="margin-right: 20px">
<!-- 基础信息 -->
<el-row>
@ -130,10 +132,10 @@
<!-- 场景步骤内容 -->
<div ref="stepInfo" id="stepInfo">
<el-tooltip :content="$t('api_test.automation.open_expansion')" placement="top" effect="light">
<i class="el-icon-circle-plus-outline ms-open-btn ms-open-btn-left" @click="openExpansion('old')"/>
<i class="el-icon-circle-plus-outline ms-open-btn ms-open-btn-left" @click="openExpansion('old')"/>
</el-tooltip>
<el-tooltip :content="$t('api_test.automation.close_expansion')" placement="top" effect="light">
<i class="el-icon-remove-outline ms-open-btn" size="mini" @click="closeExpansion('old')"/>
<i class="el-icon-remove-outline ms-open-btn" size="mini" @click="closeExpansion('old')"/>
</el-tooltip>
<el-tree node-key="resourceId" :props="props" :data="oldScenarioDefinition" class="ms-tree"
:default-expanded-keys="oldExpandedNode"
@ -163,7 +165,7 @@
</div>
</el-card>
</el-card>
<el-card ref="new" style="width: 50%">
<el-card ref="new" style="width: 50%">
<el-card>
<div class="card-content">
<div class="ms-main-div" @click="showAll" v-if="type!=='detail'">
@ -267,7 +269,7 @@
{{ $t('api_test.automation.step_total') }}：{{ newScenarioDefinition.length }}
</el-col>
<el-col :span="3" class="ms-col-one ms-font">
<el-link class="head" >{{ $t('api_test.automation.scenario_total') }}
<el-link class="head">{{ $t('api_test.automation.scenario_total') }}
</el-link>
：{{ getNewVariableSize() }}
</el-col>
@ -284,7 +286,7 @@
<!-- 场景步骤内容 -->
<div ref="newStepInfo">
<el-tooltip :content="$t('api_test.automation.open_expansion')" placement="top" effect="light">
<i class="el-icon-circle-plus-outline ms-open-btn ms-open-btn-left" @click="openExpansion('new')"/>
<i class="el-icon-circle-plus-outline ms-open-btn ms-open-btn-left" @click="openExpansion('new')"/>
</el-tooltip>
<el-tooltip :content="$t('api_test.automation.close_expansion')" placement="top" effect="light">
<i class="el-icon-remove-outline ms-open-btn" size="mini" @click="closeExpansion('new')"/>
@ -296,7 +298,7 @@
@node-expand="nodeExpand(newScenarioDefinition,null,'new')"
@node-collapse="nodeCollapse(newScenarioDefinition,null,'new')"
@node-click="nodeClick"
draggable ref="newStepTree" >
draggable ref="newStepTree">
<span class="custom-tree-node father" slot-scope="{ node, data}" style="width: 96%">
<!-- 步骤组件-->
<ms-component-config
@ -349,117 +351,196 @@ import {ENV_TYPE} from "@/common/js/constants";
import {ELEMENT_TYPE, STEP, TYPE_TO_C} from "@/business/components/api/automation/scenario/Setting";
import MsComponentConfig from "@/business/components/api/automation/scenario/component/ComponentConfig";
import ScenarioChildDiff from "@/business/components/api/automation/version/ScenarioChildDiff";
import {objToStrMap} from "@/common/js/utils";
const {diff} = require("@/business/components/performance/v_node_diff");
const {KeyValue} = require("@/business/components/api/definition/model/ApiTestModel");
const {getUUID} = require("@/common/js/utils");
export default{
name:"ScenarioDiff",
props:{
oldData:{
type:Object
export default {
name: "ScenarioDiff",
props: {
showFollow: {
type: Boolean
},
newData:{
type:Object
},
showFollow:{
type:Boolean
},
newShowFollow:{
type:Boolean
newShowFollow: {
type: Boolean
},
customNum: {
type: Boolean,
default: false
},
isTop:{
isTop: {
type: Boolean,
default: false
},
rules:{
type:Object
rules: {
type: Object
},
projectIds:{},
newScenarioDefinition:{
type: Array,
},
oldScenarioDefinition:{
type: Array,
},
oldVariableSize:{},
newVariableSize:{},
moduleOptions:{},
maintainerOptions:{},
newEnableCookieShare:{},
oldEnableCookieShare:{},
oldOnSampleError:{},
newOnSampleError:{},
projectIds: {},
oldVariableSize: {},
newVariableSize: {},
moduleOptions: {},
maintainerOptions: {},
oldEnableCookieShare: {},
oldOnSampleError: {},
projectEnvMap: {},
newProjectEnvMap: {},
type:{},
projectList:{
type: {},
projectList: {
type: Array,
},
currentScenarioId: String,
dffScenarioId: String,
scenarioRefId: String,
},
components:{
components: {
ScenarioChildDiff,
MsComponentConfig,
MsSelectTree: () => import("@/business/components/common/select-tree/SelectTree"),
MsInputTag: () => import("@/business/components/api/automation/scenario/MsInputTag"),
EnvPopover: () => import("@/business/components/api/automation/scenario/EnvPopover"),
},
watch:{
'dialogVisible'(){
if(this.dialogVisible===false){
watch: {
'dialogVisible'() {
if (this.dialogVisible === false) {
this.leftChildData = {};
this.leftChildNode = {};
this.leftChildVnode ={};
this.leftChildVnode = {};
this.rightChildData = {};
this.rightChildNode = {};
this.rightChildVnode ={};
this.rightChildVnode = {};
this.currentRightChild = undefined;
this.currentLeftChild = undefined;
}
}
},
data(){
return{
options: API_STATUS,
levels: PRIORITY,
loading: false,
isReloadData:true,
moduleObj: {
id: 'id',
label: 'name',
},
oldEnvResult:{
loading: false
},
newEnvResult:{
loading: false
},
showHideTree: true,
environmentType: ENV_TYPE.JSON,
props: {
label: "label",
children: "hashTree"
},
oldExpandedNode:[],
newExpandedNode:[],
stepEnable:true,
currentLeftChild:undefined,
currentRightChild:undefined,
leftChildData:{},
rightChildData:{},
leftChildNode:{},
rightChildNode:{},
leftChildVnode:{},
rightChildVnode:{},
dialogVisible:false,
oldColor:"",
newColor:""
}
data() {
return {
options: API_STATUS,
levels: PRIORITY,
loading: false,
isReloadData: true,
moduleObj: {
id: 'id',
label: 'name',
},
oldEnvResult: {
loading: false
},
newEnvResult: {
loading: false
},
showHideTree: true,
environmentType: ENV_TYPE.JSON,
props: {
label: "label",
children: "hashTree"
},
oldExpandedNode: [],
newExpandedNode: [],
stepEnable: true,
currentLeftChild: undefined,
currentRightChild: undefined,
leftChildData: {},
rightChildData: {},
leftChildNode: {},
rightChildNode: {},
leftChildVnode: {},
rightChildVnode: {},
dialogVisible: false,
oldColor: "",
newColor: "",
newScenarioDefinition: [],
oldScenarioDefinition: [],
oldData: {},
newData: {},
newEnableCookieShare: {},
newOnSampleError: {},
newProjectEnvMap: new Map,
}
},
methods: {
getCurrentScenario() {
return new Promise((resolve) => {
if (this.currentScenarioId) {
this.result = this.$get("/api/automation/getApiScenario/" + this.currentScenarioId, response => {
if (response.data) {
if (response.data.scenarioDefinition != null) {
let obj = JSON.parse(response.data.scenarioDefinition);
if (obj) {
this.oldScenarioDefinition = obj.hashTree;
}
}
this.oldData = response.data;
this.$get('/api/automation/follow/' + this.currentScenarioId, response => {
this.oldData.follows = response.data;
for (let i = 0; i < response.data.length; i++) {
if (response.data[i] === this.currentUser().id) {
this.showFollow = true;
break;
}
}
});
this.getDffScenario();
resolve();
}
})
}
});
},
getDffScenario() {
return new Promise((resolve) => {
this.$get('/api/automation/get/' + this.dffScenarioId + "/" + this.scenarioRefId, response => {
this.$get("/api/automation/getApiScenario/" + response.data.id, res => {
if (res.data) {
if (res.data.scenarioDefinition != null) {
let obj = JSON.parse(res.data.scenarioDefinition);
if (obj) {
if (obj.hashTree) {
for (let i = 0; i < obj.hashTree.length; i++) {
if (!obj.hashTree[i].index) {
obj.hashTree[i].index = i + 1;
}
obj.hashTree[i].disabled = true;
if (!obj.hashTree[i].requestResult) {
obj.hashTree[i].requestResult = [{responseResult: {}}];
}
}
this.newEnableCookieShare = obj.enableCookieShare;
if (obj.onSampleError === undefined) {
this.newOnSampleError = true;
} else {
this.newOnSampleError = obj.onSampleError;
}
}
this.newScenarioDefinition = obj.hashTree;
for (let i = 0; i < this.oldScenarioDefinition.length; i++) {
this.oldScenarioDefinition[i].disabled = true;
}
if (response.data.environmentJson) {
this.newProjectEnvMap = objToStrMap(JSON.parse(response.data.environmentJson));
} else {
// 兼容历史数据
this.newProjectEnvMap.set(this.projectId, obj.environmentId);
}
}
}
res.data.userName = response.data.userName
this.dealWithTag(res.data);
this.newData = res.data;
this.closeExpansion()
resolve();
}
});
})
})
},
dealWithTag(newScenario) {
if (newScenario.tags) {
if (Object.prototype.toString.call(newScenario.tags) === "[object String]") {
newScenario.tags = JSON.parse(newScenario.tags);
}
}
},
getDiff() {
let oldVnode = this.$refs.old
let vnode = this.$refs.new
@ -605,7 +686,6 @@ export default{
this.rightChildNode = node
this.rightChildVnode = source
this.currentRightChild = source;
console.log(this.rightChildVnode)
if (this.currentLeftChild) {
this.dialogVisible = true;
}
@ -630,7 +710,7 @@ export default{
}
return size;
},
getNewVariableSize(){
getNewVariableSize() {
let size = 0;
if (this.newData.variables) {
size += this.newData.variables.length;
@ -642,18 +722,19 @@ export default{
}
},
created() {
this.getCurrentScenario();
},
mounted() {
this.$nextTick(function () {
setTimeout(this.getDiff,(this.$refs.old.$children.length+1)*1000)
setTimeout(this.getDiff, (this.$refs.old.$children.length + 1) * 5000);
})
}
}
</script>
<style scoped>
.compare-class{
.compare-class {
display: flex;
justify-content:space-between;
justify-content: space-between;
}
</style>

3
frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue
View File

@ -118,7 +118,6 @@ import MsApiAdvancedConfig from "./ApiAdvancedConfig";
import MsJsr233Processor from "../../../../automation/scenario/component/Jsr233Processor";
import {hasPermission} from '@/common/js/utils';
import Convert from "@/business/components/common/json-schema/convert/convert";
import MsJmxStep from "../../step/JmxStep";
import {stepCompute, hisDataProcessing} from "@/business/components/api/definition/api-definition";
export default {
@ -134,7 +133,7 @@ export default {
MsApiBody,
MsApiKeyValue,
MsApiAssertions,
MsJmxStep
MsJmxStep: () => import( "@/business/components/api/definition/components/step/JmxStep"),
},
props: {
method: String,