From 857bfefa9df644cbede24164fd547afb826f4335 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 14 Mar 2023 11:41:58 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=97=B6=E8=B5=84=E6=BA=90=E6=B1=A0=E6=B2=A1=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E3=80=81=E5=A4=B1=E8=B4=A5=E9=87=8D=E8=B7=91=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=B2=A1=E9=9A=90=E8=97=8F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1024375 --user=宋天阳 【测试跟踪】测试计划最终报告导出，不显示“失败重跑”按钮
https://www.tapd.cn/55049933/s/1349388
---
 .../controller/ShareController.java           |  12 -
 .../controller/TestPlanController.java        |  11 -
 .../plan/service/TestPlanReportService.java   |   8 +
 .../frontend/src/api/remote/plan/test-plan.js |  20 --
 .../report/detail/TestPlanApiReport.vue       | 268 +++++++++++++-----
 .../report/detail/TestPlanOverviewReport.vue  |   1 -
 .../report/detail/TestPlanReportContent.vue   |  17 +-
 .../ui/TestCaseUiScenarioRelevance.vue        |  88 +++---
 8 files changed, 249 insertions(+), 176 deletions(-)

diff --git a/test-track/backend/src/main/java/io/metersphere/controller/ShareController.java b/test-track/backend/src/main/java/io/metersphere/controller/ShareController.java
index b510f59eb1..7ea473a470 100644
--- a/test-track/backend/src/main/java/io/metersphere/controller/ShareController.java
+++ b/test-track/backend/src/main/java/io/metersphere/controller/ShareController.java
@@ -78,16 +78,4 @@ public class ShareController {
         HttpHeaderUtils.clearUser();
         return reportExtInfo;
     }
-
-    @GetMapping("test/plan/ext/plan/{shareId}/{planId}")
-    public ExecutionModeDTO getExtPlan(@PathVariable String shareId, @PathVariable String planId) throws JsonProcessingException {
-        shareInfoService.validate(shareId, planId);
-        if (SessionUtils.getUser() == null) {
-            HttpHeaderUtils.runAsUser("admin");
-        }
-        //          testPlanService.getExtInfoByPlanId 这个方法逻辑有问题。分不清楚干嘛用的。方法删了，调用地方先注释了。
-        //        TestPlanExtReportDTO reportExtInfo = testPlanService.getExtInfoByPlanId(planId);
-        HttpHeaderUtils.clearUser();
-        return new ExecutionModeDTO();
-    }
 }
diff --git a/test-track/backend/src/main/java/io/metersphere/controller/TestPlanController.java b/test-track/backend/src/main/java/io/metersphere/controller/TestPlanController.java
index 84aadfbd35..5135e32d3a 100644
--- a/test-track/backend/src/main/java/io/metersphere/controller/TestPlanController.java
+++ b/test-track/backend/src/main/java/io/metersphere/controller/TestPlanController.java
@@ -14,7 +14,6 @@ import io.metersphere.dto.TestPlanRerunParametersDTO;
 import io.metersphere.i18n.Translator;
 import io.metersphere.log.annotation.MsAuditLog;
 import io.metersphere.notice.annotation.SendNotice;
-import io.metersphere.plan.dto.ExecutionModeDTO;
 import io.metersphere.plan.dto.TestCaseReportStatusResultDTO;
 import io.metersphere.plan.dto.TestPlanDTO;
 import io.metersphere.plan.dto.TestPlanReportDataStruct;
@@ -380,14 +379,4 @@ public class TestPlanController {
     public void resetStatus(@PathVariable String planId) {
         testPlanService.resetStatus(planId);
     }
-
-    @GetMapping("/ext/report/{reportId}")
-    public ExecutionModeDTO getExtReport(@PathVariable String reportId) throws JsonProcessingException {
-        return new ExecutionModeDTO();
-    }
-
-    @GetMapping("/ext/plan/{planId}")
-    public ExecutionModeDTO getExtPlan(@PathVariable String planId) throws JsonProcessingException {
-        return new ExecutionModeDTO();
-    }
 }
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanReportService.java b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanReportService.java
index 42cea3214d..807c641d76 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanReportService.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanReportService.java
@@ -1124,7 +1124,11 @@ public class TestPlanReportService {
                 });
                 String resourcePoolNames = StringUtils.join(resourcePoolName.toArray(), StringUtils.SPACE);
                 report.setResourcePool(resourcePoolNames);
+            } else {
+                report.setResourcePool("LOCAL");
             }
+        } else {
+            report.setResourcePool("LOCAL");
         }
         return report;
     }
@@ -1156,7 +1160,11 @@ public class TestPlanReportService {
                     });
                     String resourcePoolNames = StringUtils.join(resourcePoolName.toArray(), StringUtils.SPACE);
                     testPlanReportDTO.setResourcePool(resourcePoolNames);
+                } else {
+                    testPlanReportDTO.setResourcePool("LOCAL");
                 }
+            } else {
+                testPlanReportDTO.setResourcePool("LOCAL");
             }
             // 环境组/运行环境
             if (StringUtils.isNotEmpty(runInfoDTO.getEnvGroupId())) {
diff --git a/test-track/frontend/src/api/remote/plan/test-plan.js b/test-track/frontend/src/api/remote/plan/test-plan.js
index b2d743ecc0..d6ebd61423 100644
--- a/test-track/frontend/src/api/remote/plan/test-plan.js
+++ b/test-track/frontend/src/api/remote/plan/test-plan.js
@@ -390,23 +390,3 @@ export function reportSocket(reportId) {
 export function testPlanLoadCaseEditStatus(planId) {
   return post(BASE_URL + `edit/status/${planId}`, new Promise(() => {}));
 }
-
-export function getTestPlanExtReport(planId, reportId) {
-  if (reportId) {
-    return get(BASE_URL + "ext/report/" + reportId);
-  } else if (planId) {
-    return get(BASE_URL + "ext/plan/" + planId);
-  } else {
-    return new Promise(() => {});
-  }
-}
-
-export function getShareTestPlanExtReport(shareId, planId, reportId) {
-  if (reportId) {
-    return get("/share" + BASE_URL + `ext/report/${shareId}/${reportId}`);
-  } else if (planId) {
-    return get("/share" + BASE_URL + `ext/plan/${shareId}/${planId}`);
-  } else {
-    return new Promise(() => {});
-  }
-}
diff --git a/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanApiReport.vue b/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanApiReport.vue
index cafa61339a..e7cd8eff50 100644
--- a/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanApiReport.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanApiReport.vue
@@ -1,56 +1,152 @@
 <template>
-  <test-plan-report-container id="api" :title="$t('test_track.report.analysis_api')">
+  <test-plan-report-container
+    id="api"
+    :title="$t('test_track.report.analysis_api')"
+  >
     <el-tabs v-model="activeName" @tab-click="handleClick">
-      <el-tab-pane v-if="resultEnable" :label="$t('test_track.report.test_result')" name="first">
-        <api-result :api-result="report.apiResult"/>
+      <el-tab-pane
+        v-if="resultEnable"
+        :label="$t('test_track.report.test_result')"
+        name="first"
+      >
+        <api-result :api-result="report.apiResult" />
       </el-tab-pane>
       <el-tab-pane v-if="failureEnable" name="second">
         <template v-slot:label>
-          <tab-pane-count :title="$t('test_track.report.fail_case')" :count="failureSize"/>
+          <tab-pane-count
+            :title="$t('test_track.report.fail_case')"
+            :count="failureSize"
+          />
         </template>
-        <api-cases :is-db="isDb" :share-id="shareId" :is-share="isShare" :report="report" :is-template="isTemplate"
-                   :plan-id="planId" @setSize="setFailureSize"/>
-        <el-button class="rerun-button" plain size="mini"
-                   v-if="showRerunBtn && (failureSize > 0 || unExecuteSize > 0) && isRerun" @click="rerun">
-          {{ $t('api_test.automation.rerun') }}
+        <api-cases
+          :is-db="isDb"
+          :share-id="shareId"
+          :is-share="isShare"
+          :report="report"
+          :is-template="isTemplate"
+          :plan-id="planId"
+          @setSize="setFailureSize"
+        />
+        <el-button
+          class="rerun-button"
+          plain
+          size="mini"
+          v-if="
+            !isTemplate &&
+            showRerunBtn &&
+            (failureSize > 0 || unExecuteSize > 0) &&
+            isRerun
+          "
+          @click="rerun"
+        >
+          {{ $t("api_test.automation.rerun") }}
         </el-button>
       </el-tab-pane>
-      <el-tab-pane style="min-height: 500px" name="third" v-if="errorReportEnable">
+      <el-tab-pane
+        style="min-height: 500px"
+        name="third"
+        v-if="errorReportEnable"
+      >
         <template v-slot:label>
-          <tab-pane-count :title="$t('error_report_library.option.name')" :count="errorReportSize"/>
+          <tab-pane-count
+            :title="$t('error_report_library.option.name')"
+            :count="errorReportSize"
+          />
         </template>
-        <api-cases :is-db="isDb" :is-error-report="true" :share-id="shareId" :is-share="isShare" :report="report"
-                   :is-template="isTemplate" :plan-id="planId" @setSize="setErrorReportSize"/>
-        <el-button class="rerun-button" plain size="mini"
-                   v-if="showRerunBtn && (failureSize > 0 || unExecuteSize > 0) && isRerun" @click="rerun">
-          {{ $t('api_test.automation.rerun') }}
+        <api-cases
+          :is-db="isDb"
+          :is-error-report="true"
+          :share-id="shareId"
+          :is-share="isShare"
+          :report="report"
+          :is-template="isTemplate"
+          :plan-id="planId"
+          @setSize="setErrorReportSize"
+        />
+        <el-button
+          class="rerun-button"
+          plain
+          size="mini"
+          v-if="
+            !isTemplate &&
+            showRerunBtn &&
+            (failureSize > 0 || unExecuteSize > 0) &&
+            isRerun
+          "
+          @click="rerun"
+        >
+          {{ $t("api_test.automation.rerun") }}
         </el-button>
-
       </el-tab-pane>
-      <el-tab-pane style="min-height: 500px" name="fourth" v-if="unExecuteEnable">
+      <el-tab-pane
+        style="min-height: 500px"
+        name="fourth"
+        v-if="unExecuteEnable"
+      >
         <template v-slot:label>
-          <tab-pane-count :title="$t('api_test.home_page.detail_card.unexecute')" :count="unExecuteSize"/>
+          <tab-pane-count
+            :title="$t('api_test.home_page.detail_card.unexecute')"
+            :count="unExecuteSize"
+          />
         </template>
-        <api-cases :is-db="isDb" :is-un-execute="true" :share-id="shareId" :is-share="isShare" :report="report"
-                   :is-template="isTemplate" :plan-id="planId" @setSize="setUnExecuteSize"/>
+        <api-cases
+          :is-db="isDb"
+          :is-un-execute="true"
+          :share-id="shareId"
+          :is-share="isShare"
+          :report="report"
+          :is-template="isTemplate"
+          :plan-id="planId"
+          @setSize="setUnExecuteSize"
+        />
 
-        <el-button class="rerun-button" plain size="mini"
-                   v-if="showRerunBtn && (failureSize > 0 || unExecuteSize > 0) && isRerun" @click="rerun">
-          {{ $t('api_test.automation.rerun') }}
+        <el-button
+          class="rerun-button"
+          plain
+          size="mini"
+          v-if="
+            !isTemplate &&
+            showRerunBtn &&
+            (failureSize > 0 || unExecuteSize > 0) &&
+            isRerun
+          "
+          @click="rerun"
+        >
+          {{ $t("api_test.automation.rerun") }}
         </el-button>
       </el-tab-pane>
 
       <el-tab-pane style="min-height: 500px" name="fifth" v-if="allEnable">
         <template v-slot:label>
-          <tab-pane-count :title="$t('test_track.report.all_case')" :count="allSize"/>
+          <tab-pane-count
+            :title="$t('test_track.report.all_case')"
+            :count="allSize"
+          />
         </template>
-        <api-cases :is-db="isDb" :is-all="true" :share-id="shareId" :is-share="isShare" :report="report"
-                   :is-template="isTemplate" :plan-id="planId" @setSize="setAllSize"/>
-        <el-button class="rerun-button" plain size="mini"
-                   v-if="showRerunBtn && (failureSize > 0 || unExecuteSize > 0) && isRerun" @click="rerun">
-          {{ $t('api_test.automation.rerun') }}
+        <api-cases
+          :is-db="isDb"
+          :is-all="true"
+          :share-id="shareId"
+          :is-share="isShare"
+          :report="report"
+          :is-template="isTemplate"
+          :plan-id="planId"
+          @setSize="setAllSize"
+        />
+        <el-button
+          class="rerun-button"
+          plain
+          size="mini"
+          v-if="
+            !isTemplate &&
+            showRerunBtn &&
+            (failureSize > 0 || unExecuteSize > 0) &&
+            isRerun
+          "
+          @click="rerun"
+        >
+          {{ $t("api_test.automation.rerun") }}
         </el-button>
-
       </el-tab-pane>
     </el-tabs>
   </test-plan-report-container>
@@ -62,14 +158,20 @@ import ApiResult from "@/business/plan/view/comonents/report/detail/component/Ap
 import TestPlanReportContainer from "@/business/plan/view/comonents/report/detail/TestPlanReportContainer";
 import ApiCases from "@/business/plan/view/comonents/report/detail/component/ApiCases";
 import TabPaneCount from "@/business/plan/view/comonents/report/detail/component/TabPaneCount";
-import {apiTestExecRerun} from "@/api/remote/ui/api-test";
+import { apiTestExecRerun } from "@/api/remote/ui/api-test";
 
 export default {
   name: "TestPlanApiReport",
-  components: {TabPaneCount, ApiCases, TestPlanReportContainer, ApiResult, MsFormDivider},
+  components: {
+    TabPaneCount,
+    ApiCases,
+    TestPlanReportContainer,
+    ApiResult,
+    MsFormDivider,
+  },
   data() {
     return {
-      activeName: 'first',
+      activeName: "first",
       failureSize: 0,
       errorReportSize: 0,
       unExecuteSize: 0,
@@ -80,40 +182,56 @@ export default {
   created() {
     this.showRerunBtn = !this.isShare;
   },
-  props: [
-    'report', 'planId', 'isTemplate', 'isShare', 'shareId', 'isDb'
-  ],
+  props: ["report", "planId", "isTemplate", "isShare", "shareId", "isDb"],
   computed: {
     resultEnable() {
-      let disable = this.report.config && this.report.config.api.children.result.enable === false;
-      return !disable && this.report.apiResult && (
-        (this.report.apiResult.apiCaseData && this.report.apiResult.apiCaseData.length > 0)
-        || (this.report.apiResult.apiScenarioData && this.report.apiResult.apiScenarioData.length > 0)
+      let disable =
+        this.report.config &&
+        this.report.config.api.children.result.enable === false;
+      return (
+        !disable &&
+        this.report.apiResult &&
+        ((this.report.apiResult.apiCaseData &&
+          this.report.apiResult.apiCaseData.length > 0) ||
+          (this.report.apiResult.apiScenarioData &&
+            this.report.apiResult.apiScenarioData.length > 0))
       );
     },
     failureEnable() {
-      let disable = this.report.config && this.report.config.api.children.failure.enable === false;
+      let disable =
+        this.report.config &&
+        this.report.config.api.children.failure.enable === false;
       return !disable;
     },
     errorReportEnable() {
-      let disable = this.report.config && this.report.config.api.children.errorReport && this.report.config.api.children.errorReport.enable === false;
+      let disable =
+        this.report.config &&
+        this.report.config.api.children.errorReport &&
+        this.report.config.api.children.errorReport.enable === false;
       return !disable;
     },
     unExecuteEnable() {
-      let disable = this.report.config && this.report.config.api.children.unExecute && this.report.config.api.children.unExecute.enable === false;
+      let disable =
+        this.report.config &&
+        this.report.config.api.children.unExecute &&
+        this.report.config.api.children.unExecute.enable === false;
       return !disable;
     },
     allEnable() {
-      let disable = this.report.config && this.report.config.api.children.all.enable === false;
+      let disable =
+        this.report.config &&
+        this.report.config.api.children.all.enable === false;
       return !disable;
     },
     isRerun() {
-      return ((this.report && this.report.apiFailureCases)
-        || (this.report && this.report.unExecuteCases)
-        || (this.report && this.report.scenarioFailureCases)
-        || (this.report && this.report.unExecuteScenarios)
-        || (this.report && this.report.loadFailureCases));
-    }
+      return (
+        (this.report && this.report.apiFailureCases) ||
+        (this.report && this.report.unExecuteCases) ||
+        (this.report && this.report.scenarioFailureCases) ||
+        (this.report && this.report.unExecuteScenarios) ||
+        (this.report && this.report.loadFailureCases)
+      );
+    },
   },
   watch: {
     resultEnable() {
@@ -135,13 +253,13 @@ export default {
   methods: {
     initActiveName() {
       if (this.resultEnable) {
-        this.activeName = 'first';
+        this.activeName = "first";
       } else if (this.failureEnable) {
-        this.activeName = 'second';
+        this.activeName = "second";
       } else if (this.errorReportEnable) {
-        this.activeName = 'third';
+        this.activeName = "third";
       } else if (this.allEnable) {
-        this.activeName = 'fourth';
+        this.activeName = "fourth";
       }
     },
     setFailureSize(size) {
@@ -156,8 +274,7 @@ export default {
     setAllSize(size) {
       this.allSize = size;
     },
-    handleClick(tab, event) {
-    },
+    handleClick(tab, event) {},
     rerun() {
       let type = "TEST_PLAN";
       let scenarios = [];
@@ -168,8 +285,8 @@ export default {
         reportId: this.report.id,
         scenarios: scenarios,
         cases: cases,
-        performanceCases: performanceCases
-      }
+        performanceCases: performanceCases,
+      };
       // 获取需要重跑的用例
       if (this.report && this.report.apiFailureCases) {
         this.format(cases, this.report.apiFailureCases);
@@ -188,27 +305,30 @@ export default {
       if (this.report && this.report.loadFailureCases) {
         this.format(performanceCases, this.report.loadFailureCases);
       }
-      apiTestExecRerun(rerunObj)
-        .then(res => {
-          if (res.data !== 'SUCCESS') {
-            this.$error(res.data);
-          } else {
-            this.$success(this.$t('api_test.automation.rerun_success'));
-          }
-        });
+      apiTestExecRerun(rerunObj).then((res) => {
+        if (res.data !== "SUCCESS") {
+          this.$error(res.data);
+        } else {
+          this.$success(this.$t("api_test.automation.rerun_success"));
+        }
+      });
     },
     format(cases, data) {
       if (this.report && data) {
-        data.forEach(item => {
+        data.forEach((item) => {
           if (item) {
-            let obj = {id: item.id, reportId: item.reportId, userId: item.createUser};
+            let obj = {
+              id: item.id,
+              reportId: item.reportId,
+              userId: item.createUser,
+            };
             cases.push(obj);
           }
         });
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style scoped>
@@ -218,7 +338,7 @@ export default {
   right: 10px;
   margin-right: 10px;
   z-index: 1100;
-  background-color: #F2F9EF;
-  color: #87C45D;
+  background-color: #f2f9ef;
+  color: #87c45d;
 }
 </style>
diff --git a/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanOverviewReport.vue b/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanOverviewReport.vue
index 2c2681043d..81e042d6d6 100644
--- a/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanOverviewReport.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanOverviewReport.vue
@@ -99,7 +99,6 @@ import TestPlanReportContainer from "@/business/plan/view/comonents/report/detai
 import MsInstructionsIcon from "metersphere-frontend/src/components/MsInstructionsIcon";
 import MsTag from "metersphere-frontend/src/components/MsTag";
 import { datetimeFormat } from "fit2cloud-ui/src/filters/time";
-import { getTestPlanExtReport } from "@/api/remote/plan/test-plan";
 
 export default {
   name: "TestPlanOverviewReport",
diff --git a/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanReportContent.vue b/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanReportContent.vue
index 9ec4c0078c..ae45b52eb5 100644
--- a/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanReportContent.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanReportContent.vue
@@ -85,7 +85,6 @@
 <script>
 import TestPlanFunctionalReport from "@/business/plan/view/comonents/report/detail/TestPlanFunctionalReport";
 import {
-  getShareTestPlanExtReport,
   getShareTestPlanReport,
   getShareTestPlanReportContent,
   getTestPlanReport,
@@ -254,6 +253,8 @@ export default {
             this.loading = false;
             this.report = r.data;
             this.report.config = this.getDefaultConfig(this.report);
+            this.runMode = this.report.runMode;
+            this.resourcePool = this.report.resourcePool;
           });
         }
       } else {
@@ -268,20 +269,6 @@ export default {
           });
         }
       }
-      if (!this.isTemplate) {
-        if (this.isShare) {
-          getShareTestPlanExtReport(
-            this.shareId,
-            this.planId,
-            this.reportId
-          ).then((response) => {
-            if (response.data) {
-              this.runMode = response.data.runMode;
-              this.resourcePool = response.data.resourcePool;
-            }
-          });
-        }
-      }
     },
     getDefaultConfig(report) {
       let dbConfig = null;
diff --git a/test-track/frontend/src/business/plan/view/comonents/ui/TestCaseUiScenarioRelevance.vue b/test-track/frontend/src/business/plan/view/comonents/ui/TestCaseUiScenarioRelevance.vue
index b8ff701d72..8f7e4eda3b 100644
--- a/test-track/frontend/src/business/plan/view/comonents/ui/TestCaseUiScenarioRelevance.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/ui/TestCaseUiScenarioRelevance.vue
@@ -1,11 +1,11 @@
 <template>
-
   <test-case-relevance-base
     @setProject="setProject"
     @save="saveCaseRelevance"
     :plan-id="planId"
-    ref="baseRelevance">
-
+    :is-saving="isSaving"
+    ref="baseRelevance"
+  >
     <template v-slot:aside>
       <ui-scenario-module
         @nodeSelectEvent="nodeChange"
@@ -14,7 +14,8 @@
         :relevance-project-id="projectId"
         :is-read-only="true"
         :show-case-num="false"
-        ref="nodeTree"/>
+        ref="nodeTree"
+      />
     </template>
 
     <relevance-ui-scenario-list
@@ -24,24 +25,20 @@
       :plan-id="planId"
       :project-id="projectId"
       @selectCountChange="setSelectCounts"
-      ref="apiScenarioList"/>
-
+      ref="apiScenarioList"
+    />
   </test-case-relevance-base>
-
 </template>
 
 <script>
-
 import TestCaseRelevanceBase from "../base/TestCaseRelevanceBase";
-import {strMapToObj} from "metersphere-frontend/src/utils";
-import {ENV_TYPE} from "metersphere-frontend/src/utils/constants";
+import { strMapToObj } from "metersphere-frontend/src/utils";
+import { ENV_TYPE } from "metersphere-frontend/src/utils/constants";
 import RelevanceUiScenarioList from "@/business/plan/view/comonents/ui/RelevanceUiScenarioList";
-import {testPlanAutoCheck} from "@/api/remote/plan/test-plan";
-import {
-  testPlanUiScenarioRelevanceListIds
-} from "@/api/remote/ui/test-plan-ui-scenario-case";
+import { testPlanAutoCheck } from "@/api/remote/plan/test-plan";
+import { testPlanUiScenarioRelevanceListIds } from "@/api/remote/ui/test-plan-ui-scenario-case";
 import UiScenarioModule from "@/business/plan/view/comonents/ui/UiScenarioModule";
-import {uiAutomationRelevance} from "@/api/remote/ui/api-scenario";
+import { uiAutomationRelevance } from "@/api/remote/ui/api-scenario";
 
 export default {
   name: "TestCaseUiScenarioRelevance",
@@ -60,17 +57,18 @@ export default {
       trashEnable: false,
       condition: {},
       currentRow: {},
-      projectId: ""
+      isSaving: false,
+      projectId: "",
     };
   },
   props: {
     planId: {
-      type: String
+      type: String,
     },
     versionEnable: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   watch: {
     planId() {
@@ -125,41 +123,42 @@ export default {
       param.environmentType = envType;
       param.envGroupId = envGroupId;
       this.loading = true;
-      uiAutomationRelevance(param)
-        .then(() => {
-          this.loading = false;
-          this.$success(this.$t('commons.save_success'));
-          this.$emit('refresh');
-          this.refresh();
-          this.autoCheckStatus();
-          this.$refs.baseRelevance.close();
-        });
+      uiAutomationRelevance(param).then(() => {
+        this.loading = false;
+        this.$success(this.$t("commons.save_success"));
+        this.$emit("refresh");
+        this.refresh();
+        this.autoCheckStatus();
+        this.$refs.baseRelevance.close();
+      });
     },
     getAllId(param) {
       return new Promise((resolve) => {
-        testPlanUiScenarioRelevanceListIds(param)
-          .then((r) => {
-            resolve(r.data);
-          });
+        testPlanUiScenarioRelevanceListIds(param).then((r) => {
+          resolve(r.data);
+        });
       });
     },
     async saveCaseRelevance() {
+      this.isSaving = true;
       let selectIds = [];
       let selectRows = this.$refs.apiScenarioList.selectRows;
       const envMap = this.$refs.apiScenarioList.projectEnvMap;
       let map = this.$refs.apiScenarioList.map;
       let envGroupId = this.$refs.apiScenarioList.envGroupId;
 
-      selectRows.forEach(row => {
+      selectRows.forEach((row) => {
         selectIds.push(row.id);
-      })
+      });
       if (selectIds.length < 1) {
-        this.$warning(this.$t('test_track.plan_view.please_choose_test_case'));
+        this.isSaving = false;
+        this.$warning(this.$t("test_track.plan_view.please_choose_test_case"));
         return;
       }
 
       if (!envMap || envMap.size == 0) {
-        this.$warning(this.$t('api_test.environment.select_environment'));
+        this.isSaving = false;
+        this.$warning(this.$t("api_test.environment.select_environment"));
         return;
       }
 
@@ -180,14 +179,19 @@ export default {
       uiAutomationRelevance(param)
         .then(() => {
           this.loading = false;
-          this.$success(this.$t('commons.save_success'));
-          this.$emit('refresh');
+          this.isSaving = false;
+          this.$success(this.$t("commons.save_success"));
+          this.$emit("refresh");
           this.refresh();
           this.autoCheckStatus();
           this.$refs.baseRelevance.close();
+        })
+        .catch(() => {
+          this.isSaving = false;
         });
     },
-    autoCheckStatus() { //  检查执行结果，自动更新计划状态
+    autoCheckStatus() {
+      //  检查执行结果，自动更新计划状态
       if (!this.planId) {
         return;
       }
@@ -195,13 +199,12 @@ export default {
     },
     setSelectCounts(data) {
       this.$refs.baseRelevance.selectCounts = data;
-    }
-  }
+    },
+  },
 };
 </script>
 
 <style scoped>
-
 :deep(.select-menu) {
   margin-bottom: 15px;
 }
@@ -222,5 +225,4 @@ export default {
   left: -30px;
   width: 30px;
 }
-
 </style>