From f887d8a39dbf9f79885bad3c832365f200983764 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 27 May 2022 18:26:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E8=84=91=E5=9B=BE=E4=B8=AD=E7=89=88=E6=9C=AC=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1012876 --user=陈建星 [测试跟踪]github#10373脑图中版本筛选功能失效 https://www.tapd.cn/55049933/s/1167035
---
 .../base/mapper/ext/ExtTestCaseMapper.xml     |  6 ++++--
 frontend/package.json                         |  2 +-
 .../common/components/MsModuleMinder.vue      | 17 +++++++++-------
 .../components/track/case/TestCase.vue        |  1 +
 .../track/common/minder/TestCaseMinder.vue    | 20 +++++++++++++------
 5 files changed, 30 insertions(+), 16 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 c4507cb0b5..4741862c66 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
@@ -775,9 +775,11 @@
 
     <select id="listForMinder" resultType="io.metersphere.track.dto.TestCaseDTO">
         select
-        <include refid="io.metersphere.base.mapper.TestCaseMapper.Base_Column_List"/>,
-        <include refid="io.metersphere.base.mapper.TestCaseMapper.Blob_Column_List"/>
+        test_case.*,
+        project_version.name as versionName,
+        project_version.id as versionId
         from test_case
+        left join project_version on project_version.id = test_case.version_id
         <include refid="queryWhereCondition"/>
         <if test="request.nodeId != null">
             and test_case.node_id = #{request.nodeId}
diff --git a/frontend/package.json b/frontend/package.json
index 0ae34fafb4..e15f2bbe3b 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -54,7 +54,7 @@
     "vue-float-action-button": "^0.6.6",
     "vue-i18n": "^8.15.3",
     "vue-jsonpath-picker": "^1.1.5",
-    "vue-minder-editor-plus": "1.0.43",
+    "vue-minder-editor-plus": "1.0.44",
     "vue-papa-parse": "^2.0.0",
     "vue-pdf": "^4.2.0",
     "vue-router": "^3.1.3",
diff --git a/frontend/src/business/components/common/components/MsModuleMinder.vue b/frontend/src/business/components/common/components/MsModuleMinder.vue
index b6f1d0a2a3..fa2bcc3dfd 100644
--- a/frontend/src/business/components/common/components/MsModuleMinder.vue
+++ b/frontend/src/business/components/common/components/MsModuleMinder.vue
@@ -122,15 +122,18 @@ export default {
         this.defaultMode = Number.parseInt(model);
       }
     }
-    this.$nextTick(() => {
-      if (this.selectNode && this.selectNode.data) {
-        this.handleNodeSelect(this.selectNode);
-      } else {
-        this.parse(this.importJson.root, this.treeNodes);
-      }
-    });
+    this.initData();
   },
   methods: {
+    initData() {
+      this.$nextTick(() => {
+        if (this.selectNode && this.selectNode.data) {
+          this.handleNodeSelect(this.selectNode);
+        } else {
+          this.parse(this.importJson.root, this.treeNodes);
+        }
+      });
+    },
     getNoCaseModuleIds(ids, nodes) {
       if (nodes) {
         nodes.forEach(node => {
diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue
index 551503e088..73d326d0b7 100644
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@@ -105,6 +105,7 @@
               ref="testCaseList">
             </test-case-list>
             <test-case-minder
+              :current-version="currentVersion"
               :tree-nodes="treeNodes"
               :project-id="projectId"
               :condition="condition"
diff --git a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
index 586d20f680..8ba089b656 100644
--- a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
@@ -87,6 +87,7 @@ name: "TestCaseMinder",
         return []
       }
     },
+    currentVersion: String,
     condition: Object,
     projectId: String,
   },
@@ -120,6 +121,9 @@ name: "TestCaseMinder",
       if (this.$refs.minder) {
         this.$refs.minder.handleNodeSelect(this.selectNode);
       }
+    },
+    currentVersion() {
+      this.$refs.minder.initData();
     }
   },
   mounted() {
@@ -182,6 +186,7 @@ name: "TestCaseMinder",
       return {
         request: {
           projectId: this.projectId,
+          versionId: this.currentVersion,
           orders: this.condition.orders
         },
         result: this.result,
@@ -330,12 +335,7 @@ name: "TestCaseMinder",
         this.saveExtraNode[parent.newId ? parent.newId : parent.id] = nodes;
       }
     },
-    buildSaveCase(node, parent, preNode, nextNode) {
-      let data = node.data;
-      if (!data.text) {
-        return;
-      }
-
+    validate(parent, data) {
       if (parent.id === 'root') {
         this.throwError(this.$t('test_track.case.minder_all_module_tip'));
       }
@@ -347,6 +347,14 @@ name: "TestCaseMinder",
       if (data.type === 'node') {
         this.throwError(this.$t('test_track.case.minder_is_module_tip', [data.text]));
       }
+    },
+    buildSaveCase(node, parent, preNode, nextNode) {
+      let data = node.data;
+      if (!data.text) {
+        return;
+      }
+
+      this.validate(parent, data);
 
       let isChange = false;