feat(接口测试): 非TCP请求的前后置脚本去掉报文处理脚本代码

--bug=1007769 --user=宋天阳 【github#7525】环境配置的全局前置脚本或者HTTP请求,用代码模版 生成的
“报文头添加长度” 代码块,执行报错 https://www.tapd.cn/55049933/s/1120185
This commit is contained in:
song-tianyang 2022-03-17 16:33:37 +08:00 committed by xiaomeinvG
parent e5ac4e32ab
commit 7b7b7ccfb0
5 changed files with 278 additions and 254 deletions

View File

@ -26,12 +26,13 @@
</template>
<script>
import MsCodeEdit from "../../../definition/components/MsCodeEdit";
import MsDropdown from "../../../../common/components/MsDropdown";
import CustomFunctionRelate from "@/business/components/project/menu/function/CustomFunctionRelate";
import ApiFuncRelevance from "@/business/components/project/menu/function/ApiFuncRelevance";
import ScriptNavMenu from "@/business/components/project/menu/function/ScriptNavMenu";
export default {
import MsCodeEdit from "../../../definition/components/MsCodeEdit";
import MsDropdown from "../../../../common/components/MsDropdown";
import CustomFunctionRelate from "@/business/components/project/menu/function/CustomFunctionRelate";
import ApiFuncRelevance from "@/business/components/project/menu/function/ApiFuncRelevance";
import ScriptNavMenu from "@/business/components/project/menu/function/ScriptNavMenu";
export default {
name: "Jsr233ProcessorContent",
components: {MsDropdown, MsCodeEdit, CustomFunctionRelate, ApiFuncRelevance, ScriptNavMenu},
data() {
@ -84,7 +85,7 @@
children: [
{
title: this.$t('api_test.request.processor.param_environment_set_global_variable'),
value: 'vars.put(${__metersphere_env_id}+"key","value");\n'+'vars.put("key","value")',
value: 'vars.put(${__metersphere_env_id}+"key","value");\n' + 'vars.put("key","value")',
},
]
},
@ -108,6 +109,7 @@
},
{
title: this.$t('project.code_segment.report_handle'),
hideScript: this.isHideScript(),
children: [
{
title: this.$t('api_test.request.processor.code_add_report_length'),
@ -131,7 +133,7 @@
' prev.setResponseData(returnData);\n' +
' }\n' +
'}',
disabled: this.isPreProcessor
disabled: this.isPreProcessor,
},
]
}
@ -164,6 +166,7 @@
jsr223Processor: {
type: Object,
},
protocol: String,
isPreProcessor: {
type: Boolean,
default:
@ -175,8 +178,7 @@
jsr223Processor() {
this.reload();
}
}
,
},
methods: {
addTemplate(template) {
if (!this.jsr223ProcessorData.script) {
@ -188,6 +190,9 @@
}
this.reload();
},
isHideScript() {
return this.protocol !== 'TCP';
},
reload() {
this.isCodeEditAlive = false;
this.$nextTick(() => (this.isCodeEditAlive = true));
@ -220,51 +225,52 @@
this.reload();
},
}
}
}
</script>
<style scoped>
.ace_editor {
.ace_editor {
border-radius: 5px;
}
}
.script-content {
.script-content {
height: calc(100vh - 570px);
min-height: 440px;
}
}
.script-index {
.script-index {
padding: 0 20px;
width: 230px;
}
}
.template-title {
.template-title {
margin-bottom: 5px;
font-weight: bold;
font-size: 15px;
}
}
.document-url {
.document-url {
margin-top: 10px;
}
}
.instructions-icon {
.instructions-icon {
margin-left: 5px;
}
}
.ms-dropdown {
.ms-dropdown {
margin-bottom: 20px;
}
}
.show-menu {
text-align:center;
.show-menu {
text-align: center;
font-weight: bold;
color:#935aa1;
color: #935aa1;
font-size: 18px;
cursor: pointer;
}
.show-menu:hover {
color:#935aa1;
}
}
.show-menu:hover {
color: #935aa1;
}
</style>

View File

@ -18,6 +18,7 @@
:jsr223-processor="jsr223Processor"
:is-pre-processor="isPreProcessor"
:node="node"
:protocol="protocol"
:is-read-only="this.jsr223Processor.disabled"/>
</legend>
<template v-slot:debugStepCode>
@ -83,6 +84,7 @@ export default {
type: Boolean,
default: true,
},
protocol:String,
isReadOnly: {
type: Boolean,
default:

View File

@ -57,7 +57,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'"
<ms-jmx-step :request="request" :apiId="request.id" protocol="TCP" :response="response" :tab-type="'pre'"
ref="preStep"/>
</el-tab-pane>
<el-tab-pane :label="$t('api_test.definition.request.post_operation')" name="postOperate"
@ -68,7 +68,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'"
<ms-jmx-step :request="request" :apiId="request.id" protocol="TCP" :response="response" :tab-type="'post'"
ref="postStep"/>
</el-tab-pane>
<el-tab-pane :label="$t('api_test.definition.request.assertions_rule')" name="assertionsRule"
@ -79,7 +79,7 @@
<div class="el-step__icon-inner">{{ request.ruleSize }}</div>
</div>
</span>
<ms-jmx-step :request="request" :apiId="request.id" :response="response" @reload="reloadBody"
<ms-jmx-step :request="request" :apiId="request.id" protocol="TCP" :response="response" @reload="reloadBody"
:tab-type="'assertionsRule'" ref="assertionsRule"/>
</el-tab-pane>

View File

@ -18,7 +18,8 @@
:value="item.id">
</el-option>
</el-select>
<el-button size="mini" @click="add" type="primary" v-if="tabType !== 'assertionsRule'" :disabled="request.disabled">
<el-button size="mini" @click="add" type="primary" v-if="tabType !== 'assertionsRule'"
:disabled="request.disabled">
{{ $t('api_test.request.assertions.add') }}
</el-button>
</p>
@ -37,6 +38,7 @@
v-if="data.type==='JSR223PreProcessor'"
@remove="remove"
@copyRow="copyRow"
:protocol="protocol"
:title="$t('api_test.definition.request.pre_script')"
:jsr223-processor="data"
color="#B8741A"
@ -53,7 +55,8 @@
color="#B8741A"
background-color="#F9F1EA"/>
<ms-constant-timer :inner-step="true" :timer="data" :node="node" v-if="data.type ==='ConstantTimer'" @remove="remove"/>
<ms-constant-timer :inner-step="true" :timer="data" :node="node" v-if="data.type ==='ConstantTimer'"
@remove="remove"/>
</div>
<div v-if="tabType ==='post'">
@ -62,6 +65,7 @@
v-if="data.type ==='JSR223PostProcessor'"
@copyRow="copyRow"
@remove="remove"
:protocol="protocol"
:is-read-only="false"
:title="$t('api_test.definition.request.post_script')"
:jsr223-processor="data"
@ -150,6 +154,7 @@ export default {
},
isShowEnable: Boolean,
jsonPathList: Array,
protocol: String,
isReadOnly: {
type: Boolean,
default: false
@ -429,7 +434,18 @@ export default {
if (line[1] === '必填' || line[1] === 'Required' || line[1] === 'true') {
required = true;
}
keyValues.push(new KeyValue({name: line[0], required: required, value: line[2], description: line[3], type: "text", valid: false, file: false, encode: true, enable: true, contentType: "text/plain"}));
keyValues.push(new KeyValue({
name: line[0],
required: required,
value: line[2],
description: line[3],
type: "text",
valid: false,
file: false,
encode: true,
enable: true,
contentType: "text/plain"
}));
})
keyValues.forEach(item => {
switch (this.activeName) {

View File

@ -8,7 +8,7 @@
</el-link>
</div>
<div v-for="(menu, index) in menus" :key="index">
<span class="link-type">
<span class="link-type" v-if="!menu.hideScript">
<i class="icon el-icon-arrow-right" style="font-weight: bold; margin-right: 2px;"
@click="active(menu)" :class="{'is-active': menu.open}"></i>
<span @click="active(menu)" class="nav-menu-title nav-font">{{menu.title}}</span>
@ -17,7 +17,7 @@
<el-collapse-transition>
<div v-if="menu.open">
<div v-for="(child, key) in menu.children" :key="key" class="func-div">
<el-link :disabled="child.disabled" @click="handleClick(child)" class="func-link nav-font">{{child.title}}</el-link>
<el-link :disabled="child.disabled" @click="handleClick(child)" class="func-link nav-font">{{child.disabled}}{{child.title}}</el-link>
</div>
</div>
</el-collapse-transition>