From 2c41d790ebd527ad78d291aa587a04b653cf0b4e Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Sat, 20 Mar 2021 09:59:00 +0800 Subject: [PATCH 1/6] =?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=8F=AA=E8=AF=BB=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E8=83=BD=E5=88=9B=E5=BB=BA=E9=A1=B9=E7=9B=AE=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/business/components/common/head/ProjectSwitch.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/business/components/common/head/ProjectSwitch.vue b/frontend/src/business/components/common/head/ProjectSwitch.vue index 0cb996bd81..3c5b9ad97e 100644 --- a/frontend/src/business/components/common/head/ProjectSwitch.vue +++ b/frontend/src/business/components/common/head/ProjectSwitch.vue @@ -10,7 +10,7 @@ - + {{ $t("project.create") }} From 78506f814f121cd9d1f774d02a40b8f56a11bf6c Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Sat, 20 Mar 2021 10:44:30 +0800 Subject: [PATCH 2/6] =?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=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=97=B6=E6=9F=90=E4=BA=9B=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=9C=AA=E5=AF=BC=E5=87=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/domain/TestCaseExcelData.java | 4 +-- .../excel/domain/TestCaseExcelDataCn.java | 8 ++--- .../excel/domain/TestCaseExcelDataTw.java | 8 ++--- .../excel/domain/TestCaseExcelDataUs.java | 8 ++--- .../excel/listener/TestCaseDataListener.java | 6 ++-- .../track/service/TestCaseService.java | 36 ++++++++++--------- .../db/migration/V78__v1.8_release.sql | 4 ++- 7 files changed, 40 insertions(+), 34 deletions(-) diff --git a/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelData.java b/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelData.java index 8c344e6e3f..161486e0fc 100644 --- a/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelData.java +++ b/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelData.java @@ -20,8 +20,8 @@ public class TestCaseExcelData { private String priority; @ExcelIgnore private String tags; - @ExcelIgnore - private String method; +// @ExcelIgnore +// private String method; @ExcelIgnore private String prerequisite; @ExcelIgnore diff --git a/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataCn.java b/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataCn.java index 847dcd845e..218a59e01e 100644 --- a/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataCn.java +++ b/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataCn.java @@ -45,10 +45,10 @@ public class TestCaseExcelDataCn extends TestCaseExcelData { @Length(min = 0, max = 1000) private String tags; - @NotBlank(message = "{cannot_be_null}") - @ExcelProperty("测试方式") - @Pattern(regexp = "(^manual$)|(^auto$)", message = "{test_case_method_validate}") - private String method; +// @NotBlank(message = "{cannot_be_null}") +// @ExcelProperty("测试方式") +// @Pattern(regexp = "(^manual$)|(^auto$)", message = "{test_case_method_validate}") +// private String method; @ColumnWidth(50) @ExcelProperty("前置条件") diff --git a/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataTw.java b/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataTw.java index 4137f4e76c..d60c24fa2a 100644 --- a/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataTw.java +++ b/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataTw.java @@ -45,10 +45,10 @@ public class TestCaseExcelDataTw extends TestCaseExcelData { @Length(min = 0, max = 1000) private String tags; - @NotBlank(message = "{cannot_be_null}") - @ExcelProperty("測試方式") - @Pattern(regexp = "(^manual$)|(^auto$)", message = "{test_case_method_validate}") - private String method; +// @NotBlank(message = "{cannot_be_null}") +// @ExcelProperty("測試方式") +// @Pattern(regexp = "(^manual$)|(^auto$)", message = "{test_case_method_validate}") +// private String method; @ColumnWidth(50) @ExcelProperty("前置條件") diff --git a/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataUs.java b/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataUs.java index 1795d0545a..6916c3a5ec 100644 --- a/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataUs.java +++ b/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataUs.java @@ -46,10 +46,10 @@ public class TestCaseExcelDataUs extends TestCaseExcelData { @Length(min = 0, max = 1000) private String tags; - @NotBlank(message = "{cannot_be_null}") - @ExcelProperty("Method") - @Pattern(regexp = "(^manual$)|(^auto$)", message = "{test_case_method_validate}") - private String method; +// @NotBlank(message = "{cannot_be_null}") +// @ExcelProperty("Method") +// @Pattern(regexp = "(^manual$)|(^auto$)", message = "{test_case_method_validate}") +// private String method; @ColumnWidth(50) @ExcelProperty("Prerequisite") diff --git a/backend/src/main/java/io/metersphere/excel/listener/TestCaseDataListener.java b/backend/src/main/java/io/metersphere/excel/listener/TestCaseDataListener.java index 6ec7448a8f..0e5bf1d6ae 100644 --- a/backend/src/main/java/io/metersphere/excel/listener/TestCaseDataListener.java +++ b/backend/src/main/java/io/metersphere/excel/listener/TestCaseDataListener.java @@ -53,9 +53,9 @@ public class TestCaseDataListener extends EasyExcelListener { } } - if (StringUtils.equals(data.getType(), TestCaseConstants.Type.Functional.getValue()) && StringUtils.equals(data.getMethod(), TestCaseConstants.Method.Auto.getValue())) { - stringBuilder.append(Translator.get("functional_method_tip") + "; "); - } +// if (StringUtils.equals(data.getType(), TestCaseConstants.Type.Functional.getValue()) && StringUtils.equals(data.getMethod(), TestCaseConstants.Method.Auto.getValue())) { +// stringBuilder.append(Translator.get("functional_method_tip") + "; "); +// } if (!userIds.contains(data.getMaintainer())) { stringBuilder.append(Translator.get("user_not_exists") + "：" + data.getMaintainer() + "; "); 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 808fda0cc8..85e342970a 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java @@ -131,8 +131,8 @@ public class TestCaseService { .andNodePathEqualTo(testCase.getNodePath()) .andTypeEqualTo(testCase.getType()) .andMaintainerEqualTo(testCase.getMaintainer()) - .andPriorityEqualTo(testCase.getPriority()) - .andMethodEqualTo(testCase.getMethod()); + .andPriorityEqualTo(testCase.getPriority()); +// .andMethodEqualTo(testCase.getMethod()); // if (StringUtils.isNotBlank(testCase.getNodeId())) { // criteria.andNodeIdEqualTo(testCase.getTestId()); @@ -432,7 +432,7 @@ public class TestCaseService { List list = new ArrayList<>(); StringBuilder path = new StringBuilder(""); List types = TestCaseConstants.Type.getValues(); - List methods = TestCaseConstants.Method.getValues(); +// List methods = TestCaseConstants.Method.getValues(); SessionUser user = SessionUtils.getUser(); for (int i = 1; i <= 5; i++) { TestCaseExcelData data = new TestCaseExcelData(); @@ -442,11 +442,11 @@ public class TestCaseService { data.setPriority("P" + i % 4); String type = types.get(i % 3); data.setType(type); - if (StringUtils.equals(TestCaseConstants.Type.Functional.getValue(), type)) { - data.setMethod(TestCaseConstants.Method.Manual.getValue()); - } else { - data.setMethod(methods.get(i % 2)); - } +// if (StringUtils.equals(TestCaseConstants.Type.Functional.getValue(), type)) { +// data.setMethod(TestCaseConstants.Method.Manual.getValue()); +// } else { +// data.setMethod(methods.get(i % 2)); +// } data.setPrerequisite(Translator.get("preconditions_optional")); data.setStepDesc("1. " + Translator.get("step_tip_separate") + "\n2. " + Translator.get("step_tip_order") + "\n3. " + Translator.get("step_tip_optional")); @@ -461,7 +461,7 @@ public class TestCaseService { explain.setName(Translator.get("do_not_modify_header_order")); explain.setNodePath(Translator.get("module_created_automatically")); explain.setType(Translator.get("options") + "（functional、performance、api）"); - explain.setMethod(Translator.get("options") + "（manual、auto）"); +// explain.setMethod(Translator.get("options") + "（manual、auto）"); explain.setPriority(Translator.get("options") + "（P0、P1、P2、P3）"); explain.setMaintainer(Translator.get("please_input_workspace_member")); @@ -483,7 +483,11 @@ public class TestCaseService { private List generateTestCaseExcel(TestCaseBatchRequest request) { ServiceUtils.getSelectAllIds(request, request.getCondition(), (query) -> extTestCaseMapper.selectIds(query)); - List orderList = ServiceUtils.getDefaultOrder(request.getOrders()); + QueryTestCaseRequest condition = request.getCondition(); + List orderList = new ArrayList<>(); + if (condition != null) { + orderList = ServiceUtils.getDefaultOrder(condition.getOrders()); + } OrderRequest order = new OrderRequest(); order.setName("sort"); order.setType("desc"); @@ -499,10 +503,10 @@ public class TestCaseService { data.setNodePath(t.getNodePath()); data.setPriority(t.getPriority()); data.setType(t.getType()); - data.setMethod(t.getMethod()); +// data.setMethod(t.getMethod()); data.setPrerequisite(t.getPrerequisite()); data.setTags(t.getTags()); - if (t.getMethod().equals("manual")) { + if (StringUtils.equals(t.getMethod(), "manual") || StringUtils.isBlank(t.getMethod())) { String steps = t.getSteps(); String setp = ""; setp = steps; @@ -530,19 +534,19 @@ public class TestCaseService { result.setLength(0); data.setRemark(t.getRemark()); - } else if (t.getMethod().equals("auto") && t.getType().equals("api")) { + } else if ("auto".equals(t.getMethod()) && "api".equals(t.getType())) { data.setStepDesc(""); data.setStepResult(""); - if (t.getTestId() != null && t.getTestId().equals("other")) { + if (t.getTestId() != null && "other".equals(t.getTestId())) { data.setRemark(t.getOtherTestName()); } else { data.setRemark("[" + t.getApiName() + "]" + "\n" + t.getRemark()); } - } else if (t.getMethod().equals("auto") && t.getType().equals("performance")) { + } else if ("auto".equals(t.getMethod()) && "performance".equals(t.getType())) { data.setStepDesc(""); data.setStepResult(""); - if (t.getTestId() != null && t.getTestId().equals("other")) { + if (t.getTestId() != null && "other".equals(t.getTestId())) { data.setRemark(t.getOtherTestName()); } else { data.setRemark(t.getPerformName()); diff --git a/backend/src/main/resources/db/migration/V78__v1.8_release.sql b/backend/src/main/resources/db/migration/V78__v1.8_release.sql index 9d4ff537cf..3b0558731e 100644 --- a/backend/src/main/resources/db/migration/V78__v1.8_release.sql +++ b/backend/src/main/resources/db/migration/V78__v1.8_release.sql @@ -161,4 +161,6 @@ UPDATE file_metadata JOIN (SELECT file_id, project_id SET file_metadata.project_id = temp.project_id; -- add execution_times testPlan alter table test_plan - add execution_times int null; \ No newline at end of file + add execution_times int null; + +alter table test_case modify method varchar(15) null comment 'Test case method type'; \ No newline at end of file From e740d55ac865b69c0597eab89455875f604ef4db Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Sat, 20 Mar 2021 11:02:15 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=85=B3=E8=81=94=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../track/controller/TestPlanApiCaseController.java | 4 +--- .../track/service/TestPlanApiCaseService.java | 13 ++++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/io/metersphere/track/controller/TestPlanApiCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestPlanApiCaseController.java index f3fcecf316..4865aa12b8 100644 --- a/backend/src/main/java/io/metersphere/track/controller/TestPlanApiCaseController.java +++ b/backend/src/main/java/io/metersphere/track/controller/TestPlanApiCaseController.java @@ -33,9 +33,7 @@ public class TestPlanApiCaseController { @PostMapping("/relevance/list/{goPage}/{pageSize}") public Pager> relevanceList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody ApiTestCaseRequest request) { - Page page = PageHelper.startPage(goPage, pageSize, true); - request.setWorkspaceId(SessionUtils.getCurrentWorkspaceId()); - return PageUtils.setPageInfo(page, testPlanApiCaseService.relevanceList(request)); + return testPlanApiCaseService.relevanceList(goPage, pageSize, request); } @GetMapping("/delete/{id}") diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java index 4f5ae37971..df789f41ad 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java @@ -2,6 +2,8 @@ package io.metersphere.track.service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import io.metersphere.api.dto.definition.ApiTestCaseDTO; import io.metersphere.api.dto.definition.ApiTestCaseRequest; import io.metersphere.api.dto.definition.RunDefinitionRequest; @@ -18,7 +20,10 @@ import io.metersphere.base.domain.TestPlanApiCase; import io.metersphere.base.domain.TestPlanApiCaseExample; import io.metersphere.base.mapper.TestPlanApiCaseMapper; import io.metersphere.base.mapper.ext.ExtTestPlanApiCaseMapper; +import io.metersphere.commons.utils.PageUtils; +import io.metersphere.commons.utils.Pager; import io.metersphere.commons.utils.ServiceUtils; +import io.metersphere.commons.utils.SessionUtils; import io.metersphere.track.request.testcase.TestPlanApiCaseBatchRequest; import org.apache.jmeter.testelement.TestElement; import org.springframework.context.annotation.Lazy; @@ -61,13 +66,15 @@ public class TestPlanApiCaseService { return extTestPlanApiCaseMapper.getExecResultByPlanId(plan); } - public List relevanceList(ApiTestCaseRequest request) { + public Pager> relevanceList(int goPage, int pageSize, ApiTestCaseRequest request) { List ids = apiTestCaseService.selectIdsNotExistsInPlan(request.getProjectId(), request.getPlanId()); + Page page = PageHelper.startPage(goPage, pageSize, true); if (CollectionUtils.isEmpty(ids)) { - return new ArrayList<>(); + return PageUtils.setPageInfo(page, new ArrayList<>()); } request.setIds(ids); - return apiTestCaseService.listSimple(request); + request.setWorkspaceId(SessionUtils.getCurrentWorkspaceId()); + return PageUtils.setPageInfo(page, apiTestCaseService.listSimple(request)); } public int delete(String id) { From b92364ff6ff809d455aa5943a3af4814fb815ba7 Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Sat, 20 Mar 2021 12:06:51 +0800 Subject: [PATCH 4/6] =?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=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E6=95=B0=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/mapper/ext/ExtTestCaseMapper.xml | 18 ++--- .../track/service/TrackService.java | 73 +++++++++++++++---- 2 files changed, 69 insertions(+), 22 deletions(-) diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml index edb7e5ec9b..aeef002a4e 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml @@ -372,20 +372,20 @@ diff --git a/backend/src/main/java/io/metersphere/track/service/TrackService.java b/backend/src/main/java/io/metersphere/track/service/TrackService.java index 3bcdf1cf79..f870907533 100644 --- a/backend/src/main/java/io/metersphere/track/service/TrackService.java +++ b/backend/src/main/java/io/metersphere/track/service/TrackService.java @@ -1,13 +1,19 @@ package io.metersphere.track.service; +import io.metersphere.api.dto.automation.ScenarioStatus; import io.metersphere.base.domain.*; import io.metersphere.base.mapper.*; import io.metersphere.base.mapper.ext.ExtTestCaseMapper; +import io.metersphere.base.mapper.ext.ExtTestPlanTestCaseMapper; +import io.metersphere.commons.constants.TestPlanTestCaseStatus; import io.metersphere.commons.utils.DateUtils; +import io.metersphere.commons.utils.MathUtils; import io.metersphere.performance.base.ChartsData; +import io.metersphere.track.dto.TestPlanDTOWithMetric; import io.metersphere.track.response.BugStatustics; import io.metersphere.track.response.TestPlanBugCount; import io.metersphere.track.response.TrackCountResult; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; @@ -28,13 +34,13 @@ public class TrackService { @Resource private TestPlanMapper testPlanMapper; @Resource - private TestPlanTestCaseMapper testPlanTestCaseMapper; + private ExtTestPlanTestCaseMapper extTestPlanTestCaseMapper; @Resource - private TestPlanLoadCaseMapper testPlanLoadCaseMapper; + private TestPlanApiCaseService testPlanApiCaseService; @Resource - private TestPlanApiCaseMapper testPlanApiCaseMapper; + private TestPlanScenarioCaseService testPlanScenarioCaseService; @Resource - private TestPlanApiScenarioMapper testPlanApiScenarioMapper; + private TestPlanLoadCaseService testPlanLoadCaseService; public List countPriority(String projectId) { return extTestCaseMapper.countPriority(projectId); @@ -132,11 +138,13 @@ public class TrackService { int planBugSize = getPlanBugSize(plan.getId()); testPlanBug.setBugSize(planBugSize); - testPlanBug.setPassRage(getPlanPassRage(plan.getId(), planCaseSize)); + double planPassRage = getPlanPassRage(plan.getId()); + testPlanBug.setPassRage(planPassRage + "%"); list.add(testPlanBug); totalBugSize += planBugSize; totalCaseSize += planCaseSize; + } bugStatustics.setList(list); @@ -156,13 +164,52 @@ public class TrackService { return extTestCaseMapper.getTestPlanBug(planId); } - private String getPlanPassRage(String planId, int totalSize) { - if (totalSize == 0) { - return "-"; - } - int passSize = extTestCaseMapper.getTestPlanPassCase(planId); - float rage = (float) passSize * 100 / totalSize; - DecimalFormat df = new DecimalFormat("0.0"); - return df.format(rage) + "%"; + private double getPlanPassRage(String planId) { + TestPlanDTOWithMetric testPlan = new TestPlanDTOWithMetric(); + testPlan.setTested(0); + testPlan.setPassed(0); + testPlan.setTotal(0); + + List functionalExecResults = extTestPlanTestCaseMapper.getExecResultByPlanId(planId); + functionalExecResults.forEach(item -> { + if (!StringUtils.equals(item, TestPlanTestCaseStatus.Prepare.name()) + && !StringUtils.equals(item, TestPlanTestCaseStatus.Underway.name())) { + testPlan.setTested(testPlan.getTested() + 1); + if (StringUtils.equals(item, TestPlanTestCaseStatus.Pass.name())) { + testPlan.setPassed(testPlan.getPassed() + 1); + } + } + }); + + List apiExecResults = testPlanApiCaseService.getExecResultByPlanId(planId); + apiExecResults.forEach(item -> { + if (StringUtils.isNotBlank(item)) { + testPlan.setTested(testPlan.getTested() + 1); + if (StringUtils.equals(item, "success")) { + testPlan.setPassed(testPlan.getPassed() + 1); + } + } + }); + + List scenarioExecResults = testPlanScenarioCaseService.getExecResultByPlanId(planId); + scenarioExecResults.forEach(item -> { + if (StringUtils.isNotBlank(item)) { + testPlan.setTested(testPlan.getTested() + 1); + if (StringUtils.equals(item, ScenarioStatus.Success.name())) { + testPlan.setPassed(testPlan.getPassed() + 1); + } + } + }); + + List loadResults = testPlanLoadCaseService.getStatus(planId); + loadResults.forEach(item -> { + if (StringUtils.isNotBlank(item)) { + testPlan.setTested(testPlan.getTested() + 1); + if (StringUtils.equals(item, "success")) { + testPlan.setPassed(testPlan.getPassed() + 1); + } + } + }); + return MathUtils.getPercentWithDecimal(testPlan.getTested() == 0 ? 0 : testPlan.getPassed() * 1.0 / testPlan.getTested()); } } From 807bdfe841b967396c509d23824447daa8ba6336 Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Sat, 20 Mar 2021 12:46:46 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?= =?UTF-8?q?=20=E4=B8=BB=E9=A2=98=E8=89=B2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/common/components/MsTabButton.vue | 6 +++--- .../components/track/plan/view/TestPlanView.vue | 5 ++++- .../track/review/view/TestCaseReviewView.vue | 5 ++++- frontend/src/common/css/main.css | 12 ++++++------ 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/frontend/src/business/components/common/components/MsTabButton.vue b/frontend/src/business/components/common/components/MsTabButton.vue index 45431edd4f..d3c5def1d5 100644 --- a/frontend/src/business/components/common/components/MsTabButton.vue +++ b/frontend/src/business/components/common/components/MsTabButton.vue @@ -103,16 +103,16 @@ export default { .active { border: solid 1px #6d317c; - background-color: var(--color); + background-color: var(--primary_color); color: #FFFFFF; } .case-button { - border-left: solid 1px var(--color); + border-left: solid 1px var(--primary_color); } .item{ - border: solid 1px var(--color); + border: solid 1px var(--primary_color); } diff --git a/frontend/src/business/components/track/plan/view/TestPlanView.vue b/frontend/src/business/components/track/plan/view/TestPlanView.vue index adece5b6d9..570ad8f804 100644 --- a/frontend/src/business/components/track/plan/view/TestPlanView.vue +++ b/frontend/src/business/components/track/plan/view/TestPlanView.vue @@ -10,7 +10,7 @@ @dataChange="changePlan"/>