diff --git a/framework/sdk-parent/frontend/src/components/environment/EnvironmentHttpConfig.vue b/framework/sdk-parent/frontend/src/components/environment/EnvironmentHttpConfig.vue index a1596704c6..d1b6f0918d 100644 --- a/framework/sdk-parent/frontend/src/components/environment/EnvironmentHttpConfig.vue +++ b/framework/sdk-parent/frontend/src/components/environment/EnvironmentHttpConfig.vue @@ -45,11 +45,57 @@ -

{{ $t('api_test.request.headers') }}

- - {{ $t("commons.batch_add") }} - - + + +

{{ $t('api_test.request.headers') }}

+ + {{ + $t("commons.batch_add") + }} + + + +
+ + + + + + + {{ $t("ui.browser") }} + + + + + + + + + {{ $t("ui.performance_mode") }} + + + + + + + + + + + + +
{{ $t('commons.add') }} @@ -121,10 +167,12 @@ import {getUUID} from "../../utils"; import {KeyValue} from "../../model/EnvTestModel"; import Vue from "vue"; import BatchAddParameter from "./commons/BatchAddParameter"; +import FormSection from "metersphere-frontend/src/components/form/FormSection"; +import MsInstructionsIcon from 'metersphere-frontend/src/components/MsInstructionsIcon'; export default { name: "MsEnvironmentHttpConfig", - components: {MsApiKeyValue, MsSelectTree, MsTableOperatorButton, BatchAddParameter}, + components: {MsApiKeyValue, MsSelectTree, MsTableOperatorButton, BatchAddParameter, FormSection, MsInstructionsIcon}, props: { httpConfig: new HttpConfig(), projectId: String, @@ -165,9 +213,21 @@ export default { socket: "", domain: "", port: 0, - headers: [new KeyValue()] + headers: [new KeyValue()], + headlessEnabled: true, + browser: 'CHROME' }, - beforeCondition: {} + beforeCondition: {}, + browsers: [ + { + label: this.$t("chrome"), + value: "CHROME", + }, + { + label: this.$t("firefox"), + value: "FIREFOX", + }, + ], }; }, watch: { @@ -289,7 +349,7 @@ export default { list() { if (this.projectId) { this.result = getApiModuleByProjectIdAndProtocol(this.projectId, "HTTP").then((response) => { - if (response.data && response.data !== null) { + if (response.data && response.data !== null) { this.moduleOptions = response.data; } }); diff --git a/framework/sdk-parent/frontend/src/components/environment/commons/ApiScenarioVariables.vue b/framework/sdk-parent/frontend/src/components/environment/commons/ApiScenarioVariables.vue index cf7c4adb29..33215bf754 100644 --- a/framework/sdk-parent/frontend/src/components/environment/commons/ApiScenarioVariables.vue +++ b/framework/sdk-parent/frontend/src/components/environment/commons/ApiScenarioVariables.vue @@ -455,28 +455,11 @@ export default { }); this.variables = datas; }, - filterScope(scope) { - let datas = []; - let variables = _.cloneDeep(this.variables); - variables.forEach((item) => { - if (scope == "api") { - if ( - item.scope && item.scope != "api" - ) { - item.hidden = true; - } else { - item.hidden = undefined; - } - } else { - if (item.scope == scope) { - item.hidden = undefined; - } else { - item.hidden = true; - } - } - datas.push(item); - }); - this.variables = datas; + filterScope(value, row) { + if (value == "ui") { + return row.scope == "ui"; + } + return !row.scope || row.scope == "api"; }, openSetting(data) { this.$refs.apiVariableSetting.open(data);