fix(接口测试): 因为mock期望不支持jmeter函数所以取消输入框中的高级设置

--bug=1017964 --user=宋天阳 【接口测试】mock期望 -
响应体中的mock和jmeter函数不生效
https://www.tapd.cn/55049933/s/1281624
This commit is contained in:
song-tianyang 2022-10-28 12:05:49 +08:00 committed by 建国
parent 9fe7ad5fec
commit a0b1cd12b9
4 changed files with 19 additions and 16 deletions

View File

@ -65,6 +65,7 @@
:deep="deep+1" :root="false" class="children" :deep="deep+1" :root="false" class="children"
:scenario-definition="scenarioDefinition" :scenario-definition="scenarioDefinition"
:show-mock-vars="showMockVars" :show-mock-vars="showMockVars"
:disabled="disabled"
@editScenarioAdvance="editScenarioAdvance" @editScenarioAdvance="editScenarioAdvance"
:lang="lang" :custom="custom" @changeAllItemsType="changeAllItemsType"/> :lang="lang" :custom="custom" @changeAllItemsType="changeAllItemsType"/>
</template> </template>

View File

@ -29,6 +29,7 @@
:is-read-only="isReadOnly" :is-read-only="isReadOnly"
:is-show-enable="isShowEnable" :is-show-enable="isShowEnable"
:suggestions="suggestions" :suggestions="suggestions"
:disable-variable-tip="true"
:parameters="body.kvs"/> :parameters="body.kvs"/>
</div> </div>
<div v-if="body.type == 'JSON'"> <div v-if="body.type == 'JSON'">
@ -78,8 +79,7 @@ import MsDropdown from "@/business/commons/MsDropdown";
import MsApiFromUrlVariable from "@/business/definition/components/body/ApiFromUrlVariable"; import MsApiFromUrlVariable from "@/business/definition/components/body/ApiFromUrlVariable";
import BatchAddParameter from "@/business/definition/components/basis/BatchAddParameter"; import BatchAddParameter from "@/business/definition/components/basis/BatchAddParameter";
import Convert from "@/business/commons/json-schema/convert/convert"; import Convert from "@/business/commons/json-schema/convert/convert";
import MockCombinationCondition import MockCombinationCondition from "@/business/definition/components/mock/Components/MockCombinationCondition";
from "@/business/definition/components/mock/Components/MockCombinationCondition";
export default { export default {
name: "MockApiBody", name: "MockApiBody",

View File

@ -22,7 +22,7 @@
</el-row> </el-row>
<ms-api-key-value :append-to-body="true" :show-desc="true" :is-read-only="isReadOnly" <ms-api-key-value :append-to-body="true" :show-desc="true" :is-read-only="isReadOnly"
:isShowEnable="isShowEnable" :isShowEnable="isShowEnable"
:suggestions="headerSuggestions" :items="request.headers" :need-mock="true"/> :suggestions="headerSuggestions" :items="request.headers" :need-mock="false"/>
</el-tab-pane> </el-tab-pane>
<!--query 参数--> <!--query 参数-->
@ -41,6 +41,7 @@
</el-row> </el-row>
<mock-combination-condition :filter-type-object="request" :is-read-only="isReadOnly" <mock-combination-condition :filter-type-object="request" :is-read-only="isReadOnly"
:is-show-enable="isShowEnable" :suggestions="apiParams.query" :is-show-enable="isShowEnable" :suggestions="apiParams.query"
:disable-variable-tip="true"
:parameters="request.arguments"/> :parameters="request.arguments"/>
</el-tab-pane> </el-tab-pane>
@ -62,6 +63,7 @@
</el-row> </el-row>
<mock-combination-condition :is-rest="true" :filter-type-object="request" :is-read-only="isReadOnly" <mock-combination-condition :is-rest="true" :filter-type-object="request" :is-read-only="isReadOnly"
:is-show-enable="isShowEnable" :suggestions="apiParams.rest" :is-show-enable="isShowEnable" :suggestions="apiParams.rest"
:disable-variable-tip="true"
:parameters="request.rest"/> :parameters="request.rest"/>
</el-tab-pane> </el-tab-pane>
@ -104,12 +106,10 @@ import {hasLicense, hasPermission} from "metersphere-frontend/src/utils/permissi
import BatchAddParameter from "@/business/definition/components/basis/BatchAddParameter"; import BatchAddParameter from "@/business/definition/components/basis/BatchAddParameter";
import MsApiAdvancedConfig from "@/business/definition/components/request/http/ApiAdvancedConfig"; import MsApiAdvancedConfig from "@/business/definition/components/request/http/ApiAdvancedConfig";
import MsJsr233Processor from "@/business/automation/scenario/component/Jsr233Processor"; import MsJsr233Processor from "@/business/automation/scenario/component/Jsr233Processor";
import ApiDefinitionStepButton import ApiDefinitionStepButton from "@/business/definition/components/request/components/ApiDefinitionStepButton";
from "@/business/definition/components/request/components/ApiDefinitionStepButton";
import Convert from "@/business/commons/json-schema/convert/convert"; import Convert from "@/business/commons/json-schema/convert/convert";
import MockApiBody from "@/business/definition/components/mock/Components/MockApiBody"; import MockApiBody from "@/business/definition/components/mock/Components/MockApiBody";
import MockCombinationCondition import MockCombinationCondition from "@/business/definition/components/mock/Components/MockCombinationCondition";
from "@/business/definition/components/mock/Components/MockCombinationCondition";
export default { export default {
name: "MockRequestParam", name: "MockRequestParam",

View File

@ -5,14 +5,14 @@
{{ $t('project.version.name') }}: {{ versionName }} {{ $t('project.version.name') }}: {{ versionName }}
</div> </div>
<div style="float: left;margin-top: 15px"> <div style="float: left;margin-top: 15px">
Mock地址 Mock地址
<el-link v-if="this.getUrlPrefix !== '' " :href="getUrlPrefix" style="color: black" target="_blank" <el-link v-if="this.getUrlPrefix !== '' " :href="getUrlPrefix" style="color: black" target="_blank"
type="primary"> type="primary">
<span>{{ this.getUrlPrefix }}</span> <span>{{ this.getUrlPrefix }}</span>
</el-link> </el-link>
<el-link v-else style="color: darkred" target="_blank" <el-link v-else style="color: darkred" target="_blank"
type="primary">当前项目未开启Mock服务 type="primary">当前项目未开启Mock服务
</el-link> </el-link>
</div> </div>
<el-input :placeholder="$t('commons.search_by_name')" class="search-input" size="small" <el-input :placeholder="$t('commons.search_by_name')" class="search-input" size="small"
:clearable="true" :clearable="true"
@ -167,7 +167,9 @@ export default {
} }
}, },
created() { created() {
this.mockConfigData = this.baseMockConfigData; if (this.baseMockConfigData) {
this.mockConfigData = this.baseMockConfigData;
}
this.checkVersionEnable(); this.checkVersionEnable();
this.initMockEnvironment(); this.initMockEnvironment();
}, },