From f787ed11d43c05310bbed71b55a8e0b88fc26d13 Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Fri, 12 Mar 2021 10:25:17 +0800 Subject: [PATCH 1/5] refactor: i18n --- .../src/business/components/settings/system/BaseSetting.vue | 2 +- frontend/src/i18n/en-US.js | 3 ++- frontend/src/i18n/zh-CN.js | 3 ++- frontend/src/i18n/zh-TW.js | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/frontend/src/business/components/settings/system/BaseSetting.vue b/frontend/src/business/components/settings/system/BaseSetting.vue index 822951078a..951aab070a 100644 --- a/frontend/src/business/components/settings/system/BaseSetting.vue +++ b/frontend/src/business/components/settings/system/BaseSetting.vue @@ -42,7 +42,7 @@ export default { url: [ { required: true, - message: this.$t('system_par'), + message: this.$t('system_config.base.url_is_null'), trigger: ['change', 'blur'] }, ], diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index a2e8f3926a..91e69c74ce 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -240,7 +240,8 @@ export default { base_config: 'Base Config', base: { url: 'Website URL', - url_tip: 'example：http://localhost:8081' + url_tip: 'example：http://localhost:8081', + url_is_null: 'The current site URL cannot be empty' } }, workspace: { diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index ee02668daa..db08f19989 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -241,7 +241,8 @@ export default { base_config: '基本配置', base: { url: '当前站点URL', - url_tip: '例如：http://localhost:8081' + url_tip: '例如：http://localhost:8081', + url_is_null: '当前站点URL不能为空' } }, workspace: { diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js index a634debaf0..ccbc5805d6 100644 --- a/frontend/src/i18n/zh-TW.js +++ b/frontend/src/i18n/zh-TW.js @@ -241,7 +241,8 @@ export default { base_config: '基本配置', base: { url: '當前站點URL', - url_tip: '例如：http://localhost:8081' + url_tip: '例如：http://localhost:8081', + url_is_null: '當前站點URL不能為空' } }, workspace: { From 846345cdd23bf850070baf43ed28745cb92f525d Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Fri, 12 Mar 2021 10:37:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20SQL=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml index 5b8bb7ecdc..1e132017fd 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml @@ -299,8 +299,8 @@ select test_plan_test_case.*, test_case.* from test_plan_test_case inner join test_case on test_plan_test_case.case_id = test_case.id - where status != 'Prepare' - and status != 'Underway' + where test_plan_test_case.status != 'Prepare' + and test_plan_test_case.status != 'Underway' and test_plan_test_case.Executor = #{request.executor} and test_plan_test_case.plan_id in From 2ff611bd58a7810d13d8cef9b69bf54e5f363fc5 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Fri, 12 Mar 2021 10:48:27 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):?= =?UTF-8?q?=20=E6=9F=A5=E7=9C=8B=E6=8A=A5=E5=91=8A=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E5=8E=8B=E5=8A=9B=E9=85=8D=E7=BD=AE=E5=9B=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/components/PerformancePressureConfig.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue index 2a372d5e09..5068f14929 100644 --- a/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue +++ b/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue @@ -132,6 +132,7 @@ import MsChart from "@/business/components/common/chart/MsChart"; import {findThreadGroup} from "@/business/components/performance/test/model/ThreadGroup"; const HANDLER = "handler"; +const THREAD_GROUP_TYPE = "tgType"; const TARGET_LEVEL = "TargetLevel"; const RAMP_UP = "RampUp"; const STEPS = "Steps"; @@ -225,6 +226,9 @@ export default { case HANDLER: this.threadGroups[i].handler = item.value; break; + case THREAD_GROUP_TYPE: + this.threadGroups[i].tgType = item.value; + break; default: break; } From 3d6eb4be51232934102a694b21189e16efb41c2e Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Fri, 12 Mar 2021 10:51:47 +0800 Subject: [PATCH 4/5] chore: sync --- backend/src/main/java/io/metersphere/xpack | 2 +- frontend/src/business/components/xpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index d2fc4b4211..efd6af73b7 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit d2fc4b42117be97c679b4d15d6f979923e598f7f +Subproject commit efd6af73b7c5cc53cd4515772000bc1436c49837 diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index 17404980aa..4c33b9c3b1 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit 17404980aab725889843ce8c65f5f5c00113ae21 +Subproject commit 4c33b9c3b12a83da6d9bd2740262c6c8baaab819 From 7a9bb603e8609c820bc59ad059eef9b39ec2d69f Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Fri, 12 Mar 2021 10:56:59 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E5=BC=95=E7=94=A8=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=E4=B8=8D=E8=83=BD=E7=A7=BB=E9=99=A4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/io/metersphere/xpack | 2 +- .../api/automation/scenario/common/ApiBaseComponent.vue | 4 ++-- .../api/automation/scenario/component/ApiComponent.vue | 2 +- .../automation/scenario/component/ApiScenarioComponent.vue | 2 +- .../components/api/definition/components/list/ApiList.vue | 2 +- frontend/src/business/components/xpack | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index d2fc4b4211..efd6af73b7 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit d2fc4b42117be97c679b4d15d6f979923e598f7f +Subproject commit efd6af73b7c5cc53cd4515772000bc1436c49837 diff --git a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue index 624aeef9b4..1090ac3b5b 100644 --- a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue +++ b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue @@ -31,10 +31,10 @@ - + - + diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue index 81103b6beb..9fdaf70c4a 100644 --- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue +++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue @@ -216,7 +216,7 @@ } this.request.requestResult = requestResult; this.request.id = response.data.id; - this.request.disabled = true; + //this.request.disabled = true; if (!this.request.projectId) { this.request.projectId = response.data.projectId; } diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue index 932ad0f4f8..ef2d01367a 100644 --- a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue +++ b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue @@ -58,7 +58,7 @@ if (this.scenario.hashTree) { this.setDisabled(this.scenario.hashTree); } - this.scenario.disabled = true; + //this.scenario.disabled = true; this.scenario.name = response.data.name; if (!this.scenario.projectId) { this.scenario.projectId = response.data.projectId; diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue index 80b323b0b6..3ae913db9d 100644 --- a/frontend/src/business/components/api/definition/components/list/ApiList.vue +++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue @@ -325,7 +325,7 @@ export default { currentPage: 1, pageSize: 10, total: 0, - screenHeight: document.documentElement.clientHeight - 270,//屏幕高度, + screenHeight: document.documentElement.clientHeight - 310,//屏幕高度, environmentId: undefined, selectDataCounts: 0, } diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index 17404980aa..4c33b9c3b1 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit 17404980aab725889843ce8c65f5f5c00113ae21 +Subproject commit 4c33b9c3b12a83da6d9bd2740262c6c8baaab819