fix(Mock测试): #1007343 #1007342 编辑接口-MOCK-添加queryt-单击高级配置页面变暗,【接口定义】-添加mock期望时多选框提示信息错误

--bug=1007343 --user=宋天阳 【接口定义】-编辑接口-MOCK-添加queryt-单击高级配置页面变暗
https://www.tapd.cn/55049933/s/1057804;--bug=1007342 --user=宋天阳
【接口定义】-添加mock期望时多选框提示信息错误 https://www.tapd.cn/55049933/s/1057805
This commit is contained in:
song-tianyang 2021-10-22 16:10:51 +08:00 committed by song-tianyang
parent 2404e2c4a5
commit e4f9df5822
9 changed files with 49 additions and 8 deletions

View File

@ -60,7 +60,7 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<ms-api-variable-advance :current-item="currentItem" :parameters="keyValues" ref="variableAdvance"/> <ms-api-variable-advance :append-to-body="appendToBody" :current-item="currentItem" :parameters="keyValues" ref="variableAdvance"/>
</div> </div>
</template> </template>
@ -92,7 +92,13 @@
type: Boolean, type: Boolean,
default: false default: false
}, },
showDesc: Boolean showDesc: Boolean,
appendToBody: {
type: Boolean,
default() {
return false;
}
},
}, },
data() { data() {
return { return {

View File

@ -89,11 +89,12 @@
</el-row> </el-row>
</div> </div>
<ms-api-variable-advance ref="variableAdvance" :environment="environment" :scenario="scenario" <ms-api-variable-advance ref="variableAdvance" :environment="environment" :scenario="scenario"
:append-to-body="appendDialogToBody"
:parameters="parameters" :parameters="parameters"
:current-item="currentItem"/> :current-item="currentItem"/>
<ms-api-variable-json ref="variableJson" @callback="callback"/> <ms-api-variable-json :append-to-body="appendDialogToBody" ref="variableJson" @callback="callback"/>
<api-variable-setting <api-variable-setting :append-to-body="appendDialogToBody"
ref="apiVariableSetting"/> ref="apiVariableSetting"/>
</div> </div>
@ -124,6 +125,12 @@ export default {
type: String, type: String,
default: '' default: ''
}, },
appendDialogToBody: {
type: Boolean,
default() {
return false;
}
},
isReadOnly: { isReadOnly: {
type: Boolean, type: Boolean,
default: false default: false

View File

@ -1,6 +1,7 @@
<template> <template>
<el-dialog :title="$t('api_test.request.parameters_advance')" <el-dialog :title="$t('api_test.request.parameters_advance')"
:visible.sync="itemValueVisible" :visible.sync="itemValueVisible"
:append-to-body="appendToBody"
class="advanced-item-value" class="advanced-item-value"
width="70%"> width="70%">
<el-tabs tab-position="top" style="height: 50vh;" @tab-click="selectTab"> <el-tabs tab-position="top" style="height: 50vh;" @tab-click="selectTab">
@ -100,6 +101,12 @@
environment: Object, environment: Object,
scenario: Scenario, scenario: Scenario,
currentItem: Object, currentItem: Object,
appendToBody: {
type: Boolean,
default() {
return false;
}
},
}, },
data() { data() {
return { return {

View File

@ -1,6 +1,6 @@
<template> <template>
<el-dialog <el-dialog :append-to-body="appendToBody"
:visible.sync="dialogVisible" destroy-on-close @close="close"> :visible.sync="dialogVisible" destroy-on-close @close="close">
<div style="padding: 10px"> <div style="padding: 10px">
<el-switch active-text="JSON-SCHEMA" v-model="item.jsonType" @change="formatChange" active-value="JSON-SCHEMA"/> <el-switch active-text="JSON-SCHEMA" v-model="item.jsonType" @change="formatChange" active-value="JSON-SCHEMA"/>
@ -36,6 +36,12 @@ export default {
type: Boolean, type: Boolean,
default: false default: false
}, },
appendToBody: {
type: Boolean,
default() {
return false;
}
},
}, },
data() { data() {
return { return {

View File

@ -4,6 +4,7 @@
width="30%" width="30%"
:title="$t('run_mode.other_config')" :title="$t('run_mode.other_config')"
:with-footer="false" :with-footer="false"
:append-to-body="appendToBody"
:close-on-click-modal="true"> :close-on-click-modal="true">
<el-form> <el-form>
<el-row> <el-row>
@ -34,6 +35,14 @@
data: {} data: {}
} }
}, },
props:{
appendToBody: {
type: Boolean,
default() {
return false;
}
},
},
methods: { methods: {
open(item) { open(item) {
this.visible = true; this.visible = true;

View File

@ -30,6 +30,7 @@
:is-read-only="isReadOnly" :is-read-only="isReadOnly"
:parameters="body.kvs" :parameters="body.kvs"
:isShowEnable="isShowEnable" :isShowEnable="isShowEnable"
:append-dialog-to-body="true"
type="body"/> type="body"/>
</div> </div>
<div v-if="body.type == 'JSON'"> <div v-if="body.type == 'JSON'">

View File

@ -17,7 +17,7 @@
<el-row> <el-row>
<el-link class="ms-el-link" @click="batchAdd" style="color: #783887"> {{ $t("commons.batch_add") }}</el-link> <el-link class="ms-el-link" @click="batchAdd" style="color: #783887"> {{ $t("commons.batch_add") }}</el-link>
</el-row> </el-row>
<ms-api-key-value :show-desc="true" :is-read-only="isReadOnly" :isShowEnable="isShowEnable" :suggestions="headerSuggestions" :items="request.headers" :need-mock="true"/> <ms-api-key-value :append-to-body="true" :show-desc="true" :is-read-only="isReadOnly" :isShowEnable="isShowEnable" :suggestions="headerSuggestions" :items="request.headers" :need-mock="true"/>
</el-tab-pane> </el-tab-pane>
<!--query 参数--> <!--query 参数-->
@ -31,7 +31,7 @@
<el-row> <el-row>
<el-link class="ms-el-link" @click="batchAdd" style="color: #783887"> {{ $t("commons.batch_add") }}</el-link> <el-link class="ms-el-link" @click="batchAdd" style="color: #783887"> {{ $t("commons.batch_add") }}</el-link>
</el-row> </el-row>
<ms-api-variable :with-mor-setting="true" :is-read-only="isReadOnly" :isShowEnable="isShowEnable" :parameters="request.arguments"/> <ms-api-variable :append-dialog-to-body="true" :with-mor-setting="true" :is-read-only="isReadOnly" :isShowEnable="isShowEnable" :parameters="request.arguments"/>
</el-tab-pane> </el-tab-pane>
<!--REST 参数--> <!--REST 参数-->
@ -47,7 +47,7 @@
<el-row> <el-row>
<el-link class="ms-el-link" @click="batchAdd" style="color: #783887"> {{ $t("commons.batch_add") }}</el-link> <el-link class="ms-el-link" @click="batchAdd" style="color: #783887"> {{ $t("commons.batch_add") }}</el-link>
</el-row> </el-row>
<ms-api-variable :with-mor-setting="true" :is-read-only="isReadOnly" :isShowEnable="isShowEnable" :parameters="request.rest"/> <ms-api-variable :append-dialog-to-body="true" :with-mor-setting="true" :is-read-only="isReadOnly" :isShowEnable="isShowEnable" :parameters="request.rest"/>
</el-tab-pane> </el-tab-pane>
<!--请求体--> <!--请求体-->

View File

@ -12,6 +12,8 @@
v-loading="result.loading" v-loading="result.loading"
:data="mockConfigData.mockExpectConfigList.filter(data=>!tableSearch || data.name.toLowerCase().includes(tableSearch.toLowerCase()))" :data="mockConfigData.mockExpectConfigList.filter(data=>!tableSearch || data.name.toLowerCase().includes(tableSearch.toLowerCase()))"
:operators="operators" :operators="operators"
:page-size="pageSize"
:showSelectAll="false"
:screen-height="screenHeight" :screen-height="screenHeight"
@row-click="clickRow" @row-click="clickRow"
row-key="id" row-key="id"
@ -93,6 +95,7 @@ export default {
mockConfigData: {}, mockConfigData: {},
tableSearch:"", tableSearch:"",
apiParams: [], apiParams: [],
pageSize: 10,
screenHeight:document.documentElement.clientHeight - 250, screenHeight:document.documentElement.clientHeight - 250,
operators: [ operators: [
{ {

View File

@ -224,6 +224,8 @@ export default {
rowOrderGroupId: String, rowOrderGroupId: String,
rowOrderFunc: Function rowOrderFunc: Function
}, },
created() {
},
mounted() { mounted() {
this.setDefaultOrders(); this.setDefaultOrders();
}, },