From 68d5f7329060558634188b7089277b8844df3bae Mon Sep 17 00:00:00 2001 From: wxg0103 <727495428@qq.com> Date: Thu, 12 Oct 2023 18:34:08 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=BA=E6=99=AF=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=A8=A1=E5=9D=97=E6=A0=91=E7=BB=9F=E8=AE=A1=E5=92=8C?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E9=87=8F=E4=B8=8D=E7=AC=A6=E5=90=88?= =?UTF-8?q?=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=1031581 --user=王孝刚 【接口测试】首页-场景定时任务数量统计-运行中/未运行-点击进入新tab页面左侧模块树数量显示不符 https://www.tapd.cn/55049933/s/1425553 --- .../src/business/automation/scenario/ApiScenarioModule.vue | 4 +++- .../definition/components/response/ResponseResult.vue | 1 + .../src/main/java/io/metersphere/jmeter/JMeterBase.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/api-test/frontend/src/business/automation/scenario/ApiScenarioModule.vue b/api-test/frontend/src/business/automation/scenario/ApiScenarioModule.vue index 7769840c8c..df704f5e5b 100644 --- a/api-test/frontend/src/business/automation/scenario/ApiScenarioModule.vue +++ b/api-test/frontend/src/business/automation/scenario/ApiScenarioModule.vue @@ -150,7 +150,9 @@ export default { }; }, mounted() { - this.list(); + if(!this.$route.params) { + this.list() + } }, watch: { 'condition.filterText'() { diff --git a/api-test/frontend/src/business/definition/components/response/ResponseResult.vue b/api-test/frontend/src/business/definition/components/response/ResponseResult.vue index c37b6571bc..8a63ccd2e2 100644 --- a/api-test/frontend/src/business/definition/components/response/ResponseResult.vue +++ b/api-test/frontend/src/business/definition/components/response/ResponseResult.vue @@ -131,6 +131,7 @@ export default { 'image/svg+xml', 'image/apng', 'image/avif', + "application/octet-stream" ], srcUrl: '', }; diff --git a/framework/sdk-parent/jmeter/src/main/java/io/metersphere/jmeter/JMeterBase.java b/framework/sdk-parent/jmeter/src/main/java/io/metersphere/jmeter/JMeterBase.java index eb2647df8f..c4ca0a5ba4 100644 --- a/framework/sdk-parent/jmeter/src/main/java/io/metersphere/jmeter/JMeterBase.java +++ b/framework/sdk-parent/jmeter/src/main/java/io/metersphere/jmeter/JMeterBase.java @@ -27,7 +27,7 @@ public class JMeterBase { private final static String SPLIT_EQ = "split=="; private final static String SPLIT_AND = "split&&"; - private static final List imageList = Arrays.asList("image/png", "image/jpeg", "image/gif", "image/bmp", "image/webp", "image/svg+xml", "image/apng", "image/avif"); + private static final List imageList = Arrays.asList("image/png", "image/jpeg", "image/gif", "image/bmp", "image/webp", "image/svg+xml", "image/apng", "image/avif", "application/octet-stream"); public static HashTree getHashTree(Object scriptWrapper) throws Exception { Field field = scriptWrapper.getClass().getDeclaredField("testPlan");