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

fix(接口测试): 修复断言步骤内容不支持鼠标滑动全选问题 

--bug=1013062 --user=赵勇 [接口测试] github#12290断言文字不能全选 https://www.tapd.cn/55049933/s/1156233
This commit is contained in:
fit2-zhao 2022-05-11 18:40:46 +08:00 committed by jianxing
parent 9e34204462
commit eb1107def1
2 changed files with 155 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
frontend/src/business/components/api/definition/components/assertion/ApiAssertions.vue
View File

@ -1,5 +1,5 @@
<template>
<el-card>
<el-card :draggable="true">
<el-row>
<span>{{ $t('api_test.request.assertions.description') }}</span>
<span style="float: right">
@ -14,7 +14,8 @@
<div class="assertion-add" :draggable="draggable">
<el-row :gutter="10">
<el-col :span="4">
<el-select :disabled="isReadOnly" class="assertion-item" v-model="type" :placeholder="$t('api_test.request.assertions.select_type')" size="small">
<el-select :disabled="isReadOnly" 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"/>
<el-option :label="'JSONPath'" :value="options.JSON_PATH"/>
@ -94,22 +95,22 @@
</template>
<script>
import MsApiAssertionText from "./ApiAssertionText";
import MsApiAssertionRegex from "./ApiAssertionRegex";
import MsApiAssertionDuration from "./ApiAssertionDuration";
import {ASSERTION_TYPE, JSONPath} from "../../model/ApiTestModel";
import MsApiAssertionsEdit from "./ApiAssertionsEdit";
import MsApiAssertionJsonPath from "./ApiAssertionJsonPath";
import MsApiAssertionJsr223 from "./ApiAssertionJsr223";
import MsApiJsonpathSuggestList from "./ApiJsonpathSuggestList";
import MsApiAssertionXPath2 from "./ApiAssertionXPath2";
import {getUUID} from "@/common/js/utils";
import ApiJsonPathSuggestButton from "./ApiJsonPathSuggestButton";
import MsApiJsonpathSuggest from "./ApiJsonpathSuggest";
import ApiBaseComponent from "../../../automation/scenario/common/ApiBaseComponent";
import MsApiAssertionDocument from "./document/DocumentHeader";
import MsApiAssertionText from "./ApiAssertionText";
import MsApiAssertionRegex from "./ApiAssertionRegex";
import MsApiAssertionDuration from "./ApiAssertionDuration";
import {ASSERTION_TYPE, JSONPath} from "../../model/ApiTestModel";
import MsApiAssertionsEdit from "./ApiAssertionsEdit";
import MsApiAssertionJsonPath from "./ApiAssertionJsonPath";
import MsApiAssertionJsr223 from "./ApiAssertionJsr223";
import MsApiJsonpathSuggestList from "./ApiJsonpathSuggestList";
import MsApiAssertionXPath2 from "./ApiAssertionXPath2";
import {getUUID} from "@/common/js/utils";
import ApiJsonPathSuggestButton from "./ApiJsonPathSuggestButton";
import MsApiJsonpathSuggest from "./ApiJsonpathSuggest";
import ApiBaseComponent from "../../../automation/scenario/common/ApiBaseComponent";
import MsApiAssertionDocument from "./document/DocumentHeader";
export default {
export default {
name: "MsApiAssertions",
components: {
ApiBaseComponent,
@ -239,26 +240,26 @@ export default {
this.assertions.jsonPath = [];
}
}
}
}
</script>
<style scoped>
.assertion-item {
.assertion-item {
width: 100%;
}
}
.assertion-add {
.assertion-add {
padding: 10px;
margin: 5px 0;
border-radius: 5px;
border: #DCDFE6 solid 1px;
}
}
.icon.is-active {
.icon.is-active {
transform: rotate(90deg);
}
}
/deep/ .el-card__body {
/deep/ .el-card__body {
padding: 6px 10px;
}
}
</style>

2
frontend/src/business/components/api/definition/components/step/JmxStep.vue
View File

@ -89,6 +89,7 @@
:response="response"
:is-read-only="data.disabled"
:extract="data"
:draggable="true"
@copyRow="copyRow"
@remove="remove"
v-if="data.type==='Extract'"
@ -104,6 +105,7 @@
:response="response"
:request="request"
:apiId="apiId"
:draggable="true"
:is-read-only="data.disabled"
:assertions="data"/>
</div>