From f6fb7fed222f8504d9ead7d9aaad4d7c9c1d8803 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 4 Jun 2021 17:28:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=84=91=E5=9B=BE=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E7=B2=98=E8=B4=B4=E6=96=B0=E5=A2=9E=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/package.json                         |  2 +-
 .../track/common/minder/TestCaseMinder.vue    | 36 ++++++++++---------
 .../track/common/minder/minderUtils.js        | 31 +++++++++++++---
 3 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index cba23d34a8..a52c349b6a 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -52,7 +52,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.26",
+    "vue-minder-editor-plus": "^1.0.27",
     "vue-papa-parse": "^2.0.0",
     "vue-pdf": "^4.2.0",
     "vue-router": "^3.1.3",
diff --git a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
index 354c4decb0..fcf7ecc9de 100644
--- a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
@@ -18,6 +18,7 @@
 <script>
 import MsModuleMinder from "@/business/components/common/components/MsModuleMinder";
 import {
+  handleAfterSave,
   handleExpandToLevel, handleTestCaseAdd, handTestCaeEdit,
   listenBeforeExecCommand,
   listenNodeSelected,
@@ -81,29 +82,24 @@ name: "TestCaseMinder",
   methods: {
     handleAfterMount() {
       listenNodeSelected(() => {
-        let param = {
-          request: {
-            projectId: this.projectId,
-          },
-          result: this.result,
-          isDisable: false
-        }
-        loadSelectNodes(param,  getTestCasesForMinder);
+        loadSelectNodes(this.getParam(),  getTestCasesForMinder);
       });
       listenBeforeExecCommand((even) => {
         if (even.commandName === 'expandtolevel') {
           let level = Number.parseInt(even.commandArgs);
-          let param = {
-            request: {
-              projectId: this.projectId,
-            },
-            result: this.result,
-            isDisable: false
-          }
-          handleExpandToLevel(level, even.minder.getRoot(), param, getTestCasesForMinder);
+          handleExpandToLevel(level, even.minder.getRoot(), this.getParam(), getTestCasesForMinder);
         }
       });
     },
+    getParam() {
+      return {
+        request: {
+          projectId: this.projectId,
+        },
+        result: this.result,
+        isDisable: false
+      }
+    },
     save(data) {
       let saveCases = [];
       let deleteCases = [];
@@ -115,6 +111,7 @@ name: "TestCaseMinder",
       }
       this.result = this.$post('/test/case/minder/edit', param, () => {
         this.$success(this.$t('commons.save_success'));
+        handleAfterSave(window.minder.getRoot(), this.getParam());
       });
     },
     buildSaveCase(root, saveCases, deleteCases, parent) {
@@ -126,10 +123,15 @@ name: "TestCaseMinder",
         if (deleteChild && deleteChild.length > 0) {
           deleteCases.push(...deleteChild);
         }
+        if (data.type !== 'node') {
+          let tip = '用例(' + data.text + ')未添加用例标签！';
+          this.$error(tip)
+          throw new Error(tip);
+        }
         if (root.children) {
           root.children.forEach((childNode) => {
             this.buildSaveCase(childNode, saveCases, deleteCases, root.data);
-          })
+          });
         }
       }
     },
diff --git a/frontend/src/business/components/track/common/minder/minderUtils.js b/frontend/src/business/components/track/common/minder/minderUtils.js
index 933e5664ce..5cb53fa29a 100644
--- a/frontend/src/business/components/track/common/minder/minderUtils.js
+++ b/frontend/src/business/components/track/common/minder/minderUtils.js
@@ -1,4 +1,5 @@
 import i18n from "@/i18n/i18n";
+import {getTestCasesForMinder} from "@/network/testCase";
 
 export function listenNodeSelected(callback) {
   let minder = window.minder;
@@ -222,7 +223,7 @@ function getNodeData(text, resource, isDisable) {
  * @param result
  */
 export function appendCaseNodes(parent, testCases, param, setParamCallback) {
-  wipeTmp(parent);
+  clearChildren(parent);
   if (testCases) {
     for (let i = 0; i < testCases.length; i++) {
       appendCase(parent, testCases[i], param.isDisable, setParamCallback);
@@ -235,17 +236,17 @@ export function appendCaseNodes(parent, testCases, param, setParamCallback) {
 }
 
 /**
- * 去掉临时节点
+ * 去掉已有节点
  * @param parent
  */
-function wipeTmp(node) {
+function clearChildren(node) {
   let children = node.children;
   if (children) {
     for (let i = 0; i < children.length; i++) {
       let item = children[i];
-      if (item.data.type === 'tmp') {
+      if (item.data.type !== 'node') {
         window.minder.removeNode(item);
-        break;
+        i--;
       }
     }
   }
@@ -334,3 +335,23 @@ export function priorityDisableCheck() {
   }
   return false;
 }
+
+export function handleAfterSave(pNode, param) {
+  let children = pNode.children;
+  if (children) {
+    for (let i = 0; i < children.length; i++) {
+      let item = children[i];
+      if (item.data.id === null || (item.data.id && item.data.id.length < 20)) {
+        pNode.data.loaded = false;
+        loadNode(pNode, param, getTestCasesForMinder);
+        return;
+      }
+      if (item.data.changed) {
+        item.data.changed = false;
+      }
+      if (item.data.type === 'node') {
+        handleAfterSave(item, param);
+      }
+    }
+  }
+}