From a14582f9f98c2087138b8f7a00895d1de06e1b3b Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 1 Apr 2022 11:15:08 +0800
Subject: [PATCH] =?UTF-8?q?feat(UI=E6=B5=8B=E8=AF=95):=20UI=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E5=88=86=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/automation/report/ApiReportDetail.vue   | 7 +++++--
 .../api/automation/report/ApiReportViewHeader.vue          | 4 ++--
 .../api/automation/report/components/MetricChart.vue       | 2 +-
 .../api/automation/report/components/ScenarioResults.vue   | 2 +-
 .../business/components/api/automation/scenario/Setting.js | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/frontend/src/business/components/api/automation/report/ApiReportDetail.vue b/frontend/src/business/components/api/automation/report/ApiReportDetail.vue
index 744c38d90f..7a148359ec 100644
--- a/frontend/src/business/components/api/automation/report/ApiReportDetail.vue
+++ b/frontend/src/business/components/api/automation/report/ApiReportDetail.vue
@@ -482,14 +482,14 @@ export default {
     },
     handleExport() {
       if (this.report.reportVersion && this.report.reportVersion > 1) {
-        if (this.report.reportType === 'API_INTEGRATED') {
+        if (this.report.reportType === 'API_INTEGRATED' || this.report.reportType === 'UI_INTEGRATED') {
           let scenario = {name: "", requestResults: []};
           this.content.scenarios = [scenario];
           this.formatExportApi(this.fullTreeNodes, scenario);
         } else {
           if (this.fullTreeNodes) {
             this.fullTreeNodes.forEach(item => {
-              if (item.type === "scenario") {
+              if (item.type === "scenario" || item.type === "UiScenario") {
                 let scenario = {name: item.label, requestResults: []};
                 if (this.content.scenarios && this.content.scenarios.length > 0) {
                   this.content.scenarios.push(scenario);
@@ -544,6 +544,9 @@ export default {
     projectId() {
       return getCurrentProjectID();
     },
+    isUi() {
+      return this.report.reportType.startsWith("UI");
+    },
   }
 }
 </script>
diff --git a/frontend/src/business/components/api/automation/report/ApiReportViewHeader.vue b/frontend/src/business/components/api/automation/report/ApiReportViewHeader.vue
index 638860ac15..69bb32e764 100644
--- a/frontend/src/business/components/api/automation/report/ApiReportViewHeader.vue
+++ b/frontend/src/business/components/api/automation/report/ApiReportViewHeader.vue
@@ -25,7 +25,7 @@
         </el-button>
 
         <el-popover
-          v-if="!isPlan && (!debug || exportFlag) && !isTemplate && !isUi"
+          v-if="!isPlan && (!debug || exportFlag) && !isTemplate"
           v-permission="['PROJECT_PERFORMANCE_REPORT:READ+EXPORT']"
           style="margin-right: 10px;float: right;"
           placement="bottom"
@@ -95,7 +95,7 @@ export default {
       }
     },
     isUi() {
-      return this.$route && this.$route.meta && this.$route.meta.isUi;
+      return this.report.reportType.startsWith("UI");
     },
   },
   data() {
diff --git a/frontend/src/business/components/api/automation/report/components/MetricChart.vue b/frontend/src/business/components/api/automation/report/components/MetricChart.vue
index 5daaf6a07b..1a0e026f50 100644
--- a/frontend/src/business/components/api/automation/report/components/MetricChart.vue
+++ b/frontend/src/business/components/api/automation/report/components/MetricChart.vue
@@ -273,7 +273,7 @@ export default {
       return this.content.errorCode + " / " + this.content.totalAssertions;
     },
     isUi() {
-      return this.$route && this.$route.meta && this.$route.meta.isUi;
+      return this.report.reportType.startsWith("UI");
     },
   },
 }
diff --git a/frontend/src/business/components/api/automation/report/components/ScenarioResults.vue b/frontend/src/business/components/api/automation/report/components/ScenarioResults.vue
index 4a60b45d5b..0481d185c3 100644
--- a/frontend/src/business/components/api/automation/report/components/ScenarioResults.vue
+++ b/frontend/src/business/components/api/automation/report/components/ScenarioResults.vue
@@ -50,7 +50,7 @@ export default {
   },
   computed: {
     isUi() {
-      return this.$route && this.$route.meta && this.$route.meta.isUi;
+      return this.report.reportType.startsWith("UI");
     },
   },
   methods: {
diff --git a/frontend/src/business/components/api/automation/scenario/Setting.js b/frontend/src/business/components/api/automation/scenario/Setting.js
index 2e0fdc592e..1d24a7c690 100644
--- a/frontend/src/business/components/api/automation/scenario/Setting.js
+++ b/frontend/src/business/components/api/automation/scenario/Setting.js
@@ -23,7 +23,7 @@ export function STEP() {
         ['CustomizeReq', getDefaultSamplerMenu()],
         ['MaxSamplerProxy', getDefaultSamplerMenu()],
         ['GenericController', getAll()],
-        ['AllSamplerProxy', ['HTTPSamplerProxy', 'DubboSampler', 'JDBCSampler', 'TCPSampler', 'Sampler', 'AbstractSampler', 'JSR223Processor', 'API']],
+        ['AllSamplerProxy', ['HTTPSamplerProxy', 'DubboSampler', 'JDBCSampler', 'TCPSampler', 'Sampler', 'AbstractSampler', 'JSR223Processor', 'API', 'MsUiCommand']],
         ['DEFINITION', ['HTTPSamplerProxy', 'DubboSampler', 'JDBCSampler', 'TCPSampler']],
         ['ALlSamplerStep', ['JSR223PreProcessor', 'JSR223PostProcessor', 'JDBCPreProcessor', 'JDBCPostProcessor', 'Assertions', 'Extract', 'ConstantTimer']],
         ['AllCanExecType', ['HTTPSamplerProxy', 'DubboSampler', 'JDBCSampler', 'TCPSampler', 'JSR223Processor', 'AbstractSampler']]]);