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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Captain.B 2020-07-17 11:19:06 +08:00
parent e15ad8f025 55c0a4be65
commit 7ce4b17c7a
3 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -400,12 +400,12 @@ class JMXRequest {
this.pathname = decodeURIComponent(url.pathname); this.pathname = decodeURIComponent(url.pathname);
this.port = url.port; this.port = url.port;
this.protocol = url.protocol.split(":")[0]; this.protocol = url.protocol.split(":")[0];
this.pathname = this.getPostQueryParameters(request, this.pathname); this.pathname = this.getPostQueryParameters(request, this.pathname);
} else { } else {
this.environment = request.environment; this.environment = request.environment;
this.port = request.environment.port; this.port = request.environment.port;
this.path = decodeURIComponent(request.path); this.path = decodeURIComponent(request.path);
this.path = this.getPostQueryParameters(request, this.path); this.path = this.getPostQueryParameters(request, this.path);
} }
} }
} }
@ -485,22 +485,26 @@ class JMXGenerator {
}) })
} }
addScenarioVariables(threadGroup, scenario) { addEnvironments(environments, target) {
let scenarioVariableKeys = new Set(); let keys = new Set();
scenario.variables.forEach(item => { target.forEach(item => {
scenarioVariableKeys.add(item.name); keys.add(item.name);
}); });
let envArray = environments;
if (!(envArray instanceof Array)) {
envArray = JSON.parse(environments);
envArray.forEach(item => {
if (item.name && !keys.has(item.name)) {
target.push(new KeyValue(item.name, item.value));
}
})
}
}
addScenarioVariables(threadGroup, scenario) {
let environment = scenario.environment; let environment = scenario.environment;
if (environment) { if (environment) {
let envVariables = environment.variables; this.addEnvironments(environment.variables, scenario.variables)
if (!(envVariables instanceof Array)) {
envVariables = JSON.parse(environment.variables);
envVariables.forEach(item => {
if (item.name && !scenarioVariableKeys.has(item.name)) {
scenario.variables.push(new KeyValue(item.name, item.value));
}
})
}
} }
let args = this.filterKV(scenario.variables); let args = this.filterKV(scenario.variables);
if (args.length > 0) { if (args.length > 0) {
@ -510,21 +514,9 @@ class JMXGenerator {
} }
addScenarioHeaders(threadGroup, scenario) { addScenarioHeaders(threadGroup, scenario) {
let scenarioHeaderKeys = new Set();
scenario.headers.forEach(item => {
scenarioHeaderKeys.add(item.name);
});
let environment = scenario.environment; let environment = scenario.environment;
if (environment) { if (environment) {
let envHeaders = environment.headers; this.addEnvironments(environment.headers, scenario.headers)
if (!(envHeaders instanceof Array)) {
envHeaders = JSON.parse(environment.headers);
envHeaders.forEach(item => {
if (item.name && !scenarioHeaderKeys.has(item.name)) {
scenario.headers.push(new KeyValue(item.name, item.value));
}
})
}
} }
let headers = this.filterKV(scenario.headers); let headers = this.filterKV(scenario.headers);
if (headers.length > 0) { if (headers.length > 0) {

10
frontend/src/business/components/common/components/search/MsTableAdvSearchBar.vue
View File

@ -72,9 +72,13 @@
reset() { reset() {
let source = this.condition.components; let source = this.condition.components;
this.config.components.forEach((component, index) => { this.config.components.forEach((component, index) => {
let operator = source[index].operator.value; if (component.operator.value !== undefined) {
component.operator.value = operator === undefined ? component.operator.options[0].value : operator; let operator = source[index].operator.value;
component.value = source[index].value; component.operator.value = operator === undefined ? component.operator.options[0].value : operator;
}
if (component.value !== undefined) {
component.value = source[index].value;
}
}) })
}, },
open() { open() {

4
frontend/src/business/components/common/components/search/search-components.js
View File

@ -215,8 +215,8 @@ export const MODULE = {
name: 'MsTableSearchInput', name: 'MsTableSearchInput',
label: "test_track.case.module", label: "test_track.case.module",
operator: { operator: {
value: OPERATORS.LIKE.value, // 如果未设置value初始值，则value初始值为options[0] value: OPERATORS.LIKE.value,
options: [OPERATORS.LIKE, OPERATORS.NOT_LIKE] // 运算符候选项 options: [OPERATORS.LIKE, OPERATORS.NOT_LIKE]
}, },
} }