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

fix(接口测试): 修复引用场景中断言可编辑的缺陷 

--bug=1013564 --user=王孝刚 【接口测试】场景A中引用场景B-场景B中含场景断言-断言信息可编辑
https://www.tapd.cn/55049933/s/1168938
This commit is contained in:
wxg0103 2022-05-30 17:45:37 +08:00 committed by f2c-ci-robot[bot]
parent 426e5208a7
commit 606fe809fd
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/business/components/api/definition/components/assertion/ApiAssertionJsonPath.vue
View File

@ -6,7 +6,8 @@
:placeholder="$t('api_test.request.extract.json_path_expression')"/>
</el-col>
<el-col>
<el-select v-model="jsonPath.option" class="ms-col-type" size="small" style="width:40%;margin-right: 10px" @change="reload">
<el-select :disabled="isReadOnly" v-model="jsonPath.option" class="ms-col-type" size="small"
style="width:40%;margin-right: 10px" @change="reload">
<el-option :label="$t('api_test.request.assertions.contains')" value="CONTAINS"/>
<el-option :label="$t('api_test.request.assertions.not_contains')" value="NOT_CONTAINS"/>
<el-option :label="$t('api_test.request.assertions.equals')" value="EQUALS"/>

20
frontend/src/business/components/api/definition/components/assertion/ScenarioAssertions.vue
View File

@ -22,14 +22,14 @@
<api-json-path-suggest-button
:show-suggest-button="false"
:clear-tip="$t('api_test.request.assertions.json_path_clear')"
:isReadOnly="isReadOnly"
:isReadOnly="request.disabled"
@clear="clearJson"/>
</span>
</el-row>
<div class="assertion-add" :draggable="draggable">
<el-row :gutter="10">
<el-col :span="4">
<el-select :disabled="isReadOnly" class="assertion-item" v-model="type"
<el-select :disabled="request.disabled" class="assertion-item" v-model="type"
:placeholder="$t('api_test.request.assertions.select_type')" size="small">
<el-option :label="$t('api_test.request.assertions.text')" :value="options.TEXT"/>
<el-option :label="$t('api_test.request.assertions.regex')" :value="options.REGEX"/>
@ -42,45 +42,45 @@
</el-col>
<el-col :span="20">
<ms-api-assertion-text
:is-read-only="isReadOnly"
:is-read-only="request.disabled"
:list="assertions.regex"
:callback="after"
v-if="type === options.TEXT"
/>
<ms-api-assertion-regex
:is-read-only="isReadOnly"
:is-read-only="request.disabled"
:list="assertions.regex"
:callback="after"
@callback="after"
v-if="type === options.REGEX"
/>
<ms-api-assertion-json-path
:is-read-only="isReadOnly"
:is-read-only="request.disabled"
:list="assertions.jsonPath"
:callback="after"
v-if="type === options.JSON_PATH"
/>
<ms-api-assertion-x-path2
:is-read-only="isReadOnly"
:is-read-only="request.disabled"
:list="assertions.xpath2"
:callback="after"
v-if="type === options.XPATH2"
/>
<ms-api-assertion-duration
v-model="time"
:is-read-only="isReadOnly"
:is-read-only="request.disabled"
:duration="assertions.duration"
:callback="after"
v-if="type === options.DURATION"
/>
<ms-api-assertion-jsr223
:is-read-only="isReadOnly"
:is-read-only="request.disabled"
:list="assertions.jsr223"
:callback="after"
v-if="type === options.JSR223"
/>
<ms-api-assertion-document
:is-read-only="isReadOnly"
:is-read-only="request.disabled"
v-model="time"
:document="assertions.document"
:callback="after"
@ -95,7 +95,7 @@
<ms-api-assertions-edit
:is-read-only="isReadOnly"
:is-read-only="request.disabled"
:assertions="assertions"
:apiId="apiId"
:reloadData="reloadData"