From 8e3889e357f56d5fc6da020888c9c0885fb00bc6 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 19 Aug 2021 09:53:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=B3=E8=81=94=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/service/TestCaseService.java        | 35 +------------------
 .../case/components/TestCaseRelateApiList.vue |  2 +-
 .../components/TestCaseRelateLoadList.vue     |  2 +-
 .../components/TestCaseRelateScenarioList.vue |  2 +-
 4 files changed, 4 insertions(+), 37 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 91aa83c2df..683e383e08 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -1189,19 +1189,7 @@ public class TestCaseService {
 
 
         final TestCaseWithBLOBs testCaseWithBLOBs = addTestCase(request);
-        //插入测试与用例关系表
-        if (!CollectionUtils.isEmpty(request.getSelected())) {
-            List<List<String>> selecteds = request.getSelected();
-            TestCaseTest test = new TestCaseTest();
-            selecteds.forEach(id -> {
-                test.setTestType(id.get(0));
-                test.setTestId(id.get(id.size() - 1));
-                test.setTestCaseId(request.getId());
-                test.setCreateTime(System.currentTimeMillis());
-                test.setUpdateTime(System.currentTimeMillis());
-                testCaseTestMapper.insert(test);
-            });
-        }
+
         // 复制用例时传入文件ID进行复制
         if (!CollectionUtils.isEmpty(request.getFileIds())) {
             List<String> fileIds = request.getFileIds();
@@ -1233,26 +1221,6 @@ public class TestCaseService {
         if (testCaseWithBLOBs == null) {
             MSException.throwException(Translator.get("edit_load_test_not_found") + request.getId());
         }
-        //插入测试与用例关系表
-        TestCaseTestExample example = new TestCaseTestExample();
-        example.createCriteria().andTestCaseIdEqualTo(request.getId());
-        List<TestCaseTest> list = testCaseTestMapper.selectByExample(example);
-        if (list.size() > 0) {
-            testCaseTestMapper.deleteByExample(example);
-        }
-        List<List<String>> selecteds = request.getSelected();
-        TestCaseTest test = new TestCaseTest();
-        LogUtil.info("关联的测试用例:" + selecteds);
-        if (selecteds != null) {
-            selecteds.forEach(id -> {
-                test.setTestType(id.get(0));
-                test.setTestId(id.get(id.size() - 1));
-                test.setCreateTime(System.currentTimeMillis());
-                test.setUpdateTime(System.currentTimeMillis());
-                test.setTestCaseId(request.getId());
-                testCaseTestMapper.insert(test);
-            });
-        }
 
         // 新选择了一个文件，删除原来的文件
         List<FileMetadata> updatedFiles = request.getUpdatedFileList();
@@ -1269,7 +1237,6 @@ public class TestCaseService {
             testCaseFileMapper.deleteByExample(testCaseFileExample);
         }
 
-
         if (files != null) {
             files.forEach(file -> {
                 final FileMetadata fileMetadata = fileService.saveFile(file, testCaseWithBLOBs.getProjectId());
diff --git a/frontend/src/business/components/track/case/components/TestCaseRelateApiList.vue b/frontend/src/business/components/track/case/components/TestCaseRelateApiList.vue
index 20b8fad761..0214e4149c 100644
--- a/frontend/src/business/components/track/case/components/TestCaseRelateApiList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseRelateApiList.vue
@@ -84,7 +84,7 @@ export default {
         {text: 'P3', value: 'P3'}
       ],
       methodColorMap: new Map(API_METHOD_COLOUR),
-      screenHeight: 'calc(100vh - 600px)',//屏幕高度
+      screenHeight: '600px',//屏幕高度
       tableData: [],
       currentPage: 1,
       pageSize: 10,
diff --git a/frontend/src/business/components/track/case/components/TestCaseRelateLoadList.vue b/frontend/src/business/components/track/case/components/TestCaseRelateLoadList.vue
index 5fa81bb337..444389176f 100644
--- a/frontend/src/business/components/track/case/components/TestCaseRelateLoadList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseRelateLoadList.vue
@@ -62,7 +62,7 @@ export default {
     return {
       condition: {},
       result: {},
-      screenHeight: 'calc(100vh - 600px)',//屏幕高度
+      screenHeight: '600px',//屏幕高度
       tableData: [],
       currentPage: 1,
       pageSize: 10,
diff --git a/frontend/src/business/components/track/case/components/TestCaseRelateScenarioList.vue b/frontend/src/business/components/track/case/components/TestCaseRelateScenarioList.vue
index e305f210dc..210399cea7 100644
--- a/frontend/src/business/components/track/case/components/TestCaseRelateScenarioList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseRelateScenarioList.vue
@@ -94,7 +94,7 @@ export default {
         {text: 'P2', value: 'P2'},
         {text: 'P3', value: 'P3'}
       ],
-      screenHeight: 'calc(100vh - 600px)',//屏幕高度
+      screenHeight: '600px',//屏幕高度
       tableData: [],
       currentPage: 1,
       pageSize: 10,