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

fix(接口测试): 修复文件上传参数值勾选等问题

This commit is contained in:
chenjianxing 2020-09-25 13:59:45 +08:00
parent cc364cf1fc
commit 3813cdc120
13 changed files with 56 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java
View File

@ -12,6 +12,7 @@ public class KeyValue {
private String type;
private List<BodyFile> files;
private String description;
private String contentType;
private boolean enable;
public KeyValue() {

4
backend/src/main/java/io/metersphere/controller/TestController.java
View File

@ -1,6 +1,7 @@
package io.metersphere.controller;
import com.alibaba.fastjson.JSONObject;
import io.metersphere.base.domain.User;
import io.metersphere.commons.utils.SessionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.*;
@ -15,7 +16,8 @@ public class TestController {
@PostMapping(value = "/upload", consumes = {"multipart/form-data"})
public Object testUpload(@RequestPart(value = "id") String id, @RequestPart(value = "file") MultipartFile file, @RequestPart(value = "files") List<MultipartFile> bodyFiles) {
public Object testUpload(@RequestPart(value = "id") String id, @RequestPart(value = "file") MultipartFile file, @RequestPart(value = "files") List<MultipartFile> bodyFiles
, @RequestPart(value = "user") User user, @RequestParam(value = "name") String name) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("id", id);
jsonObject.put("file", file.getOriginalFilename());

31
frontend/src/business/components/api/test/components/ApiKeyValue.vue
View File

@ -6,8 +6,8 @@
<div class="kv-row" v-for="(item, index) in items" :key="index">
<el-row type="flex" :gutter="20" justify="space-between" align="middle">
<el-col v-if="isShowEnable" class="kv-checkbox">
<input type="checkbox" v-if="!isDisable(index)" @change="change" :value="item.uuid" v-model="checkedValues"
:disabled="isDisable(index) || isReadOnly"/>
<input type="checkbox" v-if="!isDisable(index)" v-model="item.enable"
:disabled="isReadOnly"/>
</el-col>
<el-col>
@ -52,7 +52,7 @@
},
data() {
return {
checkedValues: []
// checkedValues: []
}
},
computed: {
@ -79,10 +79,6 @@
let isNeedCreate = true;
let removeIndex = -1;
this.items.forEach((item, index) => {
// 启用行赋值
if (this.isShowEnable) {
item.enable = this.checkedValues.indexOf(item.uuid) != -1 ? true : false;
}
if (!item.name && !item.value) {
// 多余的空行
if (index !== this.items.length - 1) {
@ -93,13 +89,7 @@
}
});
if (isNeedCreate) {
// 往后台送入的复选框值布尔值
if (this.isShowEnable) {
this.items[this.items.length - 1].enable = true;
// v-model 选中状态
this.checkedValues.push(this.items[this.items.length - 1].uuid);
}
this.items.push(new KeyValue());
this.items.push(new KeyValue({enable: true}));
}
this.$emit('change', this.items);
// TODO 检查key重复
@ -112,9 +102,6 @@
let results = queryString ? suggestions.filter(this.createFilter(queryString)) : suggestions;
cb(results);
},
uuid: function () {
return (((1 + Math.random()) * 0x100000) | 0).toString(16).substring(1);
},
createFilter(queryString) {
return (restaurant) => {
return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
@ -123,15 +110,7 @@
},
created() {
if (this.items.length === 0) {
this.items.push(new KeyValue());
} else if (this.isShowEnable) {
this.items.forEach((item, index) => {
let uuid = this.uuid();
item.uuid = uuid;
if (item.enable) {
this.checkedValues.push(uuid);
}
})
this.items.push(new KeyValue({enable: true}));
}
}
}

49
frontend/src/business/components/api/test/components/ApiVariable.vue
View File

@ -3,26 +3,27 @@
<span class="kv-description" v-if="description">
{{ description }}
</span>
<div class="kv-row" v-for="(item, index) in parameters" :key="index">
<el-row type="flex" :gutter="20" justify="space-between" align="middle">
<el-col class="kv-checkbox">
<input type="checkbox" v-if="!isDisable(index)" @change="change" :value="item.uuid" v-model="checkedValues"
:disabled="isDisable(index) || isReadOnly"/>
<input type="checkbox" v-if="!isDisable(index)" v-model="item.enable"
:disabled="isReadOnly"/>
</el-col>
<el-col>
<el-input v-if="!suggestions" :disabled="isReadOnly" v-model="item.name" size="small" maxlength="200"
@change="change" :placeholder="keyText" show-word-limit>
<template v-slot:prepend>
<el-select v-if="type === 'body'" :disabled="isReadOnly" class="kv-type" v-model="item.type">
<el-select v-if="type === 'body'" :disabled="isReadOnly" class="kv-type" v-model="item.type" @change="typeChange(item)">
<el-option value="text"/>
<el-option value="file"/>
</el-select>
</template>
</el-input>
<el-autocomplete :disabled="isReadOnly" :maxlength="200" v-if="suggestions" v-model="item.name" size="small"
<el-autocomplete :disabled="isReadOnly" v-if="suggestions" v-model="item.name" size="small"
:fetch-suggestions="querySearch" @change="change" :placeholder="keyText" show-word-limit/>
</el-col>
@ -44,6 +45,13 @@
<el-col v-if="item.type === 'file'">
<ms-api-body-file-upload :parameter="item"/>
</el-col>
<el-col v-if="type === 'body'">
<el-input :disabled="isReadOnly" v-model="item.contentType" size="small" maxlength="100"
@change="change" :placeholder="$t('api_test.request.content_type')" show-word-limit>
</el-input>
</el-col>
<el-col class="kv-delete">
<el-button size="mini" class="el-icon-delete-solid" circle @click="remove(index)"
:disabled="isDisable(index) || isReadOnly"/>
@ -85,7 +93,6 @@
data() {
return {
currentItem: null,
checkedValues: []
}
},
computed: {
@ -98,9 +105,6 @@
},
methods: {
remove: function (index) {
// 移除勾选内容
let checkIndex = this.checkedValues.indexOf(this.parameters[index].uuid);
checkIndex != -1 ? this.checkedValues.splice(checkIndex, 1) : this.checkedValues;
// 移除整行输入控件及内容
this.parameters.splice(index, 1);
this.$emit('change', this.parameters);
@ -109,9 +113,6 @@
let isNeedCreate = true;
let removeIndex = -1;
this.parameters.forEach((item, index) => {
// 启用行赋值
item.enable = this.checkedValues.indexOf(item.uuid) != -1 ? true : false;
if (!item.name && !item.value) {
// 多余的空行
if (index !== this.parameters.length - 1) {
@ -122,11 +123,7 @@
}
});
if (isNeedCreate) {
// 往后台送入的复选框值布尔值
this.parameters[this.parameters.length - 1].enable = true;
// v-model 选中状态
this.checkedValues.push(this.parameters[this.parameters.length - 1].uuid);
this.parameters.push(new KeyValue(null, null, 'text', false, this.uuid()));
this.parameters.push(new KeyValue({type: 'text', enable: true, uuid: this.uuid(), contentType: 'text/plain'}));
}
this.$emit('change', this.parameters);
// TODO 检查key重复
@ -161,22 +158,18 @@
advanced(item) {
this.$refs.variableAdvance.open();
this.currentItem = item;
this.itemValue = '';
this.mockVariableFuncs = [];
},
typeChange(item) {
if (item.type === 'file') {
item.contentType = 'application/octet-stream';
} else {
item.contentType = 'text/plain';
}
}
},
created() {
if (this.parameters.length === 0) {
this.parameters.push(new KeyValue(null, null, 'text', false, this.uuid()));
} else {
this.parameters.forEach((item, index) => {
let uuid = this.uuid();
item.uuid = uuid;
if (item.enable) {
this.checkedValues.push(uuid);
}
})
this.parameters.push(new KeyValue( {type: 'text', enable: true, uuid: this.uuid(), contentType: 'text/plain'}));
}
}
}

2
frontend/src/business/components/api/test/components/ApiVariableAdvance.vue
View File

@ -173,7 +173,7 @@ export default {
}
];
if (this.environment) {
let variables = JSON.parse(this.environment.variables);
let variables = this.environment.config.commonConfig.variables;
this.environmentParams = [
{
name: this.environment.name,

6
frontend/src/business/components/api/test/components/body/ApiBodyFileUpload.vue
View File

@ -105,9 +105,9 @@
.api-body-upload {
min-height: 32px;
/*border: 1px solid #EBEEF5;*/
/*padding: 2px;*/
/*border-radius: 4px;*/
border: 1px solid #EBEEF5;
padding: 2px;
border-radius: 4px;
}
.upload-item {

2
frontend/src/business/components/api/test/components/request/ApiHttpRequestForm.vue
View File

@ -156,7 +156,7 @@ export default {
let url = new URL(urlStr);
url.searchParams.forEach((value, key) => {
if (key && value) {
this.request.parameters.splice(0, 0, new KeyValue(key, value));
this.request.parameters.splice(0, 0, new KeyValue({name: name, value: value}));
}
});
return url;

5
frontend/src/business/components/api/test/model/JMX.js
View File

@ -344,6 +344,9 @@ export class HTTPSamplerArguments extends Element {
}
elementProp.stringProp('Argument.value', arg.value);
elementProp.stringProp('Argument.metadata', arg.metadata || "=");
if (arg.contentType) {
elementProp.stringProp('HTTPArgument.content_type', arg.contentType, "");
}
}
});
}
@ -363,7 +366,7 @@ export class HTTPsamplerFiles extends Element {
let elementProp = collectionProp.elementProp(arg.value, 'HTTPFileArg');
elementProp.stringProp('File.path', arg.value);
elementProp.stringProp('File.paramname', arg.name);
elementProp.stringProp('File.mimetype', arg.metadata || "application/octet-stream");
elementProp.stringProp('File.mimetype', arg.contentType || "application/octet-stream");
});
}
}

43
frontend/src/business/components/api/test/model/ScenarioModel.js
View File

@ -656,35 +656,18 @@ export class Body extends BaseConfig {
}
export class KeyValue extends BaseConfig {
constructor() {
let options, key, value, type, enable, uuid;
if (arguments.length === 1) {
options = arguments[0];
}
constructor(options) {
options = options || {};
options.enable = options.enable != false ? true : false;
if (arguments.length === 2) {
key = arguments[0];
value = arguments[1];
}
if (arguments.length === 3) {
key = arguments[0];
value = arguments[1];
type = arguments[2];
}
if (arguments.length === 5) {
key = arguments[0];
value = arguments[1];
type = arguments[2];
enable = arguments[3];
uuid = arguments[4];
}
super();
this.name = key;
this.value = value;
this.type = type;
this.name = undefined;
this.value = undefined;
this.type = undefined;
this.files = undefined;
this.enable = enable;
this.uuid = uuid;
this.enable = undefined;
this.uuid = undefined;
this.contentType = undefined;
this.set(options);
}
@ -956,7 +939,7 @@ class JMXHttpRequest {
this.domain = environment.config.httpConfig.domain;
this.port = environment.config.httpConfig.port;
this.protocol = environment.config.httpConfig.protocol;
let url = new URL(environment.config.httpConfig.protocol + "://" + environment.config.commonConfig.socket);
let url = new URL(environment.config.httpConfig.protocol + "://" + environment.config.httpConfig.socket);
this.path = this.getPostQueryParameters(request, decodeURIComponent(url.pathname + (request.path ? request.path : '')));
}
this.connectTimeout = request.connectTimeout;
@ -1117,7 +1100,7 @@ class JMXGenerator {
}
envArray.forEach(item => {
if (item.name && !keys.has(item.name)) {
target.push(new KeyValue(item.name, item.value));
target.push(new KeyValue({name: item.name, value: item.value}));
}
})
}
@ -1294,7 +1277,7 @@ class JMXGenerator {
}
}
}
request.headers.push(new KeyValue('Content-Type', type));
request.headers.push(new KeyValue({name: 'Content-Type', value: type}));
}
addRequestArguments(httpSamplerProxy, request) {
@ -1323,7 +1306,7 @@ class JMXGenerator {
let files = [];
let kvs = this.filterKVFile(request.body.kvs);
kvs.forEach(kv => {
if (kv.files) {
if ((kv.enable != false) && kv.files) {
kv.files.forEach(file => {
let arg = {};
arg.name = kv.name;

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit cc38137a69a0f20fadece9c0f9f50a9468c4ace9
Subproject commit 06d935cd1d22ab36f09763745c2aff8ad3fb08c1

1
frontend/src/i18n/en-US.js
View File

@ -468,6 +468,7 @@ export default {
input_url: "Please enter the request URL",
input_path: "Please enter the request path",
name: "Name",
content_type: "Content Type",
method: "Method",
url: "URL",
path: "Path",

1
frontend/src/i18n/zh-CN.js
View File

@ -468,6 +468,7 @@ export default {
input_url: "请输入请求URL",
input_path: "请输入请求路径",
name: "请求名称",
content_type: "请求类型",
method: "请求方法",
url: "请求URL",
path: "请求路径",

1
frontend/src/i18n/zh-TW.js
View File

@ -470,6 +470,7 @@ export default {
name: "請求名稱",
method: "請求方法",
url: "請求URL",
content_type: "請求類型",
path: "請求路徑",
address: "請求地址",
refer_to_environment: "引用環境",