From f3d67b0a4640c6a24ddcab8287dbf0ab9f163033 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 17 Oct 2023 11:30:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95=E9=A6=96=E9=A1=B5=E8=BF=87?=
 =?UTF-8?q?=E5=8E=BB7=E5=A4=A9=E6=9C=89=E6=9B=B4=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=BB=9F=E8=AE=A1=E4=B8=AD=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E8=B7=B3=E8=BD=AC=E6=97=B6=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=B0=E5=AF=B9=E5=BA=94=E7=9A=84=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1031580 --user=宋天阳
【接口测试】首页-过去7天有更新的接口-sql接口-点击关联CASE-进入到http-case页面
https://www.tapd.cn/55049933/s/1426921
---
 .../frontend/src/business/home/ApiHome.vue    | 11 +++++-----
 .../home/components/table/UpdatedApiList.vue  | 20 +++++++++++--------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/api-test/frontend/src/business/home/ApiHome.vue b/api-test/frontend/src/business/home/ApiHome.vue
index 3142bcc402..003d396ae8 100644
--- a/api-test/frontend/src/business/home/ApiHome.vue
+++ b/api-test/frontend/src/business/home/ApiHome.vue
@@ -34,7 +34,8 @@
           </el-row>
           <el-row style="margin-top: 16px">
             <el-col style="background-color: #ffffff">
-              <updated-api-list @redirectPage="redirectPage" ref="updatedApiList" />
+              <updated-api-list ref="updatedApiList" @redirectPage="redirectPage"
+                                @redirectPageWithDataType="redirectPageWithDataType"/>
             </el-col>
           </el-row>
           <el-row style="margin-top: 16px">
@@ -49,7 +50,7 @@
 </template>
 
 <script>
-import { getUUID } from 'metersphere-frontend/src/utils';
+import {getUUID} from 'metersphere-frontend/src/utils';
 import MsContainer from 'metersphere-frontend/src/components/MsContainer';
 import MsMainContainer from 'metersphere-frontend/src/components/MsMainContainer';
 import ApiDashboard from '@/business/home/components/dashboard/ApiDashboard';
@@ -58,9 +59,9 @@ import ScenarioDashboard from '@/business/home/components/dashboard/ScenarioDash
 import ScenarioScheduleDashboard from '@/business/home/components/dashboard/ScenarioScheduleDashboard';
 import UpdatedApiList from '@/business/home/components/table/UpdatedApiList';
 import ScheduleTaskList from '@/business/home/components/table/ScheduleTaskList';
-import { getProjectVersions } from '@/api/xpack';
-import { getCurrentProjectID } from 'metersphere-frontend/src/utils/token';
-import { hasLicense } from 'metersphere-frontend/src/utils/permission';
+import {getProjectVersions} from '@/api/xpack';
+import {getCurrentProjectID} from 'metersphere-frontend/src/utils/token';
+import {hasLicense} from 'metersphere-frontend/src/utils/permission';
 
 export default {
   name: 'ApiHome',
diff --git a/api-test/frontend/src/business/home/components/table/UpdatedApiList.vue b/api-test/frontend/src/business/home/components/table/UpdatedApiList.vue
index 88d8cd4df0..61cb2c20e5 100644
--- a/api-test/frontend/src/business/home/components/table/UpdatedApiList.vue
+++ b/api-test/frontend/src/business/home/components/table/UpdatedApiList.vue
@@ -64,7 +64,7 @@
                 type="info"
                 :underline="false"
                 v-permission-disable="['PROJECT_API_DEFINITION:READ']"
-                @click="redirectPage('api', 'apiTestCase', 'singleList:' + row.id)">
+                @click="redirectPage('api', 'apiTestCase', 'singleList:' + row.id, row.protocol)">
                 <span style="float: right">
                   {{ row.caseTotal }}
                 </span>
@@ -118,13 +118,13 @@
 </template>
 
 <script>
-import { definitionWeekList } from '@/api/definition';
-import { getCurrentProjectID } from 'metersphere-frontend/src/utils/token';
-import { API_STATUS } from '@/business/definition/model/JsonData';
+import {definitionWeekList} from '@/api/definition';
+import {getCurrentProjectID} from 'metersphere-frontend/src/utils/token';
+import {API_STATUS} from '@/business/definition/model/JsonData';
 import ApiStatus from '@/business/definition/components/list/ApiStatus';
 import HomeTablePagination from '@/business/home/components/table/HomeTablePagination';
 import BasicStatusLabel from 'metersphere-frontend/src/components/BasicStatusLabel';
-import { hasPermission } from 'metersphere-frontend/src/utils/permission';
+import {hasPermission} from 'metersphere-frontend/src/utils/permission';
 
 export default {
   name: 'UpdatedApiList',
@@ -152,7 +152,7 @@ export default {
         if (!hasPermission('PROJECT_API_DEFINITION:READ')) {
           return;
         }
-        this.redirectPage('api', 'api', 'edit:' + row.id);
+        this.redirectPageWithDataType('api', 'api', 'edit:' + row.id);
       }
     },
     search(versionId) {
@@ -175,8 +175,12 @@ export default {
           this.loadError = true;
         });
     },
-    redirectPage(redirectPage, dataType, selectRange) {
-      this.$emit('redirectPage', redirectPage, dataType, selectRange, null);
+    redirectPage(redirectPage, dataType, selectRange, type) {
+      if (!type || type === undefined) {
+        this.$emit('redirectPage', redirectPage, dataType, selectRange, null, type);
+      } else {
+        this.$emit('redirectPageWithDataType', redirectPage, dataType, selectRange, null, type);
+      }
     },
   },
 };