diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java b/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java index daf836b9d1..ed50eebd11 100644 --- a/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java +++ b/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java @@ -12,7 +12,8 @@ public class KeyValue { private String type; private List files; private String description; - private boolean checked; + private boolean enable; + public KeyValue() { } diff --git a/frontend/src/business/components/api/test/components/ApiKeyValue.vue b/frontend/src/business/components/api/test/components/ApiKeyValue.vue index 609243fa82..d80033d05e 100644 --- a/frontend/src/business/components/api/test/components/ApiKeyValue.vue +++ b/frontend/src/business/components/api/test/components/ApiKeyValue.vue @@ -6,7 +6,8 @@
- + @@ -32,122 +33,123 @@ diff --git a/frontend/src/business/components/api/test/components/ApiVariable.vue b/frontend/src/business/components/api/test/components/ApiVariable.vue index 12f34f60fc..daa4f1956a 100644 --- a/frontend/src/business/components/api/test/components/ApiVariable.vue +++ b/frontend/src/business/components/api/test/components/ApiVariable.vue @@ -7,7 +7,8 @@ - + @@ -56,166 +57,167 @@ diff --git a/frontend/src/business/components/api/test/model/JMX.js b/frontend/src/business/components/api/test/model/JMX.js index 1900540b17..f3b2d6180c 100644 --- a/frontend/src/business/components/api/test/model/JMX.js +++ b/frontend/src/business/components/api/test/model/JMX.js @@ -318,7 +318,7 @@ export class HTTPSamplerArguments extends Element { let collectionProp = this.collectionProp('Arguments.arguments'); this.args.forEach(arg => { - if(arg.checked) { // 非禁用的条件加入执行 + if (arg.enable) { // 非禁用的条件加入执行 let elementProp = collectionProp.elementProp(arg.name, 'HTTPArgument'); elementProp.boolProp('HTTPArgument.always_encode', arg.encode, true); elementProp.boolProp('HTTPArgument.use_equals', arg.equals, true); @@ -490,7 +490,7 @@ export class HeaderManager extends DefaultTestElement { this.headers.forEach(header => { let elementProp = collectionProp.elementProp('', 'Header'); - if(header.checked) { + if (header.enable) { elementProp.stringProp('Header.name', header.name); elementProp.stringProp('Header.value', header.value); } @@ -506,7 +506,7 @@ export class Arguments extends DefaultTestElement { let collectionProp = this.collectionProp('Arguments.arguments'); this.args.forEach(arg => { - if(arg.checked) { // 非禁用的条件加入执行 + if (arg.enable) { // 非禁用的条件加入执行 let elementProp = collectionProp.elementProp(arg.name, 'Argument'); elementProp.stringProp('Argument.name', arg.name); elementProp.stringProp('Argument.value', arg.value); @@ -531,7 +531,7 @@ export class ElementArguments extends Element { let collectionProp = this.collectionProp('Arguments.arguments'); if (args) { args.forEach(arg => { - if(arg.checked) { // 非禁用的条件加入执行 + if (arg.enable) { // 非禁用的条件加入执行 let elementProp = collectionProp.elementProp(arg.name, 'Argument'); elementProp.stringProp('Argument.name', arg.name); elementProp.stringProp('Argument.value', arg.value); diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js index f5bc39c00c..fdf78e460b 100644 --- a/frontend/src/business/components/api/test/model/ScenarioModel.js +++ b/frontend/src/business/components/api/test/model/ScenarioModel.js @@ -312,7 +312,7 @@ export class HttpRequest extends Request { this.jsr223PreProcessor = undefined; this.jsr223PostProcessor = undefined; this.enable = true; - this.connectTimeout = 60*1000; + this.connectTimeout = 60 * 1000; this.responseTimeout = undefined; this.followRedirects = true; @@ -541,7 +541,7 @@ export class Body extends BaseConfig { export class KeyValue extends BaseConfig { constructor() { - let options, key, value, type,checked,uuid; + let options, key, value, type, enable, uuid; if (arguments.length === 1) { options = arguments[0]; } @@ -559,7 +559,7 @@ export class KeyValue extends BaseConfig { key = arguments[0]; value = arguments[1]; type = arguments[2]; - checked = arguments[3]; + enable = arguments[3]; uuid = arguments[4]; } super(); @@ -567,7 +567,7 @@ export class KeyValue extends BaseConfig { this.value = value; this.type = type; this.files = undefined; - this.checked = checked; + this.enable = enable; this.uuid = uuid; this.set(options); } @@ -780,7 +780,7 @@ class JMXHttpRequest { if (this.method.toUpperCase() !== "GET") { let parameters = []; request.parameters.forEach(parameter => { - if (parameter.name && parameter.value && parameter.checked) { + if (parameter.name && parameter.value && parameter.enable) { parameters.push(parameter); } });