From 3226017f5f4f9a35dc2776b03f4adea6ba2a9182 Mon Sep 17 00:00:00 2001 From: guoyuqi Date: Mon, 19 Dec 2022 11:56:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --user=郭雨琦 --- .../frontend/src/components/MsBorderPieChart.vue | 16 ++++++++-------- .../business/dashboard/components/MyCaseCard.vue | 2 +- .../dashboard/components/MyDashboardCard.vue | 2 +- .../business/dashboard/components/MyFlawCard.vue | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) 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/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; } From 10737147b735fd39e547ebbd2f7435bd9dbc75ec Mon Sep 17 00:00:00 2001 From: zhangdahai112 Date: Mon, 19 Dec 2022 14:30:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(UI=E8=87=AA=E5=8A=A8=E5=8C=96):=20?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=8F=98=E9=87=8F=E5=BA=94=E7=94=A8=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=E5=8D=A1=E6=AD=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1020926 --user=张大海 【UI测试】环境-通用配置，筛选应用场景，页面会卡住 https://www.tapd.cn/55049933/s/1316879 --- .../environment/EnvironmentHttpConfig.vue | 78 ++++++++++++++++--- .../commons/ApiScenarioVariables.vue | 27 ++----- 2 files changed, 74 insertions(+), 31 deletions(-) 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);