From 8ee491dd8492f332b27ee1529d51031168df914a Mon Sep 17 00:00:00 2001
From: baiqi <qi.bai@fit2cloud.com>
Date: Wed, 21 Jun 2023 16:45:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E5=BE=AE=E5=89=8D=E7=AB=AF=E5=AD=90=E5=BA=94=E7=94=A8=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=9F=A5=E7=9C=8B=E6=8A=A5=E5=91=8A=E6=97=B6=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E4=B8=8D=E5=90=8C=E7=9A=84=E6=B5=8B=E8=AF=95=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E5=B1=95=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1027023 --user=白奇 【测试跟踪】测试计划-报告统计中查看场景报告详情显示未同步变更 https://www.tapd.cn/55049933/s/1381694
---
 api-test/frontend/src/main.js                 |  13 +-
 .../frontend/src/components/MicroApp.vue      |  13 +-
 performance-test/frontend/src/main.js         |  13 +-
 project-management/frontend/src/main.js       |  13 +-
 report-stat/frontend/src/main.js              |  13 +-
 system-setting/frontend/src/main.js           |  13 +-
 .../component/ApiScenarioFailureResult.vue    |  69 ++++----
 .../detail/component/UiScenarioResult.vue     | 158 ++++++++++--------
 test-track/frontend/src/main.js               |  13 +-
 workstation/frontend/src/main.js              |  13 +-
 10 files changed, 206 insertions(+), 125 deletions(-)

diff --git a/api-test/frontend/src/main.js b/api-test/frontend/src/main.js
index c669dca8fe..3af11cf8c0 100644
--- a/api-test/frontend/src/main.js
+++ b/api-test/frontend/src/main.js
@@ -106,7 +106,16 @@ export async function unmount(props) {
 }
 
 /**
- * 可选生命周期钩子，仅使用 loadMicroApp 方式加载微应用时生效
+ * 更新钩子，目前只有routeParams更新，后续有其他属性更新再添加
  */
-export async function update(props) {
+export async function update (props) {
+  const { defaultPath, routeParams, routeName } = props;
+  // 微服务过来的路由
+  if (defaultPath || routeName) {
+    microRouter.push({
+      path: defaultPath,
+      params: routeParams,
+      name: routeName,
+    });
+  }
 }
diff --git a/framework/sdk-parent/frontend/src/components/MicroApp.vue b/framework/sdk-parent/frontend/src/components/MicroApp.vue
index 5e2ac900cd..6fdfbbc240 100644
--- a/framework/sdk-parent/frontend/src/components/MicroApp.vue
+++ b/framework/sdk-parent/frontend/src/components/MicroApp.vue
@@ -21,7 +21,18 @@ export default {
       microApp: null,
     }
   },
-
+  watch: {
+    routeParams: {
+      handler() {
+        this.microApp.update({
+          defaultPath: this.to,
+          routeParams: this.routeParams,
+          routeName: this.routeName,
+        });
+      },
+      deep: true,
+    }
+  },
   mounted() {
     this.microAppInit()
     this.messageInit()
diff --git a/performance-test/frontend/src/main.js b/performance-test/frontend/src/main.js
index a1a25dce5e..a0e3223e8e 100644
--- a/performance-test/frontend/src/main.js
+++ b/performance-test/frontend/src/main.js
@@ -97,7 +97,16 @@ export async function unmount(props) {
 }
 
 /**
- * 可选生命周期钩子，仅使用 loadMicroApp 方式加载微应用时生效
+ * 更新钩子，目前只有routeParams更新，后续有其他属性更新再添加
  */
-export async function update(props) {
+export async function update (props) {
+  const { defaultPath, routeParams, routeName } = props;
+  // 微服务过来的路由
+  if (defaultPath || routeName) {
+    microRouter.push({
+      path: defaultPath,
+      params: routeParams,
+      name: routeName,
+    });
+  }
 }
diff --git a/project-management/frontend/src/main.js b/project-management/frontend/src/main.js
index 568725a37e..ee62789b43 100644
--- a/project-management/frontend/src/main.js
+++ b/project-management/frontend/src/main.js
@@ -92,7 +92,16 @@ export async function unmount(props) {
 }
 
 /**
- * 可选生命周期钩子，仅使用 loadMicroApp 方式加载微应用时生效
+ * 更新钩子，目前只有routeParams更新，后续有其他属性更新再添加
  */
-export async function update(props) {
+export async function update (props) {
+  const { defaultPath, routeParams, routeName } = props;
+  // 微服务过来的路由
+  if (defaultPath || routeName) {
+    microRouter.push({
+      path: defaultPath,
+      params: routeParams,
+      name: routeName,
+    });
+  }
 }
diff --git a/report-stat/frontend/src/main.js b/report-stat/frontend/src/main.js
index 478a403d12..b8712d3c3a 100644
--- a/report-stat/frontend/src/main.js
+++ b/report-stat/frontend/src/main.js
@@ -93,7 +93,16 @@ export async function unmount(props) {
 }
 
 /**
- * 可选生命周期钩子，仅使用 loadMicroApp 方式加载微应用时生效
+ * 更新钩子，目前只有routeParams更新，后续有其他属性更新再添加
  */
-export async function update(props) {
+export async function update (props) {
+  const { defaultPath, routeParams, routeName } = props;
+  // 微服务过来的路由
+  if (defaultPath || routeName) {
+    microRouter.push({
+      path: defaultPath,
+      params: routeParams,
+      name: routeName,
+    });
+  }
 }
diff --git a/system-setting/frontend/src/main.js b/system-setting/frontend/src/main.js
index 41a6927fd7..7e543ef6a9 100644
--- a/system-setting/frontend/src/main.js
+++ b/system-setting/frontend/src/main.js
@@ -90,7 +90,16 @@ export async function unmount(props) {
 }
 
 /**
- * 可选生命周期钩子，仅使用 loadMicroApp 方式加载微应用时生效
+ * 更新钩子，目前只有routeParams更新，后续有其他属性更新再添加
  */
-export async function update(props) {
+export async function update (props) {
+  const { defaultPath, routeParams, routeName } = props;
+  // 微服务过来的路由
+  if (defaultPath || routeName) {
+    microRouter.push({
+      path: defaultPath,
+      params: routeParams,
+      name: routeName,
+    });
+  }
 }
diff --git a/test-track/frontend/src/business/plan/view/comonents/report/detail/component/ApiScenarioFailureResult.vue b/test-track/frontend/src/business/plan/view/comonents/report/detail/component/ApiScenarioFailureResult.vue
index 2074b47669..ac82eae30c 100644
--- a/test-track/frontend/src/business/plan/view/comonents/report/detail/component/ApiScenarioFailureResult.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/report/detail/component/ApiScenarioFailureResult.vue
@@ -58,21 +58,8 @@
     </ms-aside-container>
     <el-main>
       <div v-if="showResponse">
-        <micro-app
-          v-if="!isTemplate"
-          route-name="ApiScenarioReportView"
-          service="api"
-          :route-params="{
-            reportId,
-            isShare,
-            shareId,
-            isPlanReport: true,
-            isTemplate,
-            response,
-          }"
-        />
         <ms-api-report
-          v-else
+          v-show="isTemplate"
           :report-id="reportId"
           :is-share="isShare"
           :share-id="shareId"
@@ -80,6 +67,12 @@
           :is-template="isTemplate"
           :template-report="response"
         />
+        <micro-app
+          v-show="!isTemplate"
+          route-name="ApiScenarioReportView"
+          service="api"
+          :route-params="routeParams"
+        />
       </div>
 
       <div class="empty" v-else>
@@ -90,6 +83,7 @@
 </template>
 
 <script>
+import { debounce } from "lodash-es";
 import MsApiReport from "../api/ApiReportDetail";
 
 import PriorityTableItem from "../../../../../../common/tableItems/planview/PriorityTableItem";
@@ -146,6 +140,14 @@ export default {
       reportId: null,
       response: {},
       showResponse: false,
+      routeParams: {
+        reportId: this.reportId,
+        isShare: this.isShare,
+        shareId: this.shareId,
+        isPlanReport: true,
+        isTemplate: this.isTemplate,
+      },
+      debouncedRenderReport: debounce(this.renderReport, 300), // 300ms防抖
     };
   },
   mounted() {
@@ -239,31 +241,24 @@ export default {
       }
     },
     rowClick(row) {
-
-      if (!this.isTemplate) {
-        if (this.reportId === row.reportId) {
-          return;
+      this.debouncedRenderReport(row);
+    },
+    renderReport(row) {
+      if (this.isTemplate) {
+        if (row.response) {
+          this.response = row.response;
+          this.showResponse = true;
+        }
+      } else {
+        if (
+          row.reportId &&
+          row.lastResult !== "Running" &&
+          row.lastResult !== "Waiting"
+        ) {
+          this.routeParams.reportId = row.reportId;
+          this.showResponse = true;
         }
       }
-
-      this.showResponse = false;
-      this.$nextTick(() => {
-        if (this.isTemplate) {
-          if (row.response) {
-            this.response = row.response;
-            this.showResponse = true;
-          }
-        } else {
-          if (
-            row.reportId &&
-            row.lastResult !== "Running" &&
-            row.lastResult !== "Waiting"
-          ) {
-            this.reportId = row.reportId;
-            this.showResponse = true;
-          }
-        }
-      });
     },
   },
 };
diff --git a/test-track/frontend/src/business/plan/view/comonents/report/detail/component/UiScenarioResult.vue b/test-track/frontend/src/business/plan/view/comonents/report/detail/component/UiScenarioResult.vue
index c620bc2b47..7040f145ed 100644
--- a/test-track/frontend/src/business/plan/view/comonents/report/detail/component/UiScenarioResult.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/report/detail/component/UiScenarioResult.vue
@@ -1,47 +1,51 @@
 <template>
   <el-container class="scenario-info">
-    <ms-aside-container width="500px" :default-hidden-bottom-top="200" :enable-auto-height="true">
+    <ms-aside-container
+      width="500px"
+      :default-hidden-bottom-top="200"
+      :enable-auto-height="true"
+    >
       <el-card>
         <el-scrollbar>
-          <ms-table v-loading="loading"
-                    :show-select-all="false"
-                    :screen-height="null"
-                    :enable-selection="false"
-                    :highlight-current-row="true"
-                    @refresh="getScenarioApiCase"
-                    @handleRowClick="rowClick"
-                    :data="scenarioCases">
-
-            <ms-table-column
-                :width="80"
-                :label="$t('commons.id')"
-                prop="num">
+          <ms-table
+            v-loading="loading"
+            :show-select-all="false"
+            :screen-height="null"
+            :enable-selection="false"
+            :highlight-current-row="true"
+            @refresh="getScenarioApiCase"
+            @handleRowClick="rowClick"
+            :data="scenarioCases"
+          >
+            <ms-table-column :width="80" :label="$t('commons.id')" prop="num">
             </ms-table-column>
-            <ms-table-column
-                :label="$t('commons.name')"
-                prop="name">
+            <ms-table-column :label="$t('commons.name')" prop="name">
             </ms-table-column>
             <el-table-column
               prop="principalName"
-              :label="$t('test_track.plan.plan_principal')"/>
+              :label="$t('test_track.plan.plan_principal')"
+            />
             <ms-table-column
-                :label="$t('test_track.case.priority')"
-                :width="80">
+              :label="$t('test_track.case.priority')"
+              :width="80"
+            >
               <template v-slot:default="scope">
-                <priority-table-item :value="scope.row.level" ref="priority"/>
+                <priority-table-item :value="scope.row.level" ref="priority" />
               </template>
             </ms-table-column>
             <ms-table-column
-                :width="70"
-                :label="$t('api_test.automation.step')"
-                prop="stepTotal">
+              :width="70"
+              :label="$t('api_test.automation.step')"
+              prop="stepTotal"
+            >
             </ms-table-column>
             <ms-table-column
-                :width="80"
-                :label="$t('test_track.plan_view.execute_result')"
-                prop="lastResult">
-              <template v-slot:default="{row}">
-                <ms-test-plan-api-status :status="row.lastResult"/>
+              :width="80"
+              :label="$t('test_track.plan_view.execute_result')"
+              prop="lastResult"
+            >
+              <template v-slot:default="{ row }">
+                <ms-test-plan-api-status :status="row.lastResult" />
               </template>
             </ms-table-column>
           </ms-table>
@@ -50,36 +54,32 @@
     </ms-aside-container>
     <el-main>
       <div v-if="showResponse">
-        <micro-app v-if="!isTemplate"
-                   service="ui"
-                   route-name="ApiReportView"
-                   :route-params="{
-                    reportId,
-                    isShare,
-                    shareId,
-                    isPlanReport: true,
-                    isTemplate,
-                    response,
-                    showCancelButton: false,
-                    showReportNameButton: false
-                 }"/>
+        <micro-app
+          v-show="!isTemplate"
+          service="ui"
+          route-name="ApiReportView"
+          :route-params="routeParams"
+        />
         <UiShareReportDetail
-          v-else
+          v-show="isTemplate"
           :report-id="reportId"
           :share-id="shareId"
           :is-share="isShare"
           :template-report="response"
           :is-template="true"
           :is-plan="true"
-          :show-cancel-button="false"/>
+          :show-cancel-button="false"
+        />
+      </div>
+      <div class="empty" v-else>
+        {{ $t("test_track.plan.load_case.content_empty") }}
       </div>
-      <div class="empty" v-else>{{ $t('test_track.plan.load_case.content_empty') }}</div>
     </el-main>
   </el-container>
 </template>
 
 <script>
-import UiShareReportDetail from "../ui/UiShareReportDetail"
+import UiShareReportDetail from "../ui/UiShareReportDetail";
 import PriorityTableItem from "../../../../../../common/tableItems/planview/PriorityTableItem";
 import TypeTableItem from "../../../../../../common/tableItems/planview/TypeTableItem";
 import MethodTableItem from "../../../../../../common/tableItems/planview/MethodTableItem";
@@ -98,8 +98,13 @@ export default {
     MsMainContainer,
     MsAsideContainer,
     MicroApp,
-    MsTableColumn, MsTable, StatusTableItem, MethodTableItem, TypeTableItem, PriorityTableItem,
-    UiShareReportDetail
+    MsTableColumn,
+    MsTable,
+    StatusTableItem,
+    MethodTableItem,
+    TypeTableItem,
+    PriorityTableItem,
+    UiShareReportDetail,
   },
   props: {
     planId: String,
@@ -122,13 +127,23 @@ export default {
       response: {},
       showResponse: false,
       resultMap: {
-        'Success' : 'Pass',
-        'Error' : 'Failure',
-        'STOP' : 'STOP',
-        'Running' : 'Running',
-        'UnExecute' : 'Prepare',
-      }
-    }
+        Success: "Pass",
+        Error: "Failure",
+        STOP: "STOP",
+        Running: "Running",
+        UnExecute: "Prepare",
+      },
+      routeParams: {
+        reportId: this.reportId,
+        isShare: this.isShare,
+        shareId: this.shareId,
+        isPlanReport: true,
+        isTemplate: this.isTemplate,
+        response: this.response,
+        showCancelButton: false,
+        showReportNameButton: false,
+      },
+    };
   },
   mounted() {
     this.getScenarioApiCase();
@@ -136,18 +151,18 @@ export default {
   watch: {
     scenarioCases() {
       if (this.scenarioCases) {
-        this.$emit('setSize', this.scenarioCases.length);
+        this.$emit("setSize", this.scenarioCases.length);
       }
     },
     uiAllCases() {
       this.getScenarioApiCase();
-    }
+    },
   },
   methods: {
     getScenarioApiCase() {
       this.scenarioCases = [];
       if (this.filterStatus && this.filterStatus.length > 0) {
-        this.uiAllCases.forEach(item => {
+        this.uiAllCases.forEach((item) => {
           if (this.filterStatus.indexOf(item.lastResult) > -1) {
             this.scenarioCases.push(item);
           }
@@ -157,32 +172,29 @@ export default {
       }
     },
     rowClick(row) {
-      if (!this.isTemplate) {
-        if (this.reportId === row.reportId) {
-          return;
-        }
-      }
-      this.showResponse = false;
       this.$nextTick(() => {
         if (this.isTemplate) {
           if (row.response) {
-            this.showResponse = true;
             this.response = row.response;
+            this.showResponse = true;
           }
         } else {
-          if (row.reportId && row.lastResult !== "Running" && row.lastResult !== "Waiting") {
-            this.showResponse = true;
+          if (
+            row.reportId &&
+            row.lastResult !== "Running" &&
+            row.lastResult !== "Waiting"
+          ) {
             this.reportId = row.reportId;
+            this.showResponse = true;
           }
-       }
-      })
-    }
-  }
-}
+        }
+      });
+    },
+  },
+};
 </script>
 
 <style scoped>
-
 .padding-col {
   padding-right: 0px;
 }
diff --git a/test-track/frontend/src/main.js b/test-track/frontend/src/main.js
index c4adb0814a..82b2499157 100644
--- a/test-track/frontend/src/main.js
+++ b/test-track/frontend/src/main.js
@@ -108,7 +108,16 @@ export async function unmount(props) {
 }
 
 /**
- * 可选生命周期钩子，仅使用 loadMicroApp 方式加载微应用时生效
+ * 更新钩子，目前只有routeParams更新，后续有其他属性更新再添加
  */
-export async function update(props) {
+export async function update (props) {
+  const { defaultPath, routeParams, routeName } = props;
+  // 微服务过来的路由
+  if (defaultPath || routeName) {
+    microRouter.push({
+      path: defaultPath,
+      params: routeParams,
+      name: routeName,
+    });
+  }
 }
diff --git a/workstation/frontend/src/main.js b/workstation/frontend/src/main.js
index be87f845fa..da5882ebbd 100644
--- a/workstation/frontend/src/main.js
+++ b/workstation/frontend/src/main.js
@@ -94,7 +94,16 @@ export async function unmount(props) {
 }
 
 /**
- * 可选生命周期钩子，仅使用 loadMicroApp 方式加载微应用时生效
+ * 更新钩子，目前只有routeParams更新，后续有其他属性更新再添加
  */
-export async function update(props) {
+export async function update (props) {
+  const { defaultPath, routeParams, routeName } = props;
+  // 微服务过来的路由
+  if (defaultPath || routeName) {
+    microRouter.push({
+      path: defaultPath,
+      params: routeParams,
+      name: routeName,
+    });
+  }
 }