From 26c9e03fd38483e1f6e12c0a4d998c73251c746f Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Wed, 16 Jun 2021 18:07:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E5=9C=BA=E6=99=AF=E6=97=A0=E6=B3=95=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复引用的场景无法复制的问题
---
 .../request/sampler/MsTCPSampler.java         |  5 ++++-
 .../scenario/component/ApiComponent.vue       | 19 +++++++++++++++++++
 .../scenario/component/Jsr233Processor.vue    | 14 +++++++-------
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java
index ef2dd15470..d63f3cc4ba 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java
@@ -242,7 +242,10 @@ public class MsTCPSampler extends MsTestElement {
                     value = this.formatMockValue(value);
                     if(StringUtils.isNotEmpty(this.getConnectEncoding())){
                         if(StringUtils.equalsIgnoreCase("utf-8",this.getConnectEncoding())){
-                            value = new String(value.getBytes(),StandardCharsets.UTF_8);
+                            try {
+                                value = new String(value.getBytes(),StandardCharsets.UTF_8);
+                            }catch (Exception e){
+                            }
                         }else if(StringUtils.equalsIgnoreCase("gbk",this.getConnectEncoding())){
                             try {
                                 value = new String(value.getBytes(),"GBK");
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
index 5b89ab2aca..dbc03a050c 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -31,25 +31,33 @@
       <template v-slot:request>
         <customize-req-info :is-customize-req="isCustomizeReq" :request="request"/>
         <p class="tip">{{ $t('api_test.definition.request.req_param') }} </p>
+        <legend style="width: 100%">
+
         <ms-api-request-form v-if="request.protocol==='HTTP' || request.type==='HTTPSamplerProxy'"
                              :isShowEnable="true"
                              :referenced="true"
                              :headers="request.headers "
+                             :is-read-only="isCompReadOnly"
                              :request="request"/>
         <esb-definition v-if="showXpackCompnent&&request.esbDataStruct!=null"
                         v-xpack
                         :request="request"
                         :showScript="false"
+                        :is-read-only="this.isCompReadOnly"
                         ref="esbDefinition"/>
         <ms-tcp-basis-parameters v-if="(request.protocol==='TCP'|| request.type==='TCPSampler')&& request.esbDataStruct==null "
                                  :request="request"
+                                 :is-read-only="isCompReadOnly"
                                  :showScript="false"/>
         <ms-sql-basis-parameters v-if="request.protocol==='SQL'|| request.type==='JDBCSampler'"
                                  :request="request"
+                                 :is-read-only="isCompReadOnly"
                                  :showScript="false"/>
         <ms-dubbo-basis-parameters v-if="request.protocol==='DUBBO' || request.protocol==='dubbo://'|| request.type==='DubboSampler'"
                                    :request="request"
+                                   :is-read-only="isCompReadOnly"
                                    :showScript="false"/>
+        </legend>
       </template>
       <!-- 执行结果内容 -->
       <template v-slot:result>
@@ -192,6 +200,17 @@ export default {
       }
       return {};
     },
+    isCompReadOnly(){
+      if(this.request){
+        if(this.request.disabled){
+          return this.request.disabled;
+        }else {
+          return false;
+        }
+      }else {
+        return false;
+      }
+    },
     displayTitle() {
       if (this.isApiImport) {
         return this.$t('api_test.automation.api_list_import');
diff --git a/frontend/src/business/components/api/automation/scenario/component/Jsr233Processor.vue b/frontend/src/business/components/api/automation/scenario/component/Jsr233Processor.vue
index d5dad36dfd..3b42672829 100644
--- a/frontend/src/business/components/api/automation/scenario/component/Jsr233Processor.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/Jsr233Processor.vue
@@ -10,13 +10,13 @@
     :show-btn="showBtn"
     :background-color="backgroundColor"
     :title="title" v-loading="loading">
-
-    <jsr233-processor-content
-      :jsr223-processor="jsr223Processor"
-      :is-pre-processor="isPreProcessor"
-      :node="node"
-      :is-read-only="isReadOnly"/>
-
+    <legend style="width: 100%">
+      <jsr233-processor-content
+        :jsr223-processor="jsr223Processor"
+        :is-pre-processor="isPreProcessor"
+        :node="node"
+        :is-read-only="this.jsr223Processor.disabled"/>
+      </legend>
   </api-base-component>
 </template>