diff --git a/framework/sdk-parent/frontend/src/components/MsBorderPieChart.vue b/framework/sdk-parent/frontend/src/components/MsBorderPieChart.vue
index 1bfc346967..cd28d8a74d 100644
--- a/framework/sdk-parent/frontend/src/components/MsBorderPieChart.vue
+++ b/framework/sdk-parent/frontend/src/components/MsBorderPieChart.vue
@@ -242,31 +242,31 @@ export default {
pageIconColor: "#1F2329",
pageIconInactiveColor: "#1F2329",
orient: 'vertical',
- icon:"rect",
+ icon: "rect",
itemGap: 32,
- left: '317px',
+ left: '50%',
y: 'center',
itemHeight: 8,
itemWidth: 8, //修改icon图形大小
itemStyle: {
borderWidth: 0.1
},
- inactiveBorderWidth:0.1,
+ inactiveBorderWidth: 0.1,
textStyle: {
rich: {
name: {
fontSize: 14,
align: 'left',
- width: 100,
+ width: 50,
fontWeight: 400,
- color:'#646A73'
+ color: '#646A73'
},
num: {
fontSize: 14,
align: 'right',
- color:'#646A73',
- fontWeight: 400,
- padding: [0, 0, 0, 134]
+ color: '#646A73',
+ fontWeight: 500,
+ padding: [0, 0, 0, 155]
}
}
},
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);
diff --git a/workstation/frontend/src/business/dashboard/components/MyCaseCard.vue b/workstation/frontend/src/business/dashboard/components/MyCaseCard.vue
index ca14c4a5ac..ecdef01344 100644
--- a/workstation/frontend/src/business/dashboard/components/MyCaseCard.vue
+++ b/workstation/frontend/src/business/dashboard/components/MyCaseCard.vue
@@ -122,7 +122,7 @@ export default{
padding: 0px 0px 0px 0px;
box-sizing: border-box;
width: 100%;
- color:#000000;
+ color: #1F2329;
margin-left: 24px;
line-height: 26px;
}
diff --git a/workstation/frontend/src/business/dashboard/components/MyDashboardCard.vue b/workstation/frontend/src/business/dashboard/components/MyDashboardCard.vue
index 1fe8bc4324..c57b97d1eb 100644
--- a/workstation/frontend/src/business/dashboard/components/MyDashboardCard.vue
+++ b/workstation/frontend/src/business/dashboard/components/MyDashboardCard.vue
@@ -167,7 +167,7 @@ export default {
padding: 0px 0px 0px 0px;
box-sizing: border-box;
width: 100%;
- color:#000000;
+ color: #1F2329;
margin-left: 24px;
line-height: 26px;
}
diff --git a/workstation/frontend/src/business/dashboard/components/MyFlawCard.vue b/workstation/frontend/src/business/dashboard/components/MyFlawCard.vue
index dad4e0b569..f3ebfa298b 100644
--- a/workstation/frontend/src/business/dashboard/components/MyFlawCard.vue
+++ b/workstation/frontend/src/business/dashboard/components/MyFlawCard.vue
@@ -156,7 +156,7 @@ export default {
padding: 0px 0px 0px 0px;
box-sizing: border-box;
width: 100%;
- color:#000000;
+ color: #1F2329;
margin-left: 24px;
line-height: 26px;
}