From 884fc213dd8d4b9178641f7ae5e6e37397fc6b60 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 15 Dec 2020 20:42:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ext/ExtApiScenarioModuleMapper.xml |  2 +-
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 .../api/automation/ApiAutomation.vue          |  2 -
 .../automation/scenario/AddBasisScenario.vue  |  4 +-
 .../automation/scenario/ApiScenarioModule.vue | 37 ++++---------------
 .../components/basis/AddBasisApi.vue          |  1 -
 frontend/src/business/components/xpack        |  2 +-
 7 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioModuleMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioModuleMapper.xml
index b679667954..706c83381a 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioModuleMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioModuleMapper.xml
@@ -5,7 +5,7 @@
         select
         <include refid="io.metersphere.base.mapper.ApiScenarioModuleMapper.Base_Column_List"/>
         from api_scenario_module
-        where api_module.project_id = #{projectId}
+        where api_scenario_module.project_id = #{projectId}
         order by create_time asc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 61397c1672..bb494fc68a 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 61397c16728a63493507679f7e0940d9099f337f
+Subproject commit bb494fc68a2367359c9048fa7250c7618de4afb6
diff --git a/frontend/src/business/components/api/automation/ApiAutomation.vue b/frontend/src/business/components/api/automation/ApiAutomation.vue
index ca28773e09..fa812a1468 100644
--- a/frontend/src/business/components/api/automation/ApiAutomation.vue
+++ b/frontend/src/business/components/api/automation/ApiAutomation.vue
@@ -1,8 +1,6 @@
 <template>
   <ms-container>
     <ms-aside-container>
-      <!--<ms-api-scenario-module @selectModule="selectModule" @getApiModuleTree="initTree"-->
-                              <!--@refresh="refresh" @saveAsEdit="editScenario"/>-->
     <ms-api-scenario-module
       @nodeSelectEvent="nodeChange"
       @refreshTable="refresh"
diff --git a/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue b/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue
index 8ef356a85e..a64b89b5bb 100644
--- a/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue
@@ -95,9 +95,9 @@
               this.visible = false;
               if (saveAs) {
                 this.scenarioForm.request = JSON.stringify(this.scenarioForm.request);
-                this.$parent.saveAsEdit(this.scenarioForm);
+                this.$emit('saveAsEdit', this.httpForm);
               } else {
-                this.$parent.refresh(this.currentModule);
+                this.$emit('refresh');
               }
             });
           } else {
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
index 04e99426e2..dd5be5fb18 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
@@ -24,7 +24,10 @@
 
     </ms-node-tree>
 
-    <ms-add-basis-scenario ref="basisScenario"/>
+    <ms-add-basis-scenario
+      @saveAsEdit="saveAsEdit"
+      @refresh="refresh"
+      ref="basisScenario"/>
   </div>
 
 </template>
@@ -65,6 +68,9 @@
       'condition.filterText'(val) {
         this.$refs.nodeTree.filter(val);
       },
+      'condition.trashEnable'() {
+        this.$emit('enableTrash', this.condition.trashEnable);
+      },
     },
     methods: {
 
@@ -145,36 +151,7 @@
       },
       enableTrash() {
         this.condition.trashEnable = true;
-        this.$emit('enableTrash', this.condition.trashEnable);
       }
-
-      // refresh(data) {
-      //   this.$emit('refresh', data);
-      // },
-      // saveAsEdit(data) {
-      //   this.$emit('saveAsEdit', data);
-      // },
-      // filterNode(value, data) {
-      //   if (!value) return true;
-      //   return data.name.indexOf(value) !== -1;
-      // },
-      // addScenario() {
-      //   this.$refs.basisScenario.open(this.currentModule);
-      // },
-      // nodeExpand(data) {
-      //   if (data.id) {
-      //     this.expandedNode.push(data.id);
-      //   }
-      // },
-      // nodeCollapse(data) {
-      //   if (data.id) {
-      //     this.expandedNode.splice(this.expandedNode.indexOf(data.id), 1);
-      //   }
-      // },
-      // changeProtocol() {
-      //   this.getApiModuleTree();
-      //   this.$emit('changeProtocol', this.protocol);
-      // }
     }
   }
 </script>
diff --git a/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue b/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue
index e7e6e6d7fd..c276cbcecd 100644
--- a/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue
+++ b/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue
@@ -61,7 +61,6 @@
   import {REQ_METHOD} from "../../model/JsonData";
   import {getCurrentProjectID, getCurrentUser, getUUID} from "../../../../../../common/js/utils";
   import {createComponent, Request} from "../jmeter/components";
-  import HeaderManager from "../jmeter/components/configurations/header-manager";
 
   export default {
     name: "MsAddBasisApi",
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index aaeb324621..a22a3005d9 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit aaeb324621dc3197c1bcbd3920600c0963fdea08
+Subproject commit a22a3005d9bd254793fcf634d72539cbdf31be3a