From 682bfae7c55569274bac67f5b076f1fdee1d3b4c Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 9 Feb 2022 18:34:28 +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=E5=BC=95=E7=94=A8=E7=94=A8=E4=BE=8B=E6=9C=AA?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1010149 --user=赵勇 【接口测试】接口自动化引用的接口用例，更新后显示还是原来的参数 https://www.tapd.cn/55049933/s/1102477
---
 .../io/metersphere/api/service/MsHashTreeService.java  | 10 ++++++++++
 .../api/automation/scenario/component/ApiComponent.vue |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/api/service/MsHashTreeService.java b/backend/src/main/java/io/metersphere/api/service/MsHashTreeService.java
index e144c0eef2..ab723b4129 100644
--- a/backend/src/main/java/io/metersphere/api/service/MsHashTreeService.java
+++ b/backend/src/main/java/io/metersphere/api/service/MsHashTreeService.java
@@ -52,6 +52,11 @@ public class MsHashTreeService {
     private static final String VERSION_NAME = "versionName";
     private static final String VERSION_ENABLE = "versionEnable";
     private static final String URL = "url";
+    private static final String HEADERS = "headers";
+    private static final String REST = "rest";
+    private static final String BODY = "body";
+    private static final String ARGUMENTS = "arguments";
+    private static final String AUTH_MANAGER = "authManager";
 
     public void setHashTree(JSONArray hashTree) {
         // 将引用转成复制
@@ -177,6 +182,11 @@ public class MsHashTreeService {
                     ElementUtil.dataFormatting(refElement);
                     JSONArray array = refElement.getJSONArray(HASH_TREE);
                     BeanUtils.copyBean(element, refElement);
+                    element.put(HEADERS, refElement.get(HEADERS));
+                    element.put(REST, refElement.get(REST));
+                    element.put(BODY, refElement.get(BODY));
+                    element.put(AUTH_MANAGER, refElement.get(AUTH_MANAGER));
+                    element.put(ARGUMENTS, refElement.get(ARGUMENTS));
                     if (array != null) {
                         ElementUtil.mergeHashTree(element, refElement.getJSONArray(HASH_TREE));
                     }
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 1b62b19761..a6d5063317 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -251,6 +251,9 @@ export default {
     if (this.request.num) {
       this.isShowNum = true;
       this.request.root = true;
+      if (this.request.id && this.request.referenced === 'REF') {
+        this.request.disabled = true;
+      }
       this.getWorkspaceId(this.request.projectId);
     } else {
       this.isShowNum = false;