From 7a9bb603e8609c820bc59ad059eef9b39ec2d69f Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 12 Mar 2021 10:56:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E5=BC=95=E7=94=A8=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E4=B8=8D=E8=83=BD=E7=A7=BB=E9=99=A4=E9=97=AE=E9=A2=98?=
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       | 4 ++--
 .../api/automation/scenario/component/ApiComponent.vue        | 2 +-
 .../automation/scenario/component/ApiScenarioComponent.vue    | 2 +-
 .../components/api/definition/components/list/ApiList.vue     | 2 +-
 frontend/src/business/components/xpack                        | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index d2fc4b4211..efd6af73b7 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit d2fc4b42117be97c679b4d15d6f979923e598f7f
+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 624aeef9b4..1090ac3b5b 100644
--- a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
@@ -31,10 +31,10 @@
         </el-tooltip>
         <slot name="button"></slot>
         <el-tooltip content="Copy" placement="top">
-          <el-button size="mini" icon="el-icon-copy-document" circle @click="copyRow" :disabled="data.referenced==='REF' || data.disabled"/>
+          <el-button size="mini" icon="el-icon-copy-document" circle @click="copyRow" :disabled="data && data.disabled"/>
         </el-tooltip>
         <el-tooltip :content="$t('commons.remove')" placement="top">
-          <el-button size="mini" icon="el-icon-delete" type="danger" circle @click="remove" :disabled="data.referenced==='REF' || data.disabled"/>
+          <el-button size="mini" icon="el-icon-delete" type="danger" circle @click="remove" :disabled="data && data.disabled"/>
         </el-tooltip>
       </div>
 
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 81103b6beb..9fdaf70c4a 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -216,7 +216,7 @@
               }
               this.request.requestResult = requestResult;
               this.request.id = response.data.id;
-              this.request.disabled = true;
+              //this.request.disabled = true;
               if (!this.request.projectId) {
                 this.request.projectId = response.data.projectId;
               }
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
index 932ad0f4f8..ef2d01367a 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
@@ -58,7 +58,7 @@
             if (this.scenario.hashTree) {
               this.setDisabled(this.scenario.hashTree);
             }
-            this.scenario.disabled = true;
+            //this.scenario.disabled = true;
             this.scenario.name = response.data.name;
             if (!this.scenario.projectId) {
               this.scenario.projectId = response.data.projectId;
diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue
index 80b323b0b6..3ae913db9d 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -325,7 +325,7 @@ export default {
       currentPage: 1,
       pageSize: 10,
       total: 0,
-      screenHeight: document.documentElement.clientHeight - 270,//屏幕高度,
+      screenHeight: document.documentElement.clientHeight - 310,//屏幕高度,
       environmentId: undefined,
       selectDataCounts: 0,
     }
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 17404980aa..4c33b9c3b1 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 17404980aab725889843ce8c65f5f5c00113ae21
+Subproject commit 4c33b9c3b12a83da6d9bd2740262c6c8baaab819