From 92e1411289433a09569e5afc4d55bc1b5445c936 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 24 Dec 2020 14:20:14 +0800
Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
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/api/ScenarioApiRelevance.vue        | 2 +-
 .../api/automation/scenario/api/ScenarioRelevance.vue           | 2 +-
 frontend/src/business/components/xpack                          | 2 +-
 4 files changed, 4 insertions(+), 4 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/api/automation/scenario/api/ScenarioApiRelevance.vue b/frontend/src/business/components/api/automation/scenario/api/ScenarioApiRelevance.vue
index c840464a00..1a0589942e 100644
--- a/frontend/src/business/components/api/automation/scenario/api/ScenarioApiRelevance.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ScenarioApiRelevance.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog class="api-relevance" :title="$t('test_track.plan_view.relevance_test_case')"
+  <el-dialog class="api-relevance" :title="'接口导入'"
              :visible.sync="dialogVisible"
              width="60%"
              :close-on-click-modal="false"
diff --git a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
index bbc912908f..c3026c7304 100644
--- a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog class="api-relevance" :title="$t('test_track.plan_view.relevance_test_case')"
+  <el-dialog class="api-relevance" :title="'场景导入'"
              :visible.sync="dialogVisible"
              width="60%"
              :close-on-click-modal="false"
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 8cda5c873c..010ad7a5f0 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 8cda5c873cd9985c97adb34efacf507167fa4182
+Subproject commit 010ad7a5f072a5e9d368c756a2473bbd20781433

From d35d7de2acef60fc1140fa26ad4b9fbb83b5d012 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 24 Dec 2020 15:06:30 +0800
Subject: [PATCH 2/7] =?UTF-8?q?refactor:=20=E5=9C=BA=E6=99=AF=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/EditApiScenario.vue   | 180 +++++++++---------
 1 file changed, 92 insertions(+), 88 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 4612e799fa..2ddcd0ff70 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -337,94 +337,6 @@
       buttons() {
         let buttons = [
           {
-            title: this.$t('api_test.automation.api_list_import'),
-            show: this.showButton("HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler"),
-            titleColor: "#F56C6C",
-            titleBgColor: "#FCF1F1",
-            icon: "api",
-            click: this.apiListImport
-          }, {
-            title: this.$t('api_test.automation.external_import'),
-            show: this.showButton("OT_IMPORT"),
-            titleColor: "#409EFF",
-            titleBgColor: "#EEF5FE",
-            icon: "next_plan",
-            click: () => {
-              this.addComponent('OT_IMPORT')
-            }
-          }, {
-            title: this.$t('api_test.automation.wait_controller'),
-            show: this.showButton("ConstantTimer"),
-            titleColor: "#67C23A",
-            titleBgColor: "#F2F9EE",
-            icon: "access_time",
-            click: () => {
-              this.addComponent('ConstantTimer')
-            }
-          }, {
-            title: this.$t('api_test.automation.if_controller'),
-            show: this.showButton("IfController"),
-            titleColor: "#E6A23C",
-            titleBgColor: "#FCF6EE",
-            icon: "alt_route",
-            click: () => {
-              this.addComponent('IfController')
-            }
-          }, {
-            title: this.$t('api_test.automation.scenario_import'),
-            show: this.operatingElements.indexOf('scenario') === 0,
-            titleColor: "#606266",
-            titleBgColor: "#F4F4F5",
-            icon: "movie",
-            click: () => {
-              this.addComponent('scenario')
-            }
-          }, {
-            title: this.$t('api_test.automation.customize_script'),
-            show: this.showButton("JSR223Processor"),
-            titleColor: "#7B4D12",
-            titleBgColor: "#F1EEE9",
-            icon: "code",
-            click: () => {
-              this.addComponent('JSR223Processor')
-            }
-          }, {
-            title: this.$t('api_test.automation.customize_req'),
-            show: this.showButton("CustomizeReq"),
-            titleColor: "#008080",
-            titleBgColor: "#EBF2F2",
-            icon: "tune",
-            click: () => {
-              this.addComponent('CustomizeReq')
-            }
-          }, {
-            title: this.$t('api_test.definition.request.pre_script'),
-            show: this.showButton("JSR223PreProcessor"),
-            titleColor: "#B8741A",
-            titleBgColor: "#F9F1EA",
-            icon: "skip_previous",
-            click: () => {
-              this.addComponent('JSR223PreProcessor')
-            }
-          }, {
-            title: this.$t('api_test.definition.request.post_script'),
-            show: this.showButton("JSR223PostProcessor"),
-            titleColor: "#783887",
-            titleBgColor: "#F2ECF3",
-            icon: "skip_next",
-            click: () => {
-              this.addComponent('JSR223PostProcessor')
-            }
-          }, {
-            title: this.$t('api_test.definition.request.assertions_rule'),
-            show: this.showButton("Assertions"),
-            titleColor: "#A30014",
-            titleBgColor: "#F7E6E9",
-            icon: "fact_check",
-            click: () => {
-              this.addComponent('Assertions')
-            }
-          }, {
             title: this.$t('api_test.definition.request.extract_param'),
             show: this.showButton("Extract"),
             titleColor: "#015478",
@@ -433,6 +345,94 @@
             click: () => {
               this.addComponent('Extract')
             }
+          },
+          {
+            title: this.$t('api_test.definition.request.post_script'),
+            show: this.showButton("JSR223PostProcessor"),
+            titleColor: "#783887",
+            titleBgColor: "#F2ECF3",
+            icon: "skip_next",
+            click: () => {
+              this.addComponent('JSR223PostProcessor')
+            }
+          },
+          {
+            title: this.$t('api_test.definition.request.pre_script'),
+            show: this.showButton("JSR223PreProcessor"),
+            titleColor: "#B8741A",
+            titleBgColor: "#F9F1EA",
+            icon: "skip_previous",
+            click: () => {
+              this.addComponent('JSR223PreProcessor')
+            }
+          },
+          {
+            title: this.$t('api_test.automation.customize_script'),
+            show: this.showButton("JSR223Processor"),
+            titleColor: "#7B4D12",
+            titleBgColor: "#F1EEE9",
+            icon: "code",
+            click: () => {
+              this.addComponent('JSR223Processor')
+            }
+          },
+          {
+            title: this.$t('api_test.automation.if_controller'),
+            show: this.showButton("IfController"),
+            titleColor: "#E6A23C",
+            titleBgColor: "#FCF6EE",
+            icon: "alt_route",
+            click: () => {
+              this.addComponent('IfController')
+            }
+          },
+          {
+            title: this.$t('api_test.automation.wait_controller'),
+            show: this.showButton("ConstantTimer"),
+            titleColor: "#67C23A",
+            titleBgColor: "#F2F9EE",
+            icon: "access_time",
+            click: () => {
+              this.addComponent('ConstantTimer')
+            }
+          },
+          // {
+          //   title: this.$t('api_test.automation.external_import'),
+          //   show: this.showButton("OT_IMPORT"),
+          //   titleColor: "#409EFF",
+          //   titleBgColor: "#EEF5FE",
+          //   icon: "next_plan",
+          //   click: () => {
+          //     this.addComponent('OT_IMPORT')
+          //   }
+          // },
+          {
+            title: this.$t('api_test.automation.customize_req'),
+            show: this.showButton("CustomizeReq"),
+            titleColor: "#008080",
+            titleBgColor: "#EBF2F2",
+            icon: "tune",
+            click: () => {
+              this.addComponent('CustomizeReq')
+            }
+          },
+          {
+            title: this.$t('api_test.automation.scenario_import'),
+            show: this.operatingElements.indexOf('scenario') === 0,
+            titleColor: "#606266",
+            titleBgColor: "#F4F4F5",
+            icon: "movie",
+            click: () => {
+              this.addComponent('scenario')
+            }
+          },
+          {
+            title: this.$t('api_test.automation.api_list_import'),
+            show: this.showButton("HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler"),
+            titleColor: "#F56C6C",
+            titleBgColor: "#FCF1F1",
+            icon: "api",
+            click: this.apiListImport
           }
         ];
         return buttons.filter(btn => btn.show);
@@ -981,4 +981,8 @@
     font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
     font-size: 13px;
   }
+
+  /deep/ .fab-item-title {
+    background-color: white !important;
+  }
 </style>

From d925e9cbac04d5acbfab2726da0a778020980783 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 24 Dec 2020 15:20:12 +0800
Subject: [PATCH 3/7] =?UTF-8?q?refactor:=20=E6=8C=89=E9=92=AE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/automation/scenario/EditApiScenario.vue    | 4 ----
 frontend/src/business/components/xpack                        | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 2ddcd0ff70..9afb060e2e 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -981,8 +981,4 @@
     font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
     font-size: 13px;
   }
-
-  /deep/ .fab-item-title {
-    background-color: white !important;
-  }
 </style>
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 8cda5c873c..010ad7a5f0 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 8cda5c873cd9985c97adb34efacf507167fa4182
+Subproject commit 010ad7a5f072a5e9d368c756a2473bbd20781433

From bc585eeca42e4e75365210c8a19a4f1ef0581d9c Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 24 Dec 2020 15:42:35 +0800
Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/components/api/definition/ApiDefinition.vue    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue
index 243f952bc0..84794df602 100644
--- a/frontend/src/business/components/api/definition/ApiDefinition.vue
+++ b/frontend/src/business/components/api/definition/ApiDefinition.vue
@@ -242,8 +242,12 @@
         this.showCasePage = true;
       },
       exportAPI() {
+        if (!this.isApiListEnable) {
+          this.$warning('用例列表暂不支持导出，请切换成接口列表');
+          return;
+        }
         let obj = {projectName: getCurrentProjectID(), protocol: this.currentProtocol}
-        if (this.$refs.apiList[0].selectRows && this.$refs.apiList[0].selectRows.length > 0) {
+        if (this.$refs.apiList[0].selectRows && this.$refs.apiList[0].selectRows.size > 0) {
           let arr = Array.from(this.$refs.apiList[0].selectRows);
           obj.data = arr;
           downloadFile("导出API.json", JSON.stringify(obj));

From 9bc45b83dd5e5d50442d46019534c7f2ee0d441e Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 24 Dec 2020 15:52:03 +0800
Subject: [PATCH 5/7] =?UTF-8?q?refactor:=20=E7=94=A8=E4=BE=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E8=B7=AF=E5=BE=84=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/definition/components/list/ApiCaseSimpleList.vue         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
index b7fb27e434..bd464773cf 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -48,6 +48,7 @@
         </el-table-column>
 
         <el-table-column
+          sortable="custom"
           prop="path"
           :label="$t('api_test.definition.api_path')"
           show-overflow-tooltip/>

From 42ab7247fb76a9837db729de07c80f1a0cabadd3 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 24 Dec 2020 15:53:42 +0800
Subject: [PATCH 6/7] chore: Sync

---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 9f4a9bbf46..79343a2763 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 9f4a9bbf46fc1333dbcccea21f83e27e3ec10b1f
+Subproject commit 79343a2763b014355f91fc21b2356a95ae437973

From 8d3f281453fdffa5e753ec545afb9115c670f024 Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Thu, 24 Dec 2020 16:01:36 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E9=A6=96=E9=A1=B57=E5=A4=A9?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=A1=88=E4=BE=8B=E3=80=81=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=88=90=E5=8A=9F=E5=A4=B1=E8=B4=A5=E6=AC=A1?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修首页7天失败案例未只统计测试计划的数据的问题、定时任务成功失败次数统计不对的问题
---
 .../base/mapper/ext/ExtApiDefinitionExecResultMapper.xml    | 6 +++---
 .../base/mapper/ext/ExtApiScenarioReportMapper.xml          | 1 +
 .../metersphere/base/mapper/ext/ExtApiTestReportMapper.xml  | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
index 0fa037c30c..82cdf50340 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
@@ -37,8 +37,8 @@
             SELECT testCase.testCaseName AS caseName,testCase.testPlanName AS testPlan ,caseErrorCountData.dataCountNumber AS failureTimes,'apiCase' AS caseType
             FROM (
             SELECT apiCase.id AS testCaseID,apiCase.`name` AS testCaseName,group_concat(testPlan.`name`)  AS testPlanName FROM api_test_case apiCase
-           LEFT JOIN test_plan_api_case testPlanCase ON testPlanCase.api_case_id = apiCase.id
-           LEFT JOIN test_plan testPlan ON testPlan.id = testPlanCase.test_plan_id
+           INNER JOIN test_plan_api_case testPlanCase ON testPlanCase.api_case_id = apiCase.id
+           INNER JOIN test_plan testPlan ON testPlan.id = testPlanCase.test_plan_id
             GROUP BY apiCase.id
             ORDER BY apiCase.create_time DESC
             )testCase
@@ -54,7 +54,7 @@
             FROM api_scenario_report report
                      INNER JOIN api_scenario_report_detail reportDetail ON report.id = reportDetail.report_id
                      INNER JOIN api_scenario scene ON report.scenario_id = scene.id
-                     LEFT JOIN
+                     INNER JOIN
                  (
                      SELECT
                          apiScene.api_scenario_id,
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
index 5ad0ad5a92..0048ae51c0 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
@@ -192,5 +192,6 @@
         SELECT acitem.`name`,acitem.id FROM api_scenario acitem INNER JOIN `schedule` sc ON acitem.id = sc.resource_id
         ) ac on ar.scenario_id = ac.id
         WHERE acr.project_id = #{projectId}
+        GROUP BY groupField;
     </select>
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestReportMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestReportMapper.xml
index 536eb80268..fec8a3e2c8 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestReportMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestReportMapper.xml
@@ -160,6 +160,7 @@
         WHERE sch.resource_id IN (
             SELECT id FROM api_test WHERE project_id = #{projectId,jdbcType=VARCHAR}
         )
+        GROUP BY groupField;
     </select>
 
     <select id="countByProjectIDAndCreateInThisWeek" resultType="java.lang.Long">