From a7e39aeb694f43f7d9c3fa0e2ed4e8955a973930 Mon Sep 17 00:00:00 2001 From: guoyuqi Date: Mon, 16 Jan 2023 14:19:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E6=96=87=E5=AD=97=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1021997 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001021997 --- framework/sdk-parent/frontend/src/i18n/lang/en-US.js | 2 +- framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js | 2 +- framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/sdk-parent/frontend/src/i18n/lang/en-US.js b/framework/sdk-parent/frontend/src/i18n/lang/en-US.js index 8318486053..dbfdc0a5d1 100644 --- a/framework/sdk-parent/frontend/src/i18n/lang/en-US.js +++ b/framework/sdk-parent/frontend/src/i18n/lang/en-US.js @@ -3283,7 +3283,7 @@ const message = { api_tip: 'Both the interface definition and the affected interface use cases will enter the to-be-updated list', case_tip: 'If the interface use case meets the conditions, it will enter the to-be-updated list', update_rule_title: 'Enter the to-be-updated list rule settings', - no_show_setting: 'No popup settings popup', + no_show_setting: 'No more setting pop-ups', api_receiver_tip: "Note: Please confirm that \"API update\" in the API test task notification has been set \"Intra-site message\" message, otherwise, you will not receive message reminders", case_receiver_tip: "Note: Please confirm that \"CASE update\" in the API test task notification has been set \"Intra-site message\" message, otherwise, you will not receive message reminders", no_show_setting_tip: "After checking, the pop-up window will no longer pop up, and the synchronization and change notification will be performed according to the setting content by default: If you need to change the setting, you can open the setting item in the drop-down option next to the save button。", diff --git a/framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js b/framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js index 5b77889362..def6a5a12c 100644 --- a/framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js +++ b/framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js @@ -3292,7 +3292,7 @@ const message = { api_tip: '接口定义和受影响的接口用例都会进入待更新列表', case_tip: '接口用例符合条件就会进入待更新列表', update_rule_title: '进入待更新列表规则设置', - no_show_setting: '不在弹出设置弹窗', + no_show_setting: '不再弹出设置弹窗', api_receiver_tip: "注意:请确认接口测试任务通知中的\"API更新\"已设置\"站内信\"消息,否则,将接收不到消息提醒。", case_receiver_tip: "注意:请确认接口测试任务通知中的\"CASE更新\"已设置\"站内信\"消息,否则,将接收不到消息提醒。", no_show_setting_tip: "勾选后,不再弹出弹窗,会默认按照设置的内容执行同步和变更通知:如果需要更改设置,可以在保存按钮旁的下拉选项中,打开设置项。", diff --git a/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js b/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js index c3ee208837..b94f531a30 100644 --- a/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js +++ b/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js @@ -3294,7 +3294,7 @@ const message = { api_tip: '接口定義和受影響的接口用例都會進入待更新列表', case_tip: '接口用例符合條件就會進入待更新列表', update_rule_title: '進入待更新列表規則設置', - no_show_setting: '不在彈出設置彈窗', + no_show_setting: '不再彈出設置彈窗', api_receiver_tip: "注意:請確認接口測試任務通知中的\"API更新\"已設置\"站內信\"消息,否則,將接收不到消息提醒", case_receiver_tip: "注意:請確認接口測試任務通知中的\"CASE更新\"已設置\"站內信\"消息,否則,將接收不到消息提醒。", no_show_setting_tip: "勾選後,不再彈出彈窗,會默認按照設置的內容執行同步和變更通知:如果需要更改設置,可以在保存按鈕旁的下拉選項中,打開設置項。", From b6ec1692d14eac1e014294aba218ea642df0efaf Mon Sep 17 00:00:00 2001 From: wxg0103 <727495428@qq.com> Date: Thu, 12 Jan 2023 16:32:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A4=9A=E9=80=89=E7=9A=84=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1021727 --user=王孝刚 【项目管理】项目环境-通用配置,批量删除环境变量后,还在显示批量操作按钮 https://www.tapd.cn/55049933/s/1327256 --- .../frontend/src/components/environment/EnvironmentEdit.vue | 1 + .../src/business/menu/environment/components/EnvironmentEdit.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/framework/sdk-parent/frontend/src/components/environment/EnvironmentEdit.vue b/framework/sdk-parent/frontend/src/components/environment/EnvironmentEdit.vue index 5bc5d6a3b9..9dd018d8b3 100644 --- a/framework/sdk-parent/frontend/src/components/environment/EnvironmentEdit.vue +++ b/framework/sdk-parent/frontend/src/components/environment/EnvironmentEdit.vue @@ -449,6 +449,7 @@ export default { }) } environment.config.commonConfig.variables.forEach(variable => { + delete variable.showMore; if (variable.type === 'CSV' && variable.files.length === 0) { message = this.$t('api_test.automation.csv_warning'); return; diff --git a/project-management/frontend/src/business/menu/environment/components/EnvironmentEdit.vue b/project-management/frontend/src/business/menu/environment/components/EnvironmentEdit.vue index 59a82d41a7..82a30ee71c 100644 --- a/project-management/frontend/src/business/menu/environment/components/EnvironmentEdit.vue +++ b/project-management/frontend/src/business/menu/environment/components/EnvironmentEdit.vue @@ -449,6 +449,7 @@ export default { }) } environment.config.commonConfig.variables.forEach(variable => { + delete variable.showMore; if (variable.type === 'CSV' && variable.files.length === 0) { message = this.$t('api_test.automation.csv_warning'); return; From 26c4537417a3b09cc6785fb8c3246163938f7078 Mon Sep 17 00:00:00 2001 From: wxg0103 <727495428@qq.com> Date: Mon, 16 Jan 2023 14:24:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=8A=A5=E5=91=8A=E7=94=A8=E4=BE=8B=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=B1=A0=E7=8E=AF=E5=A2=83=E6=98=BE=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=9A=84=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1021983 --user=王孝刚 【测试跟踪】导出测试计划报告-接口用例-运行环境和资源池显示有问题 https://www.tapd.cn/55049933/s/1327574 --- .../service/plan/TestPlanApiCaseService.java | 13 ++++++++-- .../report/detail/api/ApiReportDetail.vue | 9 +++++-- .../report/detail/api/ApiReportViewHeader.vue | 14 ++++++++++- .../report/detail/api/RequestMetric.vue | 25 +++++++++++++------ 4 files changed, 49 insertions(+), 12 deletions(-) diff --git a/api-test/backend/src/main/java/io/metersphere/service/plan/TestPlanApiCaseService.java b/api-test/backend/src/main/java/io/metersphere/service/plan/TestPlanApiCaseService.java index f850abefe5..620a8ea842 100644 --- a/api-test/backend/src/main/java/io/metersphere/service/plan/TestPlanApiCaseService.java +++ b/api-test/backend/src/main/java/io/metersphere/service/plan/TestPlanApiCaseService.java @@ -4,6 +4,7 @@ import com.alibaba.nacos.common.utils.CollectionUtils; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import io.metersphere.api.dto.ApiCaseRelevanceRequest; +import io.metersphere.api.dto.ApiReportEnvConfigDTO; import io.metersphere.api.dto.EnvironmentType; import io.metersphere.api.dto.QueryReferenceRequest; import io.metersphere.api.dto.automation.TestPlanDTO; @@ -413,7 +414,11 @@ public class TestPlanApiCaseService { try { Map content = JSON.parseMap(contentStr); if (StringUtils.isNotEmpty(contentStr)) { - content.put("envName", apiDefinitionService.getEnvNameByEnvConfig(result.getProjectId(), result.getEnvConfig())); + ApiReportEnvConfigDTO envConfig = apiDefinitionService.getEnvNameByEnvConfig(result.getProjectId(), result.getEnvConfig()); + if (envConfig != null) { + content.put("envName", envConfig.getEnvName()); + content.put("poolName", envConfig.getResourcePoolName()); + } } contentStr = JSON.toJSONString(content); apiCase.setResponse(contentStr); @@ -442,7 +447,11 @@ public class TestPlanApiCaseService { LogUtil.error("转换content失败!", e); } if (StringUtils.isNotEmpty(execResult.getEnvConfig())) { - responseObj.put("envName", apiDefinitionService.getEnvNameByEnvConfig(execResult.getProjectId(), execResult.getEnvConfig())); + ApiReportEnvConfigDTO envConfig = apiDefinitionService.getEnvNameByEnvConfig(execResult.getProjectId(), execResult.getEnvConfig()); + if (envConfig != null) { + responseObj.put("envName", envConfig.getEnvName()); + responseObj.put("poolName", envConfig.getResourcePoolName()); + } } /* * 之前这里的写法是responseObj.toString()。 diff --git a/test-track/frontend/src/business/plan/view/comonents/report/detail/api/ApiReportDetail.vue b/test-track/frontend/src/business/plan/view/comonents/report/detail/api/ApiReportDetail.vue index bf5b991e61..6b2d4df81b 100644 --- a/test-track/frontend/src/business/plan/view/comonents/report/detail/api/ApiReportDetail.vue +++ b/test-track/frontend/src/business/plan/view/comonents/report/detail/api/ApiReportDetail.vue @@ -11,6 +11,7 @@ :is-template="isTemplate" :debug="debug" :report="report" + :pool-name="poolName" :project-env-map="projectEnvMap" @reportExport="handleExport" @reportSave="handleSave"/> @@ -97,6 +98,7 @@ :project-env-map="projectEnvMap" :title="report.name" :content="content" + :pool-name="poolName" :report="report" :total-time="totalTime"/> @@ -119,7 +121,6 @@ import {getUUID, windowPrint} from "metersphere-frontend/src/utils"; import {hasLicense} from "metersphere-frontend/src/utils/permission"; import {STEP} from "metersphere-frontend/src/model/Setting"; import MsCodeEdit from "metersphere-frontend/src/components/MsCodeEdit"; - export default { name: "MsApiReport", components: { @@ -151,7 +152,8 @@ export default { exportReportIsOk: false, tempResult: [], projectEnvMap: {}, - showCancel: false + showCancel: false, + poolName: '', } }, activated() { @@ -412,6 +414,9 @@ export default { if (report.projectEnvMap) { this.projectEnvMap = report.projectEnvMap; } + if (report.poolName) { + this.poolName = report.poolName; + } this.content = report; this.fullTreeNodes = report.steps; this.content.console = report.console; diff --git a/test-track/frontend/src/business/plan/view/comonents/report/detail/api/ApiReportViewHeader.vue b/test-track/frontend/src/business/plan/view/comonents/report/detail/api/ApiReportViewHeader.vue index b03370fe34..96d5e0599e 100644 --- a/test-track/frontend/src/business/plan/view/comonents/report/detail/api/ApiReportViewHeader.vue +++ b/test-track/frontend/src/business/plan/view/comonents/report/detail/api/ApiReportViewHeader.vue @@ -25,7 +25,18 @@ - + + +
+ {{ $t('load_test.select_resource_pool') + ':' }} +
+
+ {{ this.poolName }} +
+
+ +
+ {{ $t('commons.environment') + ':' }}
{{ key + ":" }} @@ -62,6 +73,7 @@ export default { type: Boolean, default: false, }, + poolName: String, isPlan: Boolean }, computed: { diff --git a/test-track/frontend/src/business/plan/view/comonents/report/detail/api/RequestMetric.vue b/test-track/frontend/src/business/plan/view/comonents/report/detail/api/RequestMetric.vue index fe140bd636..2e92dc34b7 100644 --- a/test-track/frontend/src/business/plan/view/comonents/report/detail/api/RequestMetric.vue +++ b/test-track/frontend/src/business/plan/view/comonents/report/detail/api/RequestMetric.vue @@ -47,13 +47,24 @@
- -
- {{ $t('commons.environment') + ':' }} -
-
- {{ response.envName }} -
+ + +
+ {{ $t('load_test.select_resource_pool') + ':' }} +
+
+ {{ response.poolName }} +
+
+ +
+ {{ $t('commons.environment') + ':' }} +
+
+ {{ response.envName }} +
+
+