From a66e773adf1f804df254814d8a19ee826c9079c1 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 22 Jul 2022 10:31:44 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E5=B1=9E=E6=80=A7=E9=97=AE=E9=A2=98=20#16078?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../definition/components/step/JmxStep.vue    | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/step/JmxStep.vue b/frontend/src/business/components/api/definition/components/step/JmxStep.vue
index b19bae48da..805e3df516 100644
--- a/frontend/src/business/components/api/definition/components/step/JmxStep.vue
+++ b/frontend/src/business/components/api/definition/components/step/JmxStep.vue
@@ -24,8 +24,7 @@
       </el-button>
     </p>
     <!-- HTTP 请求参数 -->
-    <el-tree node-key=" resourceId
-      "
+    <el-tree node-key="resourceId"
              :props="props"
              :data="request.hashTree"
              :allow-drop="allowDrop"
@@ -138,6 +137,7 @@ import BatchAddParameter from "../basis/BatchAddParameter";
 import MsJsr233Processor from "../../../automation/scenario/component/Jsr233Processor";
 import MsConstantTimer from "../../../automation/scenario/component/ConstantTimer";
 import MsJdbcProcessor from "@/business/components/api/automation/scenario/component/JDBCProcessor";
+import {TYPE_TO_C} from "@/business/components/api/automation/scenario/Setting";
 
 export default {
   name: "MsJmxStep",
@@ -459,19 +459,26 @@ export default {
     sort() {
       let index = 1;
       for (let i in this.request.hashTree) {
-        if (this.tabType === 'pre' && (this.request.hashTree[i].type === 'JSR223PreProcessor' ||
-          this.request.hashTree[i].type === 'JDBCPreProcessor' || this.request.hashTree[i].type === 'ConstantTimer')) {
-          this.request.hashTree[i].index = Number(index);
+        let step = this.request.hashTree[i];
+        if (this.tabType === 'pre' &&
+          (step.type === 'JSR223PreProcessor' ||
+            step.type === 'JDBCPreProcessor' || step.type === 'ConstantTimer')) {
+          step.index = Number(index);
           index++;
-        } else if (this.tabType === 'post' && (this.request.hashTree[i].type === 'JSR223PostProcessor' ||
-          this.request.hashTree[i].type === 'JDBCPostProcessor' ||
-          this.request.hashTree[i].type === 'Extract')) {
-          this.request.hashTree[i].index = Number(index);
+        } else if (this.tabType === 'post' &&
+          (step.type === 'JSR223PostProcessor' ||
+            step.type === 'JDBCPostProcessor' ||
+            step.type === 'Extract')) {
+          step.index = Number(index);
           index++;
-        } else if (this.tabType === 'assertionsRule' && this.request.hashTree[i].type === 'Assertions') {
-          this.request.hashTree[i].index = Number(index);
+        } else if (this.tabType === 'assertionsRule' && step.type === 'Assertions') {
+          step.index = Number(index);
           index++;
         }
+        // 兼容历史数据
+        if (!step.clazzName) {
+          step.clazzName = TYPE_TO_C.get(step.type);
+        }
       }
     },
     // 解决修改请求头后 body 显示错位