From 312b028ade34484f78435a24d3f70bc1607af848 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 25 Dec 2020 11:16:35 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=88=97=E8=A1=A8=E5=86=85=E5=AE=B9=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/ApiScenarioReportService.java |   4 +-
 .../scenario/api/ScenarioApiRelevance.vue     |   2 +-
 .../scenario/api/ScenarioRelevance.vue        |   2 +-
 .../scenario/api/ScenarioRelevanceApiList.vue | 127 +++++++++---------
 .../api/ScenarioRelevanceCaseList.vue         |   1 -
 5 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
index 589caa0073..82a4896c1f 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
@@ -96,6 +96,8 @@ public class ApiScenarioReportService {
         report.setId(test.getId());
         report.setProjectId(test.getProjectId());
         report.setName(test.getName());
+        report.setScenarioName(test.getScenarioName());
+        report.setScenarioId(test.getScenarioId());
         report.setTriggerMode(test.getTriggerMode());
         report.setDescription(test.getDescription());
         report.setCreateTime(System.currentTimeMillis());
@@ -103,7 +105,7 @@ public class ApiScenarioReportService {
         report.setStatus(test.getStatus());
         report.setUserId(test.getUserId());
         report.setExecuteType(test.getExecuteType());
-        apiScenarioReportMapper.updateByPrimaryKey(report);
+        apiScenarioReportMapper.updateByPrimaryKeySelective(report);
         return report;
     }
 
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 1a0589942e..0947ae6769 100644
--- a/frontend/src/business/components/api/automation/scenario/api/ScenarioApiRelevance.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ScenarioApiRelevance.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog class="api-relevance" :title="'接口导入'"
              :visible.sync="dialogVisible"
-             width="60%"
+             width="70%"
              :close-on-click-modal="false"
              top="50px">
 
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 c3026c7304..b1d2b2f33e 100644
--- a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog class="api-relevance" :title="'场景导入'"
              :visible.sync="dialogVisible"
-             width="60%"
+             width="70%"
              :close-on-click-modal="false"
              top="50px">
 
diff --git a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevanceApiList.vue b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevanceApiList.vue
index 83a0c956ca..01f872c821 100644
--- a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevanceApiList.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevanceApiList.vue
@@ -1,77 +1,77 @@
 <template>
   <api-list-container
-      :is-api-list-enable="isApiListEnable"
-      @isApiListEnableChange="isApiListEnableChange">
+    :is-api-list-enable="isApiListEnable"
+    @isApiListEnableChange="isApiListEnableChange">
 
-      <el-input placeholder="搜索" @blur="initTable" class="search-input" size="small" @keyup.enter.native="initTable" v-model="condition.name"/>
+    <el-input placeholder="搜索" @blur="initTable" class="search-input" size="small" @keyup.enter.native="initTable" v-model="condition.name"/>
 
-      <el-table v-loading="result.loading"
-                border
-                :data="tableData" row-key="id" class="test-content adjust-table"
-                @select-all="handleSelectAll"
-                @select="handleSelect">
-        <el-table-column type="selection"/>
+    <el-table v-loading="result.loading"
+              border
+              :data="tableData" row-key="id" class="test-content adjust-table"
+              @select-all="handleSelectAll"
+              @select="handleSelect">
+      <el-table-column type="selection"/>
 
-        <el-table-column prop="name" :label="$t('api_test.definition.api_name')" show-overflow-tooltip/>
+      <el-table-column prop="name" :label="$t('api_test.definition.api_name')" show-overflow-tooltip/>
 
-        <el-table-column
-          prop="status"
-          column-key="api_status"
-          :label="$t('api_test.definition.api_status')"
-          show-overflow-tooltip>
-          <template v-slot:default="scope">
-            <ms-tag v-if="scope.row.status == 'Prepare'" type="info" effect="plain" :content="$t('test_track.plan.plan_status_prepare')"/>
-            <ms-tag v-if="scope.row.status == 'Underway'" type="warning" effect="plain" :content="$t('test_track.plan.plan_status_running')"/>
-            <ms-tag v-if="scope.row.status == 'Completed'" type="success" effect="plain" :content="$t('test_track.plan.plan_status_completed')"/>
-            <ms-tag v-if="scope.row.status == 'Trash'" type="danger" effect="plain" content="废弃"/>
-          </template>
-        </el-table-column>
+      <el-table-column
+        prop="status"
+        column-key="api_status"
+        :label="$t('api_test.definition.api_status')"
+        show-overflow-tooltip>
+        <template v-slot:default="scope">
+          <ms-tag v-if="scope.row.status == 'Prepare'" type="info" effect="plain" :content="$t('test_track.plan.plan_status_prepare')"/>
+          <ms-tag v-if="scope.row.status == 'Underway'" type="warning" effect="plain" :content="$t('test_track.plan.plan_status_running')"/>
+          <ms-tag v-if="scope.row.status == 'Completed'" type="success" effect="plain" :content="$t('test_track.plan.plan_status_completed')"/>
+          <ms-tag v-if="scope.row.status == 'Trash'" type="danger" effect="plain" content="废弃"/>
+        </template>
+      </el-table-column>
 
-        <el-table-column
-          prop="method"
-          :label="$t('api_test.definition.api_type')"
-          show-overflow-tooltip>
-          <template v-slot:default="scope" class="request-method">
-            <el-tag size="mini" :style="{'background-color': getColor(scope.row.method), border: getColor(true, scope.row.method)}" class="api-el-tag">
-              {{ scope.row.method}}
-            </el-tag>
-          </template>
-        </el-table-column>
+      <el-table-column
+        prop="method"
+        :label="$t('api_test.definition.api_type')"
+        show-overflow-tooltip>
+        <template v-slot:default="scope" class="request-method">
+          <el-tag size="mini" :style="{'background-color': getColor(scope.row.method), border: getColor(true, scope.row.method)}" class="api-el-tag">
+            {{ scope.row.method}}
+          </el-tag>
+        </template>
+      </el-table-column>
 
-        <el-table-column
-          prop="path"
-          :label="$t('api_test.definition.api_path')"
-          show-overflow-tooltip/>
+      <el-table-column
+        prop="path"
+        :label="$t('api_test.definition.api_path')"
+        show-overflow-tooltip/>
 
-        <el-table-column
-          prop="userName"
-          :label="$t('api_test.definition.api_principal')"
-          show-overflow-tooltip/>
+      <el-table-column
+        prop="userName"
+        :label="$t('api_test.definition.api_principal')"
+        show-overflow-tooltip/>
 
-        <el-table-column width="160" :label="$t('api_test.definition.api_last_time')" prop="updateTime">
-          <template v-slot:default="scope">
-            <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
-          </template>
-        </el-table-column>
+      <el-table-column width="160" :label="$t('api_test.definition.api_last_time')" prop="updateTime">
+        <template v-slot:default="scope">
+          <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
+        </template>
+      </el-table-column>
 
-        <el-table-column
-          prop="caseTotal"
-          :label="$t('api_test.definition.api_case_number')"
-          show-overflow-tooltip/>
+      <el-table-column
+        prop="caseTotal"
+        :label="$t('api_test.definition.api_case_number')"
+        show-overflow-tooltip/>
 
-        <el-table-column
-          prop="caseStatus"
-          :label="$t('api_test.definition.api_case_status')"
-          show-overflow-tooltip/>
+      <el-table-column
+        prop="caseStatus"
+        :label="$t('api_test.definition.api_case_status')"
+        show-overflow-tooltip/>
 
-        <el-table-column
-          prop="casePassingRate"
-          :label="$t('api_test.definition.api_case_passing_rate')"
-          show-overflow-tooltip/>
-      </el-table>
-      <ms-table-pagination :change="initTable" :current-page.sync="currentPage" :page-size.sync="pageSize"
-                           :total="total"/>
-    </api-list-container>
+      <el-table-column
+        prop="casePassingRate"
+        :label="$t('api_test.definition.api_case_passing_rate')"
+        show-overflow-tooltip/>
+    </el-table>
+    <ms-table-pagination :change="initTable" :current-page.sync="currentPage" :page-size.sync="pageSize"
+                         :total="total"/>
+  </api-list-container>
 </template>
 
 <script>
@@ -164,9 +164,7 @@
         this.initTable();
       },
     },
-    computed: {
-
-    },
+    computed: {},
     methods: {
       isApiListEnableChange(data) {
         this.$emit('isApiListEnableChange', data);
@@ -185,6 +183,7 @@
         if (this.currentProtocol != null) {
           this.condition.protocol = this.currentProtocol;
         }
+        this.condition.projectId = getCurrentProjectID();
         this.result = this.$post("/api/definition/list/" + this.currentPage + "/" + this.pageSize, this.condition, response => {
           this.total = response.data.itemCount;
           this.tableData = response.data.listObject;
diff --git a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevanceCaseList.vue b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevanceCaseList.vue
index b4452b8964..546abcf4d2 100644
--- a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevanceCaseList.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevanceCaseList.vue
@@ -161,7 +161,6 @@
           this.condition.protocol = this.currentProtocol;
         }
         this.condition.projectId = getCurrentProjectID();
-
         this.result = this.$post("/api/testcase/list/" + this.currentPage + "/" + this.pageSize, this.condition, response => {
           this.total = response.data.itemCount;
           this.tableData = response.data.listObject;