From 1961c8fec38de5c3304064f9fc3f4d92ab075129 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 18 Mar 2021 15:03:46 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=A2=9E=E5=8A=A0jmx=E5=AF=BC=E5=85=A5=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E7=9A=84=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack                | 2 +-
 .../api/automation/scenario/common/ApiBaseComponent.vue   | 5 +----
 .../scenario/component/JmeterElementComponent.vue         | 8 +++++++-
 .../api/automation/scenario/maximize/MaximizeScenario.vue | 6 +++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index adefde265f..efd6af73b7 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit adefde265ff12d4ea909353c3f46008f8a8e17e7
+Subproject commit efd6af73b7c5cc53cd4515772000bc1436c49837
diff --git a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
index 31e8805ba4..c2aea0332c 100644
--- a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
@@ -12,7 +12,7 @@
       <span>
         <slot name="headerLeft">
           <i class="icon el-icon-arrow-right" :class="{'is-active': data.active}"
-             @click="active(data)" v-if="data.type!='scenario' && data.type!='JmeterElement' && !isMax " @click.stop/>
+             @click="active(data)" v-if="data.type!='scenario' && !isMax " @click.stop/>
           <span @click.stop v-if="isShowInput && isShowNameInput">
             <el-input :draggable="draggable" size="mini" v-model="data.name" class="name-input"
                       @blur="isShowInput = false" :placeholder="$t('commons.input_name')" ref="nameEdit" :disabled="data.disabled"/>
@@ -113,9 +113,6 @@
           this.$refs.nameEdit.focus();
         });
       }
-      if (this.data && this.data.type === "JmeterElement") {
-        this.data.active = false;
-      }
       if (this.data && ELEMENTS.get("AllSamplerProxy").indexOf(this.data.type) != -1) {
         if (!this.data.method) {
           this.data.method = this.data.protocol;
diff --git a/frontend/src/business/components/api/automation/scenario/component/JmeterElementComponent.vue b/frontend/src/business/components/api/automation/scenario/component/JmeterElementComponent.vue
index 28cb9a1843..7c47a3484b 100644
--- a/frontend/src/business/components/api/automation/scenario/component/JmeterElementComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/JmeterElementComponent.vue
@@ -2,6 +2,7 @@
   <api-base-component
     @copy="copyRow"
     @remove="remove"
+    @active="active"
     :data="request"
     :draggable="draggable"
     :color="defColor"
@@ -9,7 +10,9 @@
     :show-btn="showBtn"
     :background-color="defBackgroundColor"
     :title="request.elementType">
-
+    <div style="height: 300px;width: 100%">
+      <ms-code-edit mode="xml" :data.sync="request.jmeterElement" theme="eclipse" ref="codeEdit"/>
+    </div>
   </api-base-component>
 </template>
 
@@ -56,6 +59,9 @@
       copyRow() {
         this.$emit('copyRow', this.jsr223Processor, this.node);
       },
+      active() {
+        this.request.active = !this.request.active;
+      },
     }
   }
 </script>
diff --git a/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
index bc87648903..fb6ce10dbb 100644
--- a/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
@@ -459,11 +459,11 @@
         } else {
           this.operatingElements = [];
         }
-        if (data && data.type != "JmeterElement") {
+        if (data) {
           data.active = true;
           if (data.hashTree) {
             data.hashTree.forEach(item => {
-              if (item && item.type != "JmeterElement") {
+              if (item) {
                 item.active = true;
               }
             })
@@ -915,7 +915,7 @@
       setProjectEnvMap(projectEnvMap) {
         this.projectEnvMap = projectEnvMap;
       },
-      refReload(data,node) {
+      refReload(data, node) {
         this.selectedTreeNode = data;
         this.selectedNode = node;
         this.initProjectIds();