From d430e509dcede5c138ffc38bd278f4d1a271801e Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 24 Dec 2020 12:59:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refacotr:=20=E5=9C=BA=E6=99=AF=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/EditApiScenario.vue   |  17 +--
 .../scenario/api/ScenarioApiRelevance.vue     |  33 -----
 .../scenario/api/ScenarioRelevance.vue        | 138 ++++++++++++++++++
 3 files changed, 145 insertions(+), 43 deletions(-)
 create mode 100644 frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 564b195bff..1331ad4ea3 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -208,9 +208,7 @@
         <ms-api-customize :request="customizeRequest" @addCustomizeApi="addCustomizeApi"/>
       </el-drawer>
       <!--场景导入 -->
-      <el-drawer :visible.sync="scenarioVisible" :destroy-on-close="true" direction="ltr" :withHeader="false" :title="$t('api_test.automation.scenario_import')" style="overflow: auto" :modal="false" size="90%">
-        <ms-import-api-scenario @addScenario="addScenario"/>
-      </el-drawer>
+      <scenario-relevance @save="addScenario" ref="scenarioRelevance"/>
 
       <!-- 环境 -->
       <api-environment-config ref="environmentConfig" @close="environmentConfigClose"/>
@@ -241,7 +239,6 @@
   import MsIfController from "./IfController";
   import MsApiAssertions from "../../definition/components/assertion/ApiAssertions";
   import MsApiExtract from "../../definition/components/extract/ApiExtract";
-  import MsApiDefinition from "./api/ApiDefinition";
   import MsApiComponent from "./ApiComponent";
   import {ELEMENTS, ELEMENT_TYPE} from "./Setting";
   import MsApiCustomize from "./ApiCustomize";
@@ -257,6 +254,7 @@
   import InputTag from 'vue-input-tag'
   import "@/common/css/material-icons.css"
   import ScenarioApiRelevance from "./api/ScenarioApiRelevance";
+  import ScenarioRelevance from "./api/ScenarioRelevance";
 
   export default {
     name: "EditApiScenario",
@@ -265,13 +263,13 @@
       currentScenario: {},
     },
     components: {
+      ScenarioRelevance,
       ScenarioApiRelevance,
       ApiEnvironmentConfig,
       MsScenarioParameters,
       MsApiReportDetail,
       MsInputTag, MsRun,
       MsApiScenarioComponent,
-      MsImportApiScenario,
       MsJsr233Processor,
       MsConstantTimer,
       MsIfController,
@@ -488,7 +486,8 @@
             this.customizeVisible = true;
             break;
           case ELEMENT_TYPE.scenario:
-            this.scenarioVisible = true;
+            // this.scenarioVisible = true;
+            this.$refs.scenarioRelevance.open();
             break;
           default:
             this.$refs.apiImport.open();
@@ -546,8 +545,7 @@
         this.customizeRequest = {};
         this.sort();
         this.reload();
-      }
-      ,
+      },
       addScenario(arr) {
         if (arr && arr.length > 0) {
           arr.forEach(item => {
@@ -562,8 +560,7 @@
         this.sort();
         this.reload();
         this.scenarioVisible = false;
-      }
-      ,
+      },
       setApiParameter(item, refType, referenced) {
         let request = {};
         if (Object.prototype.toString.call(item.request).indexOf("String") > 0) {
diff --git a/frontend/src/business/components/api/automation/scenario/api/ScenarioApiRelevance.vue b/frontend/src/business/components/api/automation/scenario/api/ScenarioApiRelevance.vue
index 185fc3df58..c840464a00 100644
--- a/frontend/src/business/components/api/automation/scenario/api/ScenarioApiRelevance.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ScenarioApiRelevance.vue
@@ -108,38 +108,6 @@
         setModuleOptions(data) {
           this.moduleOptions = data;
         },
-
-        saveCaseRelevance() {
-
-          let param = {};
-          let url = '';
-          let environmentId = undefined;
-          let selectIds = [];
-          if (this.isApiListEnable) {
-            url = '/api/definition/relevance';
-            environmentId = this.$refs.apiList.environmentId;
-            selectIds = Array.from(this.$refs.apiList.selectRows).map(row => row.id);
-          } else {
-            url = '/api/testcase/relevance';
-            environmentId = this.$refs.apiCaseList.environmentId;
-            selectIds = Array.from(this.$refs.apiCaseList.selectRows).map(row => row.id);
-          }
-
-          if (!environmentId) {
-            this.$warning(this.$t('api_test.environment.select_environment'));
-            return;
-          }
-          param.planId = this.planId;
-          param.selectIds = selectIds;
-          param.environmentId = environmentId;
-          this.result = this.$post(url, param, () => {
-            this.$success(this.$t('commons.save_success'));
-            this.$emit('refresh');
-            this.refresh();
-            this.$refs.baseRelevance.close();
-          });
-        },
-
         refresh() {
           if (this.isApiListEnable) {
             this.$refs.apiList.initTable();
@@ -147,7 +115,6 @@
             this.$refs.apiCaseList.initTable();
           }
         },
-
       }
     }
 </script>
diff --git a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
new file mode 100644
index 0000000000..bbc912908f
--- /dev/null
+++ b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
@@ -0,0 +1,138 @@
+<template>
+  <el-dialog class="api-relevance" :title="$t('test_track.plan_view.relevance_test_case')"
+             :visible.sync="dialogVisible"
+             width="60%"
+             :close-on-click-modal="false"
+             top="50px">
+
+    <ms-container>
+      <ms-aside-container :enable-aside-hidden="false">
+        <ms-api-scenario-module
+          @nodeSelectEvent="nodeChange"
+          @refreshTable="refresh"
+          @setModuleOptions="setModuleOptions"
+          @enableTrash="false"
+          :is-read-only="true"
+          ref="nodeTree"/>
+      </ms-aside-container>
+
+      <ms-main-container>
+        <ms-api-scenario-list
+          :select-node-ids="selectNodeIds"
+          :referenced="true"
+          :trash-enable="false"
+          @selection="setData"
+          ref="apiScenarioList"/>
+      </ms-main-container>
+    </ms-container>
+
+    <template v-slot:footer>
+      <el-button type="primary" @click="copy" @keydown.enter.native.prevent>复制</el-button>
+      <el-button type="primary" @click="reference" @keydown.enter.native.prevent>引用</el-button>
+    </template>
+
+  </el-dialog>
+</template>
+
+<script>
+    import ScenarioRelevanceCaseList from "./ScenarioRelevanceCaseList";
+    import MsApiModule from "../../../definition/components/module/ApiModule";
+    import MsContainer from "../../../../common/components/MsContainer";
+    import MsAsideContainer from "../../../../common/components/MsAsideContainer";
+    import MsMainContainer from "../../../../common/components/MsMainContainer";
+    import ScenarioRelevanceApiList from "./ScenarioRelevanceApiList";
+    import MsApiScenarioModule from "../ApiScenarioModule";
+    import MsApiScenarioList from "../ApiScenarioList";
+    import {getUUID} from "../../../../../../common/js/utils";
+    export default {
+      name: "ScenarioRelevance",
+      components: {
+        MsApiScenarioList,
+        MsApiScenarioModule,
+        MsMainContainer, MsAsideContainer, MsContainer},
+      data() {
+          return {
+            dialogVisible: false,
+            result: {},
+            currentProtocol: null,
+            selectNodeIds: [],
+            moduleOptions: {},
+            isApiListEnable: true,
+
+            currentScenario: [],
+            currentScenarioIds: [],
+          }
+      },
+      methods: {
+        reference() {
+          let scenarios = [];
+          if (!this.currentScenario || this.currentScenario.length < 1) {
+            this.$emit('请选择场景');
+            return;
+          }
+          this.currentScenario.forEach(item => {
+            let obj = {id: item.id, name: item.name, type: "scenario", referenced: 'REF', resourceId: getUUID()};
+            scenarios.push(obj);
+          });
+          this.$emit('save', scenarios);
+          this.close();
+        },
+        copy() {
+          let scenarios = [];
+          if (!this.currentScenarioIds || this.currentScenarioIds.length < 1) {
+            this.$emit('请选择场景');
+            return;
+          }
+          this.result = this.$post("/api/automation/getApiScenarios/", this.currentScenarioIds, response => {
+            if (response.data) {
+              response.data.forEach(item => {
+                let scenarioDefinition = JSON.parse(item.scenarioDefinition);
+                let obj = {id: item.id, name: item.name, type: "scenario", referenced: 'Copy', resourceId: getUUID(), hashTree: scenarioDefinition.hashTree};
+                scenarios.push(obj);
+              });
+              this.$emit('save', scenarios);
+              this.close();
+            }
+          })
+        },
+        close() {
+          this.refresh();
+          this.dialogVisible = false;
+        },
+        open() {
+          this.dialogVisible = true;
+          if (this.$refs.apiScenarioList) {
+            this.$refs.apiScenarioList.search();
+          }
+        },
+        nodeChange(node, nodeIds, pNodes) {
+          this.selectNodeIds = nodeIds;
+        },
+        handleProtocolChange(protocol) {
+          this.currentProtocol = protocol;
+        },
+        setModuleOptions(data) {
+          this.moduleOptions = data;
+        },
+        refresh() {
+            this.$refs.apiScenarioList.search();
+        },
+        setData(data) {
+          this.currentScenario = Array.from(data).map(row => row);
+          this.currentScenarioIds = Array.from(data).map(row => row.id);
+        },
+      }
+    }
+</script>
+
+<style scoped>
+
+  .ms-aside-container {
+    border: 0px;
+  }
+
+  .api-relevance >>> .el-dialog__body {
+    padding: 10px 20px;
+  }
+
+</style>

From 24b30a73fa82e99abdfcb5409b2e60f1a78ea51f Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 24 Dec 2020 13:14:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E5=8E=BB=E6=8E=89=E6=97=A7?=
 =?UTF-8?q?=E7=89=88=E6=9F=A5=E7=9C=8B=E6=8A=A5=E5=91=8A=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 .../functional/FunctionalTestCaseList.vue     | 22 +------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 79343a2763..9f4a9bbf46 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 79343a2763b014355f91fc21b2356a95ae437973
+Subproject commit 9f4a9bbf46fc1333dbcccea21f83e27e3ec10b1f
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
index eb6946fa2b..5a85256d02 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
@@ -15,10 +15,6 @@
             <ms-table-button :is-tester-permission="true" icon="el-icon-connection"
                              :content="$t('test_track.plan_view.relevance_test_case')"
                              @click="$emit('openTestCaseRelevanceDialog')"/>
-            <ms-table-button :is-tester-permission="true" v-if="!testPlan.reportId" icon="el-icon-document"
-                             :content="$t('test_track.plan_view.create_report')" @click="openTestReport"/>
-            <ms-table-button :is-tester-permission="true" v-if="testPlan.reportId" icon="el-icon-document"
-                             :content="$t('test_track.plan_view.view_report')" @click="openReport"/>
             <ms-table-button :is-tester-permission="true" icon="el-icon-document-remove"
                              :content="$t('test_track.plan_view.cancel_all_relevance')" @click="handleDeleteBatch"/>
           </template>
@@ -204,8 +200,6 @@
         :is-read-only="isReadOnly"
         @refreshTable="search"/>
 
-      <test-report-template-list @openReport="openReport" ref="testReportTemplateList"/>
-      <test-case-report-view @refresh="initTableData" ref="testCaseReportView"/>
     </el-card>
     <batch-edit ref="batchEdit" @batchEdit="batchEdit"
                 :type-arr="typeArr" :value-arr="valueArr" :dialog-title="$t('test_track.case.batch_edit_case')"/>
@@ -242,8 +236,6 @@ export default {
   name: "FunctionalTestCaseList",
   components: {
     FunctionalTestCaseEdit,
-    TestCaseReportView,
-    TestReportTemplateList,
     MsTableOperatorButton,
     MsTableOperator,
     MethodTableItem,
@@ -522,9 +514,6 @@ export default {
       }
       this.initTableData();
     },
-    openTestReport() {
-      this.$refs.testReportTemplateList.open(this.planId);
-    },
     statusChange(param) {
       this.$post('/test/plan/case/edit', param, () => {
         for (let i = 0; i < this.tableData.length; i++) {
@@ -543,16 +532,7 @@ export default {
         });
       }
     },
-    openReport(planId, id) {
-      this.getTestPlanById();
-      if (!id) {
-        id = this.testPlan.reportId;
-      }
-      if (!planId) {
-        planId = this.planId;
-      }
-      this.$refs.testCaseReportView.open(planId, id);
-    },
+
     filter(filters) {
       _filter(filters, this.condition);
       this.initTableData();