feat(接口测试): 非TCP请求的前后置脚本去掉报文处理脚本代码
--bug=1007769 --user=宋天阳 【github#7525】环境配置的全局前置脚本或者HTTP请求,用代码模版 生成的 “报文头添加长度” 代码块,执行报错 https://www.tapd.cn/55049933/s/1120185
This commit is contained in:
parent
e5ac4e32ab
commit
7b7b7ccfb0
|
@ -31,6 +31,7 @@
|
||||||
import CustomFunctionRelate from "@/business/components/project/menu/function/CustomFunctionRelate";
|
import CustomFunctionRelate from "@/business/components/project/menu/function/CustomFunctionRelate";
|
||||||
import ApiFuncRelevance from "@/business/components/project/menu/function/ApiFuncRelevance";
|
import ApiFuncRelevance from "@/business/components/project/menu/function/ApiFuncRelevance";
|
||||||
import ScriptNavMenu from "@/business/components/project/menu/function/ScriptNavMenu";
|
import ScriptNavMenu from "@/business/components/project/menu/function/ScriptNavMenu";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "Jsr233ProcessorContent",
|
name: "Jsr233ProcessorContent",
|
||||||
components: {MsDropdown, MsCodeEdit, CustomFunctionRelate, ApiFuncRelevance, ScriptNavMenu},
|
components: {MsDropdown, MsCodeEdit, CustomFunctionRelate, ApiFuncRelevance, ScriptNavMenu},
|
||||||
|
@ -108,6 +109,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('project.code_segment.report_handle'),
|
title: this.$t('project.code_segment.report_handle'),
|
||||||
|
hideScript: this.isHideScript(),
|
||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
title: this.$t('api_test.request.processor.code_add_report_length'),
|
title: this.$t('api_test.request.processor.code_add_report_length'),
|
||||||
|
@ -131,7 +133,7 @@
|
||||||
' prev.setResponseData(returnData);\n' +
|
' prev.setResponseData(returnData);\n' +
|
||||||
' }\n' +
|
' }\n' +
|
||||||
'}',
|
'}',
|
||||||
disabled: this.isPreProcessor
|
disabled: this.isPreProcessor,
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -164,6 +166,7 @@
|
||||||
jsr223Processor: {
|
jsr223Processor: {
|
||||||
type: Object,
|
type: Object,
|
||||||
},
|
},
|
||||||
|
protocol: String,
|
||||||
isPreProcessor: {
|
isPreProcessor: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default:
|
default:
|
||||||
|
@ -175,8 +178,7 @@
|
||||||
jsr223Processor() {
|
jsr223Processor() {
|
||||||
this.reload();
|
this.reload();
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
,
|
|
||||||
methods: {
|
methods: {
|
||||||
addTemplate(template) {
|
addTemplate(template) {
|
||||||
if (!this.jsr223ProcessorData.script) {
|
if (!this.jsr223ProcessorData.script) {
|
||||||
|
@ -188,6 +190,9 @@
|
||||||
}
|
}
|
||||||
this.reload();
|
this.reload();
|
||||||
},
|
},
|
||||||
|
isHideScript() {
|
||||||
|
return this.protocol !== 'TCP';
|
||||||
|
},
|
||||||
reload() {
|
reload() {
|
||||||
this.isCodeEditAlive = false;
|
this.isCodeEditAlive = false;
|
||||||
this.$nextTick(() => (this.isCodeEditAlive = true));
|
this.$nextTick(() => (this.isCodeEditAlive = true));
|
||||||
|
@ -263,6 +268,7 @@
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.show-menu:hover {
|
.show-menu:hover {
|
||||||
color: #935aa1;
|
color: #935aa1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
:jsr223-processor="jsr223Processor"
|
:jsr223-processor="jsr223Processor"
|
||||||
:is-pre-processor="isPreProcessor"
|
:is-pre-processor="isPreProcessor"
|
||||||
:node="node"
|
:node="node"
|
||||||
|
:protocol="protocol"
|
||||||
:is-read-only="this.jsr223Processor.disabled"/>
|
:is-read-only="this.jsr223Processor.disabled"/>
|
||||||
</legend>
|
</legend>
|
||||||
<template v-slot:debugStepCode>
|
<template v-slot:debugStepCode>
|
||||||
|
@ -83,6 +84,7 @@ export default {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: true,
|
default: true,
|
||||||
},
|
},
|
||||||
|
protocol:String,
|
||||||
isReadOnly: {
|
isReadOnly: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -57,7 +57,7 @@
|
||||||
<div class="el-step__icon-inner">{{ request.preSize }}</div>
|
<div class="el-step__icon-inner">{{ request.preSize }}</div>
|
||||||
</div>
|
</div>
|
||||||
</span>
|
</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"/>
|
ref="preStep"/>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
<el-tab-pane :label="$t('api_test.definition.request.post_operation')" name="postOperate"
|
<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 class="el-step__icon-inner">{{ request.postSize }}</div>
|
||||||
</div>
|
</div>
|
||||||
</span>
|
</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"/>
|
ref="postStep"/>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
<el-tab-pane :label="$t('api_test.definition.request.assertions_rule')" name="assertionsRule"
|
<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 class="el-step__icon-inner">{{ request.ruleSize }}</div>
|
||||||
</div>
|
</div>
|
||||||
</span>
|
</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"/>
|
:tab-type="'assertionsRule'" ref="assertionsRule"/>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,8 @@
|
||||||
:value="item.id">
|
:value="item.id">
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</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') }}
|
{{ $t('api_test.request.assertions.add') }}
|
||||||
</el-button>
|
</el-button>
|
||||||
</p>
|
</p>
|
||||||
|
@ -37,6 +38,7 @@
|
||||||
v-if="data.type==='JSR223PreProcessor'"
|
v-if="data.type==='JSR223PreProcessor'"
|
||||||
@remove="remove"
|
@remove="remove"
|
||||||
@copyRow="copyRow"
|
@copyRow="copyRow"
|
||||||
|
:protocol="protocol"
|
||||||
:title="$t('api_test.definition.request.pre_script')"
|
:title="$t('api_test.definition.request.pre_script')"
|
||||||
:jsr223-processor="data"
|
:jsr223-processor="data"
|
||||||
color="#B8741A"
|
color="#B8741A"
|
||||||
|
@ -53,7 +55,8 @@
|
||||||
color="#B8741A"
|
color="#B8741A"
|
||||||
background-color="#F9F1EA"/>
|
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>
|
||||||
<div v-if="tabType ==='post'">
|
<div v-if="tabType ==='post'">
|
||||||
|
@ -62,6 +65,7 @@
|
||||||
v-if="data.type ==='JSR223PostProcessor'"
|
v-if="data.type ==='JSR223PostProcessor'"
|
||||||
@copyRow="copyRow"
|
@copyRow="copyRow"
|
||||||
@remove="remove"
|
@remove="remove"
|
||||||
|
:protocol="protocol"
|
||||||
:is-read-only="false"
|
:is-read-only="false"
|
||||||
:title="$t('api_test.definition.request.post_script')"
|
:title="$t('api_test.definition.request.post_script')"
|
||||||
:jsr223-processor="data"
|
:jsr223-processor="data"
|
||||||
|
@ -150,6 +154,7 @@ export default {
|
||||||
},
|
},
|
||||||
isShowEnable: Boolean,
|
isShowEnable: Boolean,
|
||||||
jsonPathList: Array,
|
jsonPathList: Array,
|
||||||
|
protocol: String,
|
||||||
isReadOnly: {
|
isReadOnly: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false
|
||||||
|
@ -429,7 +434,18 @@ export default {
|
||||||
if (line[1] === '必填' || line[1] === 'Required' || line[1] === 'true') {
|
if (line[1] === '必填' || line[1] === 'Required' || line[1] === 'true') {
|
||||||
required = 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 => {
|
keyValues.forEach(item => {
|
||||||
switch (this.activeName) {
|
switch (this.activeName) {
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
</el-link>
|
</el-link>
|
||||||
</div>
|
</div>
|
||||||
<div v-for="(menu, index) in menus" :key="index">
|
<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;"
|
<i class="icon el-icon-arrow-right" style="font-weight: bold; margin-right: 2px;"
|
||||||
@click="active(menu)" :class="{'is-active': menu.open}"></i>
|
@click="active(menu)" :class="{'is-active': menu.open}"></i>
|
||||||
<span @click="active(menu)" class="nav-menu-title nav-font">{{menu.title}}</span>
|
<span @click="active(menu)" class="nav-menu-title nav-font">{{menu.title}}</span>
|
||||||
|
@ -17,7 +17,7 @@
|
||||||
<el-collapse-transition>
|
<el-collapse-transition>
|
||||||
<div v-if="menu.open">
|
<div v-if="menu.open">
|
||||||
<div v-for="(child, key) in menu.children" :key="key" class="func-div">
|
<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>
|
||||||
</div>
|
</div>
|
||||||
</el-collapse-transition>
|
</el-collapse-transition>
|
||||||
|
|
Loading…
Reference in New Issue