From fb9791e4d6b7e6a3153880c6d4e28a4025553847 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Mon, 20 Feb 2023 00:02:33 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=94=A8=E4=BE=8B=E6=97=B6=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=8A=E6=89=80=E5=B1=9E=E6=A8=A1=E5=9D=97=E6=9C=AA=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E5=88=9D=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1023265,1023264 --user=宋昌昌 【测试跟踪】功能用例-创建用例/功能用例列表-复制用例/编辑用例-更多操作-复制-版本默认为空 https://www.tapd.cn/55049933/s/1337907
---
 .../src/components/new-ui/MsNodeTree.vue      |  2 +-
 .../frontend/src/business/case/TestCase.vue   |  3 ++-
 .../business/case/components/TestCaseEdit.vue | 17 +++++++++++-
 .../case/components/case/CaseBaseInfo.vue     | 27 ++++++++++++-------
 4 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/framework/sdk-parent/frontend/src/components/new-ui/MsNodeTree.vue b/framework/sdk-parent/frontend/src/components/new-ui/MsNodeTree.vue
index c34c16b973..efa4037650 100644
--- a/framework/sdk-parent/frontend/src/components/new-ui/MsNodeTree.vue
+++ b/framework/sdk-parent/frontend/src/components/new-ui/MsNodeTree.vue
@@ -28,7 +28,7 @@
                 <svg-icon v-if="data.id !== 'root' && !hideNodeOperator" icon-class="icon_drag_outlined"/>
               </span>
 
-              <span v-if="data.isEdit" @click.stop @click.stop style="width: 92%">
+              <span v-if="data.isEdit" @click.stop style="width: 92%">
                 <el-input @blur.stop="save(node, data)" @keyup.enter.native.stop="$event.target.blur()" v-model="data.name"
                           class="name-input" size="mini" ref="nameInput" :draggable="true"/>
               </span>
diff --git a/test-track/frontend/src/business/case/TestCase.vue b/test-track/frontend/src/business/case/TestCase.vue
index 91112c302a..32100ddeea 100644
--- a/test-track/frontend/src/business/case/TestCase.vue
+++ b/test-track/frontend/src/business/case/TestCase.vue
@@ -345,7 +345,8 @@ export default {
     hasPermission,
     handleCreateCase(){
       openCaseCreate({
-        projectId: this.projectId
+        projectId: this.projectId,
+        createNodeId: this.selectNode.data && this.selectNode.data.id !== 'root' ? this.selectNode.data.id : ""
       }, this);
     },
     handleImportCommand(e) {
diff --git a/test-track/frontend/src/business/case/components/TestCaseEdit.vue b/test-track/frontend/src/business/case/components/TestCaseEdit.vue
index bfbe2bf927..f27598fd1e 100644
--- a/test-track/frontend/src/business/case/components/TestCaseEdit.vue
+++ b/test-track/frontend/src/business/case/components/TestCaseEdit.vue
@@ -307,6 +307,7 @@
 </template>
 
 <script>
+import {getProjectVersions} from "metersphere-frontend/src/api/version";
 import { TokenKey } from "metersphere-frontend/src/utils/constants";
 import MsDialogFooter from "metersphere-frontend/src/components/MsDialogFooter";
 import {
@@ -691,8 +692,21 @@ export default {
       this.$router.push('/track/case/all');
     });
     this.$EventBus.$on("handleSaveCaseWithEvent", this.handleSaveCaseWithEvent);
+    this.setInitialVal();
   },
   methods: {
+    setInitialVal() {
+      if (this.isAdd) {
+        getProjectVersions(getCurrentProjectID()).then(
+          (r) => {
+            let latestVersion = r.data.filter(version => version.latest);
+            if (latestVersion && latestVersion.length === 1 && this.editable) {
+              this.initLatestVersionId = latestVersion[0].id;
+            }
+          }
+        );
+      }
+    },
     checkoutLatest(){
       //切换最新版本
       this.checkoutByVersionId(this.latestVersionId);
@@ -937,6 +951,7 @@ export default {
         this.form.method = "manual";
         this.form.maintainer = user.id;
         this.form.tags = [];
+        this.form.versionId = this.initLatestVersionId;
         this.getSelectOptions();
         this.customFieldForm = parseCustomField(
           this.form,
@@ -986,7 +1001,7 @@ export default {
           //复制的时候只复制当前版本
           testCase.id = getUUID();
           testCase.refId = null;
-          testCase.versionId = null;
+          testCase.versionId = this.initLatestVersionId;
 
           this.testCaseTemplate.customFields.forEach((item) => {
             item.isEdit = false;
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 05a3062603..93d6e3fd0f 100644
--- a/test-track/frontend/src/business/case/components/case/CaseBaseInfo.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseBaseInfo.vue
@@ -328,9 +328,7 @@
 </template>
 
 <script>
-import {
-  getProjectVersions,
-} from "metersphere-frontend/src/api/version";
+import {getProjectVersions} from "metersphere-frontend/src/api/version";
 import { hasLicense } from "metersphere-frontend/src/utils/permission";
 import MsFormDivider from "metersphere-frontend/src/components/MsFormDivider";
 import MsSelectTree from "metersphere-frontend/src/components/select-tree/SelectTree";
@@ -466,13 +464,17 @@ export default {
     defaultModuleKey() {
       if (this.editable) {
         let defaultNodeKey = '';
-        this.treeNodes.forEach(node => {
-          if (node.label === '未规划用例') {
-            defaultNodeKey = node.id;
-            this.form.module = defaultNodeKey;
-            this.form.nodePath = node.path;
-          }
-        })
+        if (this.$route.query.createNodeId) {
+          defaultNodeKey = this.$route.query.createNodeId;
+        } else {
+          this.treeNodes.forEach(node => {
+            if (node.label === '未规划用例') {
+              defaultNodeKey = node.id;
+              this.form.module = defaultNodeKey;
+              this.form.nodePath = node.path;
+            }
+          })
+        }
         return defaultNodeKey;
       } else {
         return this.form.module
@@ -482,6 +484,11 @@ export default {
   mounted() {
     this.getDemandOptions();
     this.getVersionOptions();
+    if (this.$route.query.createNodeId) {
+      this.form.module = this.$route.query.createNodeId;
+      let node = this.findTreeNode(this.treeNodes);
+      this.form.nodePath = node.path;
+    }
   },
   methods: {
     handleDemandOptionPlatform(data){