From a043722a05d047fe88f180a25381450c16326d6f Mon Sep 17 00:00:00 2001 From: wenyann <64353056+wenyann@users.noreply.github.com> Date: Mon, 12 Oct 2020 13:05:07 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E5=AF=BC=E5=87=BA=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E5=8A=A0=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/metersphere/track/service/TestCaseService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java index 156dc23ca8..dc827b3246 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java @@ -41,7 +41,9 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.OutputStream; import java.net.URLEncoder; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; @@ -492,7 +494,7 @@ public class TestCaseService { if (t.getTestId() != null && t.getTestId().equals("other")) { data.setRemark(t.getOtherTestName()); } else { - data.setRemark(t.getApiName()); + data.setRemark("[" + t.getApiName() + "]" + "\n" + t.getRemark()); } } else if (t.getMethod().equals("auto") && t.getType().equals("performance")) { From 62a6af8758a8b7c32c55ec55ffa7259b555d25bf Mon Sep 17 00:00:00 2001 From: q4speed Date: Mon, 12 Oct 2020 13:09:40 +0800 Subject: [PATCH 2/6] =?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=9D=A1=E4=BB=B6=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=99=A8=E5=88=A4=E6=96=ADbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/api/test/model/ScenarioModel.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js index 7e6c44c8d6..fb32d13cab 100644 --- a/frontend/src/business/components/api/test/model/ScenarioModel.js +++ b/frontend/src/business/components/api/test/model/ScenarioModel.js @@ -1219,21 +1219,22 @@ class JMXGenerator { if (request.controller.isValid() && request.controller.enable) { if (request.controller instanceof IfController) { let name = request.controller.label(); - let variable = request.controller.variable; + let variable = "\"" + request.controller.variable + "\""; let operator = request.controller.operator; - let value = request.controller.value; + let value = "\"" + request.controller.value + "\""; + if (operator === "=~" || operator === "!~") { - value = "\".*" + value + ".*\""; + value = "\".*" + request.controller.value + ".*\""; } if (operator === "is empty") { - variable = "empty(\"" + variable + "\")"; + variable = "empty(" + variable + ")"; operator = ""; value = ""; } if (operator === "is not empty") { - variable = "!empty(\"" + variable + "\")"; + variable = "!empty(" + variable + ")"; operator = ""; value = ""; } From 9f2eeda2768f56a19eefacb7e32423c643b47438 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Mon, 12 Oct 2020 09:54:28 +0800 Subject: [PATCH 3/6] =?UTF-8?q?refactor:=20=E8=A1=A8=E6=A0=BC=E8=BE=B9?= =?UTF-8?q?=E6=A1=86hover=E4=B9=8B=E5=90=8E=E7=9A=84=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit d524f7654940f5935231c72e78f51f58a0f8490b) --- frontend/src/common/css/main.css | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css index 5a45490239..183089bbd6 100644 --- a/frontend/src/common/css/main.css +++ b/frontend/src/common/css/main.css @@ -27,14 +27,14 @@ body { } /*解决高度塌陷和边距重叠*/ -.clearfix:before,.clearfix:after{ +.clearfix:before, .clearfix:after { content: ""; display: table; clear: both; } /*解决富文本框中link显示问题*/ -.ck-rounded-corners .ck.ck-balloon-panel,.ck.ck-balloon-panel.ck-rounded-corners { +.ck-rounded-corners .ck.ck-balloon-panel, .ck.ck-balloon-panel.ck-rounded-corners { z-index: 10055 !important; } @@ -74,12 +74,18 @@ body { width: 3px; background-color: #EBEEF5; } + +.adjust-table tr:hover td { + border-color: #f5f7fa; +} + /* 表格拖拽表头调整宽度 --> */ /* <-- 表格 input 编辑效果*/ .table-edit-input .el-textarea__inner { border-style: hidden; } + .table-edit-input.is-disabled .el-textarea__inner { background-color: white; color: #606266; @@ -93,6 +99,7 @@ body { .table-edit-input .el-textarea__inner:focus { border: 1px solid #409EFF; } + /* 表格 input 编辑效果 --> */ .ms-border { From b6a064e5cc66f48ab06f8d70ab109081f57c03fa Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Mon, 12 Oct 2020 13:08:19 +0800 Subject: [PATCH 4/6] =?UTF-8?q?refactor:=20=E8=A1=A8=E6=A0=BC=E8=BE=B9?= =?UTF-8?q?=E6=A1=86hover=E4=B9=8B=E5=90=8E=E7=9A=84=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 6d1fb1583f86a00eca06a5705e758bb9ae2e726d) --- frontend/src/common/css/main.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css index 183089bbd6..5733ca60f5 100644 --- a/frontend/src/common/css/main.css +++ b/frontend/src/common/css/main.css @@ -50,7 +50,7 @@ body { /* <-- 表格拖拽表头调整宽度，在 t-bable 上添加 border 属性，并添加 adjust-table 类名*/ .adjust-table td { - border-right-color: white; + border: 0; } .adjust-table th { @@ -76,7 +76,7 @@ body { } .adjust-table tr:hover td { - border-color: #f5f7fa; + border: 0; } /* 表格拖拽表头调整宽度 --> */ From 00424b0255606ec1a6d2674b156c727b20da4c44 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Mon, 12 Oct 2020 13:18:02 +0800 Subject: [PATCH 5/6] =?UTF-8?q?revert:=20=E5=9B=9E=E9=80=80td=E7=9A=84?= =?UTF-8?q?=E5=BA=95=E9=83=A8border?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit ff7454f6efe13e69d090193c2e8d103a51330936) --- frontend/src/common/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css index 5733ca60f5..47be41d8f7 100644 --- a/frontend/src/common/css/main.css +++ b/frontend/src/common/css/main.css @@ -50,7 +50,7 @@ body { /* <-- 表格拖拽表头调整宽度，在 t-bable 上添加 border 属性，并添加 adjust-table 类名*/ .adjust-table td { - border: 0; + border-right-color: white; } .adjust-table th { From 5803eccc2b41936b425ad7f77007601727734a61 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Mon, 12 Oct 2020 13:25:43 +0800 Subject: [PATCH 6/6] =?UTF-8?q?refactor:=20=E8=A1=A8=E6=A0=BC=E5=8F=88?= =?UTF-8?q?=E8=BE=B9=E6=A1=86=E8=AE=BE=E7=BD=AE=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit fed5d15589eccd1d035a3d7ddc1f0d25f3a717a0) --- frontend/src/common/css/main.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css index 47be41d8f7..495579dc6a 100644 --- a/frontend/src/common/css/main.css +++ b/frontend/src/common/css/main.css @@ -50,7 +50,7 @@ body { /* <-- 表格拖拽表头调整宽度，在 t-bable 上添加 border 属性，并添加 adjust-table 类名*/ .adjust-table td { - border-right-color: white; + border-right: 0; } .adjust-table th { @@ -76,7 +76,7 @@ body { } .adjust-table tr:hover td { - border: 0; + border-right: 0; } /* 表格拖拽表头调整宽度 --> */