From 18f3b2b082ac095b14735ecacf7b17e0a84b1fcb Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 21 Oct 2021 18:51:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=20(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8Dsql=E7=B1=BB=E5=9E=8B=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=8F=AA=E6=98=BE=E7=A4=BA=E4=B8=80=E4=B8=AA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20--bug=3D1007307=20--user=3D=E8=B5=B5=E5=8B=87=20?=
 =?UTF-8?q?=E3=80=90=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=E3=80=91-?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91SQL=E6=8E=A5=E5=8F=A3-test-=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=A4=9A=E6=9D=A1SQL=E8=AF=AD=E5=8F=A5=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=E4=BB=85=E6=89=A7=E8=A1=8C=E4=B8=80?=
 =?UTF-8?q?=E6=9D=A1=20https://www.tapd.cn/55049933/s/1057511?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/TestResultService.java        |   4 -
 .../components/response/SqlResultTable.vue    | 143 ++++++++----------
 2 files changed, 62 insertions(+), 85 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/TestResultService.java b/backend/src/main/java/io/metersphere/api/service/TestResultService.java
index da9992790c..fb4911b721 100644
--- a/backend/src/main/java/io/metersphere/api/service/TestResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/TestResultService.java
@@ -55,7 +55,6 @@ public class TestResultService {
         try {
             ApiTestReport report = null;
             ApiTestReportVariable reportTask = null;
-            String reportUrl = null;
             String planScenarioId = null;
             // 这部分后续优化只留 DEFINITION 和 SCENARIO 两部分
             if (StringUtils.equals(runMode, ApiRunMode.DEBUG.name())) {
@@ -129,9 +128,6 @@ public class TestResultService {
                         reportTask.setExecutionEnvironment(name);
                         SystemParameterService systemParameterService = CommonBeanFactory.getBean(SystemParameterService.class);
                         assert systemParameterService != null;
-                        BaseSystemConfigDTO baseSystemConfigDTO = systemParameterService.getBaseInfo();
-                        reportUrl = baseSystemConfigDTO.getUrl() + "/#/api/automation/report";
-
                     }
                     testResult.setTestId(scenarioReport.getScenarioId());
                     planScenarioId = scenarioReport.getTestPlanScenarioId();
diff --git a/frontend/src/business/components/api/definition/components/response/SqlResultTable.vue b/frontend/src/business/components/api/definition/components/response/SqlResultTable.vue
index baf93f46c4..7a1f060a2e 100644
--- a/frontend/src/business/components/api/definition/components/response/SqlResultTable.vue
+++ b/frontend/src/business/components/api/definition/components/response/SqlResultTable.vue
@@ -24,102 +24,83 @@
 </template>
 
 <script>
-  export default {
-    name: "MsSqlResultTable",
-    data() {
-      return {
-        tables: [],
-        titles: []
-      }
-    },
-    props: {
-      body: String
-    },
-    created() {
-      if (!this.body) {
-        return;
-      }
-      let rowArry = this.body.split("\n");
-      // 过多会有性能问题
-      if (rowArry.length > 100) {
-        rowArry = rowArry.slice(0, 100);
-      }
-      this.getTableData(rowArry);
-      if (this.tables.length > 1) {
-        for (let i = 0; i < this.tables.length; i++) {
-          if (this.tables[i].titles.length === 1 && i < this.tables.length - 1) {
-            this.tables[i].tableData.splice(this.tables[i].tableData.length - 1, 1);
-          }
-        }
-
-        let lastTable = this.tables[this.tables.length - 1];
-        if (lastTable.titles.length === 1) {
-          if (lastTable.tableData.length > 4) {
-            lastTable.tableData.splice(lastTable.tableData.length - 4, 4);
-          } else {
-            this.tables.splice(this.tables.length - 1, 1);
-          }
+export default {
+  name: "MsSqlResultTable",
+  data() {
+    return {
+      tables: [],
+      titles: []
+    }
+  },
+  props: {
+    body: String
+  },
+  created() {
+    if (!this.body) {
+      return;
+    }
+    let rowArray = this.body.split("\n");
+    // 过多会有性能问题
+    if (rowArray.length > 100) {
+      rowArray = rowArray.slice(0, 100);
+    }
+    this.getTableData(rowArray);
+  },
+  methods: {
+    getTableData(rowArray) {
+      let titles;
+      let result = [];
+      for (let i = 0; i < rowArray.length; i++) {
+        let colArray = rowArray[i].split("\t");
+        if (i === 0) {
+          titles = colArray;
         } else {
-          this.tables.splice(this.tables.length - 1, 1);
-        }
-      } else {
-        let table = this.tables[0];
-        table.tableData.splice(table.tableData.length - 4, 4);
-      }
-    },
-    methods: {
-      getTableData(rowArry) {
-        let titles;
-        let result = [];
-        for (let i = 0; i < rowArry.length; i++) {
-          let colArray = rowArry[i].split("\t");
-          if (i === 0) {
-            titles = colArray;
-          } else {
-            if (colArray.length != titles.length) {
-              // 创建新的表
-              if (colArray.length === 1 && colArray[0] === '') {
-                this.getTableData(rowArry.slice(i + 1));
-              } else {
-                this.getTableData(rowArry.slice(i));
-              }
-              break;
+          if (colArray.length != titles.length) {
+            // 创建新的表
+            if (colArray.length === 1 && colArray[0] === '') {
+              this.getTableData(rowArray.slice(i + 1));
             } else {
-              let item = {};
-              for (let j = 0; j < colArray.length; j++) {
-                item[titles[j]] = (colArray[j] ? colArray[j] : "");
-              }
+              this.getTableData(rowArray.slice(i));
+            }
+            break;
+          } else {
+            let item = {};
+            for (let j = 0; j < colArray.length; j++) {
+              item[titles[j]] = (colArray[j] ? colArray[j] : "");
+            }
+            // 性能考虑每个表格取值不超过一百
+            if (result.length < 100) {
               result.push(item);
             }
           }
         }
-
-        this.tables.splice(0, 0, {
-          titles: titles,
-          tableData: result
-        });
       }
+      this.tables.splice(0, 0, {
+        titles: titles,
+        tableData: result
+      });
     }
   }
+}
 </script>
 
 <style scoped>
 
-  .el-table {
-    margin-bottom: 20px;
-  }
+.el-table {
+  margin-bottom: 20px;
+}
 
-  .el-table >>> .cell {
-    white-space: nowrap;
-  }
+.el-table >>> .cell {
+  white-space: nowrap;
+}
 
-  .table-content {
-    cursor: pointer;
-  }
+.table-content {
+  cursor: pointer;
+}
 
-  .el-container {
-    overflow: auto;
-    max-height: 500px;
-  }
+.el-container {
+  overflow: auto;
+  max-height: 500px;
+}
 
 </style>