From c372c58e711bd08f37b5445edd2d41f318d9e9de Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Thu, 9 Feb 2023 15:29:33 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E8=AF=84=E5=AE=A1=E9=A1=B5=E9=9D=A2=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/TestReviewTestCaseService.java    |  4 ++-
 .../case/components/case/CaseBaseInfo.vue     | 27 ++++++++++---------
 .../components/case/CaseIssueEditDetail.vue   |  9 -------
 .../components/common/MsFileMetadataList.vue  |  5 ----
 4 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/test-track/backend/src/main/java/io/metersphere/service/TestReviewTestCaseService.java b/test-track/backend/src/main/java/io/metersphere/service/TestReviewTestCaseService.java
index f3cac84f7b..6d3d4e9d56 100644
--- a/test-track/backend/src/main/java/io/metersphere/service/TestReviewTestCaseService.java
+++ b/test-track/backend/src/main/java/io/metersphere/service/TestReviewTestCaseService.java
@@ -30,10 +30,11 @@ import io.metersphere.utils.ListUtil;
 import io.metersphere.xpack.version.service.ProjectVersionService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.*;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
@@ -54,6 +55,7 @@ public class TestReviewTestCaseService {
     @Resource
     TestCaseReviewMapper testCaseReviewMapper;
     @Resource
+    @Lazy
     TestCaseReviewService testCaseReviewService;
     @Resource
     TestCaseMapper testCaseMapper;
diff --git a/test-track/frontend/src/business/case/components/case/CaseBaseInfo.vue b/test-track/frontend/src/business/case/components/case/CaseBaseInfo.vue
index c1919b6051..21fe936719 100644
--- a/test-track/frontend/src/business/case/components/case/CaseBaseInfo.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseBaseInfo.vue
@@ -30,7 +30,7 @@
                   <ms-select-tree
                     :disabled="readOnly"
                     :data="treeNodes"
-                    :defaultKey="form.module"
+                    :defaultKey="defaultModuleKey"
                     :obj="moduleObj"
                     @getValue="(id, data) => setModule(id, data)"
                     clearable
@@ -460,18 +460,19 @@ export default {
     isCustomNum() {
       return useStore().currentProjectIsCustomNum;
     },
-    //   this.customFieldForm["用例等级"] = this.form.priority;
-    //   this.customFieldForm["责任人"] = this.form.maintainer;
-    //   this.customFieldForm["用例状态"] = this.form.status;
-    // priority() {
-    //   return this.customFieldForm["用例等级"] || this.form.priority;
-    // },
-    // maintainer() {
-    //   return this.customFieldForm["责任人"] || this.form.maintainer;
-    // },
-    // status() {
-    //   return this.customFieldForm["用例状态"] || this.form.status;
-    // },
+    defaultModuleKey() {
+      if (this.editable) {
+        let defaultNodeKey = '';
+        this.treeNodes.forEach(node => {
+          if (node.label === '未规划用例') {
+            defaultNodeKey = node.id;
+          }
+        })
+        return defaultNodeKey;
+      } else {
+        return this.form.module
+      }
+    }
   },
   mounted() {
     this.getDemandOptions();
diff --git a/test-track/frontend/src/business/case/components/case/CaseIssueEditDetail.vue b/test-track/frontend/src/business/case/components/case/CaseIssueEditDetail.vue
index c8b82c8c40..c0c3230619 100644
--- a/test-track/frontend/src/business/case/components/case/CaseIssueEditDetail.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseIssueEditDetail.vue
@@ -95,15 +95,6 @@
           prop="description"
         />
       </div>
-      <div class="remark-wrap">
-        <form-rich-text-item
-          v-if="!enableThirdPartTemplate"
-          :title="$t('commons.remark')"
-          :data="form"
-          :default-open="richTextDefaultOpen"
-          prop="remark"
-        />
-      </div>
       <el-form-item :label="$t('test_track.case.attachment')"></el-form-item>
     </el-form>
 
diff --git a/test-track/frontend/src/business/case/components/common/MsFileMetadataList.vue b/test-track/frontend/src/business/case/components/common/MsFileMetadataList.vue
index 1554295def..0cd3555430 100644
--- a/test-track/frontend/src/business/case/components/common/MsFileMetadataList.vue
+++ b/test-track/frontend/src/business/case/components/common/MsFileMetadataList.vue
@@ -261,11 +261,6 @@
             {{ $t("case.empty_file") }}
           </div>
         </div>
-        <div class="upload-file" style="margin-top: 16px">
-          <el-button type="primary" size="small" icon="el-icon-upload2">{{
-            $t("case.upload_file")
-          }}</el-button>
-        </div>
       </div>
     </div>
   </el-drawer>