From 87b77d37b1d4adcfb786375e6a8f42e383a3736a Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 25 Oct 2022 15:34:06 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E6=96=B0=E6=97=A7=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=AF=B9=E6=AF=94=E4=B8=8D=E5=8F=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1018788 --user=陈建星 【测试跟踪】功能用例-新旧版本对比功能不可用 https://www.tapd.cn/55049933/s/1276070
---
 .../components/form/CustomFiledFormRow.vue    | 20 ++-----------------
 .../frontend/src/utils/custom_field.js        | 20 +++++++++++++++++++
 .../business/case/components/TestCaseEdit.vue |  8 ++++----
 .../case/version/TestCaseVersionDiff.vue      | 14 +++++++------
 .../frontend/src/business/utils/sdk-utils.js  |  1 +
 5 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/framework/sdk-parent/frontend/src/components/form/CustomFiledFormRow.vue b/framework/sdk-parent/frontend/src/components/form/CustomFiledFormRow.vue
index ac75c4602a..dbfa997653 100644
--- a/framework/sdk-parent/frontend/src/components/form/CustomFiledFormRow.vue
+++ b/framework/sdk-parent/frontend/src/components/form/CustomFiledFormRow.vue
@@ -24,6 +24,7 @@
 <script>
 import {SYSTEM_FIELD_NAME_MAP} from "../../utils/table-constants";
 import CustomFiledComponent from "../template/CustomFiledComponent";
+import {sortCustomFields} from "../../utils/custom_field";
 
 export default {
   name: "CustomFiledFormRow",
@@ -66,24 +67,7 @@ export default {
       return SYSTEM_FIELD_NAME_MAP;
     },
     sortCustomFields() {
-      let total = 0;//定义total用于控制循环结束
-      let customFields = this.issueTemplate.customFields;
-      for (let i = 0; total < customFields.length; total++) {
-        if (typeof (customFields[i].defaultValue) === 'string' || customFields[i].defaultValue instanceof String) {
-          try {
-            customFields[i].defaultValue = JSON.parse(customFields[i].defaultValue);
-          } catch (e) {
-            // nothing
-          }
-        }
-        if (customFields[i].type === 'richText') {
-          //循环到是0的位置就删除该元素0并且在arr末尾push进这个元素0，由于splice删除了该位置元素，所以i不用+1，下次循环仍然检查i位置的元素
-          customFields.push(customFields.splice(i, 1)[0]);
-        } else {
-          i++;//循环到不是0的位置就继续往后循环
-        }
-      }
-      return customFields;
+      return sortCustomFields(this.issueTemplate.customFields);
     },
   }
 }
diff --git a/framework/sdk-parent/frontend/src/utils/custom_field.js b/framework/sdk-parent/frontend/src/utils/custom_field.js
index 4702c2ce04..c4e00965bd 100644
--- a/framework/sdk-parent/frontend/src/utils/custom_field.js
+++ b/framework/sdk-parent/frontend/src/utils/custom_field.js
@@ -161,3 +161,23 @@ export function buildTestCaseOldFields(testCase) {
   oldFields.set('用例等级', testCase.priority);
   return oldFields;
 }
+
+export function sortCustomFields(customFields) {
+  let total = 0;//定义total用于控制循环结束
+  for (let i = 0; total < customFields.length; total++) {
+    if (typeof (customFields[i].defaultValue) === 'string' || customFields[i].defaultValue instanceof String) {
+      try {
+        customFields[i].defaultValue = JSON.parse(customFields[i].defaultValue);
+      } catch (e) {
+        // nothing
+      }
+    }
+    if (customFields[i].type === 'richText') {
+      //循环到是0的位置就删除该元素0并且在arr末尾push进这个元素0，由于splice删除了该位置元素，所以i不用+1，下次循环仍然检查i位置的元素
+      customFields.push(customFields.splice(i, 1)[0]);
+    } else {
+      i++;//循环到不是0的位置就继续往后循环
+    }
+  }
+  return customFields;
+}
diff --git a/test-track/frontend/src/business/case/components/TestCaseEdit.vue b/test-track/frontend/src/business/case/components/TestCaseEdit.vue
index e181ba011a..0270763045 100644
--- a/test-track/frontend/src/business/case/components/TestCaseEdit.vue
+++ b/test-track/frontend/src/business/case/components/TestCaseEdit.vue
@@ -1017,10 +1017,10 @@ export default {
           let p1 = getTestCase(response.data.id);
           let p2 = getTestCase(this.currentTestCaseInfo.id);
           let that = this;
-          Promise.all([p1, p2]).then(data => {
-            if (data[0] && data[1]) {
-              that.newData = data[0].data.data;
-              that.oldData = data[1].data.data;
+          Promise.all([p1, p2]).then(r => {
+            if (r[0] && r[1]) {
+              that.newData = r[0].data;
+              that.oldData = r[1].data;
               that.newData.createTime = row.createTime;
               that.oldData.createTime = this.$refs.versionHistory.versionOptions.filter(v => v.id === that.oldData.versionId)[0].createTime;
               that.newData.versionName = that.versionData.filter(v => v.id === that.newData.id)[0].versionName;
diff --git a/test-track/frontend/src/business/case/version/TestCaseVersionDiff.vue b/test-track/frontend/src/business/case/version/TestCaseVersionDiff.vue
index 60ebb3ac29..945e2b16dc 100644
--- a/test-track/frontend/src/business/case/version/TestCaseVersionDiff.vue
+++ b/test-track/frontend/src/business/case/version/TestCaseVersionDiff.vue
@@ -60,8 +60,10 @@
           <el-form v-if="oldData.isFormAlive" :model="oldData.customFieldForm" :rules="oldData.customFieldRules"
                    ref="oldCustomFieldForm"
                    class="case-form">
-            <custom-filed-form-item :form="oldData.customFieldForm" :form-label-width="oldData.formLabelWidth"
-                                    :issue-template="oldData.testCaseTemplate" :is-public="isPublic"/>
+            <custom-filed-form-row :form="oldData.customFieldForm"
+                                   :disabled="readOnly"
+                                   :default-open="defaultOpen"
+                                   :issue-template="oldData.testCaseTemplate"/>
           </el-form>
 
           <el-row v-if="oldData.isCustomNum">
@@ -237,7 +239,7 @@ import MsFormDivider from "metersphere-frontend/src/components/MsFormDivider";
 import MsInputTag from "metersphere-frontend/src/components/MsInputTag";
 import {getCurrentProjectID, getCurrentUser} from "metersphere-frontend/src/utils/token";
 import {removeGoBackListener} from "metersphere-frontend/src/utils";
-import {buildTestCaseOldFields, parseCustomField} from "metersphere-frontend/src/utils/custom_field";
+import {buildTestCaseOldFields, parseCustomField, sortCustomFields} from "metersphere-frontend/src/utils/custom_field";
 import TestCaseEditOtherInfo from "@/business/case/components/TestCaseEditOtherInfo";
 import TestCaseStepItem from "@/business/case/components/TestCaseStepItem";
 import StepChangeItem from "@/business/case/components/StepChangeItem";
@@ -250,7 +252,6 @@ import {useStore} from "@/store";
 import {getProjectListAll, getProjectMemberOption} from "@/business/utils/sdk-utils";
 import {getTestTemplate} from "@/api/custom-field-template";
 import {testCaseCommentList} from "@/api/test-case-comment";
-
 const {diff} = require("@/business/v_node_diff");
 
 export default {
@@ -407,8 +408,8 @@ export default {
       this[prop].$get = this.$get;
       let that = this;
       getTestTemplate()
-        .then((r) => {
-          this[prop].testCaseTemplate = r.data;
+        .then((testCaseTemplate) => {
+          this[prop].testCaseTemplate = testCaseTemplate;
           initFuc(prop, () => {
             that.reloadForm(prop);
           });
@@ -443,6 +444,7 @@ export default {
       this[prop].module = this[prop].nodeId;
       //设置自定义熟悉默认值
       this[prop].customFieldForm = parseCustomField(this[prop], this[prop].testCaseTemplate, null, this[prop] ? buildTestCaseOldFields(this[prop]) : null);
+      sortCustomFields(this[prop].testCaseTemplate.customFields);
     },
     setTestCaseExtInfo(prop) {
       this[prop] = {};
diff --git a/test-track/frontend/src/business/utils/sdk-utils.js b/test-track/frontend/src/business/utils/sdk-utils.js
index ff05c825ae..1ad00fde22 100644
--- a/test-track/frontend/src/business/utils/sdk-utils.js
+++ b/test-track/frontend/src/business/utils/sdk-utils.js
@@ -1,6 +1,7 @@
 export {operationConfirm, removeGoBackListener, handleCtrlSEvent, byteToSize, resizeTextarea,
   getTypeByFileName, strMapToObj, getUUID, windowPrint} from "metersphere-frontend/src/utils";
 export {parseCustomFilesForList, getCustomFieldFilter, buildBatchParam} from "metersphere-frontend/src/utils/tableUtils";
+export {sortCustomFields, parseCustomField, buildCustomFields} from "metersphere-frontend/src/utils/custom_field";
 export {getCurrentProjectID, getCurrentWorkspaceId, getCurrentUser} from "metersphere-frontend/src/utils/token";
 export {hasLicense, hasPermissions, hasPermission} from "metersphere-frontend/src/utils/permission";
 export {get, post, downloadFile, fileDownloadGet, fileDownloadPost, fileUpload, generateShareUrl, generateModuleUrl} from "metersphere-frontend/src/plugins/request";