From 69efcbbeddfddf68f2e60a12bb0ed05ba8e01666 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Fri, 15 Apr 2022 15:52:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=8E=AF=E5=A2=83=E8=AE=BE=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1011999 --user=宋天阳 【环境配置】一个项目有多个环境，同时修改多个环境变量，只能报错最后修改的一个
https://www.tapd.cn/55049933/s/1135776
---
 .../test/components/ApiEnvironmentConfig.vue  |  6 +-
 .../environment/EnvironmentEdit.vue           | 73 ++++++++++++-------
 .../common/components/MsDialogHeader.vue      | 20 ++---
 .../project/menu/EnvironmentList.vue          |  2 +-
 .../comonents/load/LoadCaseReportView.vue     |  6 ++
 .../report/detail/TestPlanReportButtons.vue   |  6 +-
 6 files changed, 69 insertions(+), 44 deletions(-)

diff --git a/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue b/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue
index e302716787..d3d4956a6a 100644
--- a/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue
+++ b/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue
@@ -2,17 +2,13 @@
   <el-dialog :close-on-click-modal="false" :title="$t('api_test.environment.environment_config')"
              :visible.sync="visible" class="environment-dialog" width="80%" top="50px"
              @close="close" append-to-body destroy-on-close ref="environmentConfig">
-    <template #title>
-      <ms-dialog-header :title="$t('api_test.environment.environment_config')"
-                        @cancel="visible = false"
-                        @confirm="save"/>
-    </template>
     <el-container v-loading="result.loading">
       <ms-aside-item :enable-aside-hidden="false" :title="$t('api_test.environment.environment_list')"
                      :data="environments" :item-operators="environmentOperators" :add-fuc="addEnvironment"
                      :env-add-permission="ENV_CREATE"
                      :delete-fuc="deleteEnvironment" @itemSelected="environmentSelected" ref="environmentItems"/>
       <environment-edit :if-create="ifCreate" :project-id="projectId" :environment="currentEnvironment" ref="environmentEdit" :is-read-only="isReadOnly"
+                        @confirm="save"
                         @close="close"/>
     </el-container>
   </el-dialog>
diff --git a/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue b/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue
index dfa97880fd..3222ea2995 100644
--- a/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue
+++ b/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue
@@ -1,11 +1,26 @@
 <template>
   <el-main v-loading="result.loading" class="environment-edit" style="margin-left: 0px">
     <el-form :model="environment" :rules="rules" ref="environment" label-width="80px">
-      <el-form-item prop="name" :label="$t('api_test.environment.name')">
-        <el-input v-model="environment.name" :disabled="isReadOnly" :placeholder="this.$t('commons.input_name')"
-                  clearable/>
-      </el-form-item>
-
+      <el-row>
+        <el-col :span="20">
+          <el-form-item prop="name" :label="$t('api_test.environment.name')">
+            <el-input v-model="environment.name" :disabled="isReadOnly" :placeholder="this.$t('commons.input_name')"
+                      clearable/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <div style="float: right;width: fit-content;">
+            <div style="float: left; margin-right: 8px;">
+              <slot name="other"></slot>
+            </div>
+            <div class="ms_btn">
+              <el-button type="primary" @click="confirm" @keydown.enter.native.prevent>
+                {{ $t('commons.confirm') }}
+              </el-button>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
 
       <el-tabs v-model="activeName">
 
@@ -82,18 +97,19 @@
                 :label="$t('error_report_library.use_error_report')"
                 prop="status">
                 <el-switch v-model="environment.config.useErrorCode" style="margin-right: 10px" :disabled="isReadOnly"/>
-                {{$t('error_report_library.use_desc')}}
+                {{ $t('error_report_library.use_desc') }}
               </el-form-item>
             </el-col>
           </el-row>
-          <global-assertions :is-read-only="isReadOnly" :assertions="environment.config.assertions" :is-show-json-path-suggest="false"/>
+          <global-assertions :is-read-only="isReadOnly" :assertions="environment.config.assertions"
+                             :is-show-json-path-suggest="false"/>
         </el-tab-pane>
       </el-tabs>
-<!--      <div class="environment-footer">-->
-<!--        <ms-dialog-footer-->
-<!--          @cancel="cancel"-->
-<!--          @confirm="save()"/>-->
-<!--      </div>-->
+      <!--      <div class="environment-footer">-->
+      <!--        <ms-dialog-footer-->
+      <!--          @cancel="cancel"-->
+      <!--          @confirm="save()"/>-->
+      <!--      </div>-->
     </el-form>
     <ms-change-history ref="changeHistory"/>
   </el-main>
@@ -112,7 +128,7 @@ import MsEnvironmentCommonConfig from "./EnvironmentCommonConfig";
 import MsEnvironmentSSLConfig from "./EnvironmentSSLConfig";
 import MsApiAuthConfig from "@/business/components/api/definition/components/auth/ApiAuthConfig";
 import MsTcpConfig from "@/business/components/api/test/components/request/tcp/TcpConfig";
-import {getUUID,hasLicense} from "@/common/js/utils";
+import {getUUID, hasLicense} from "@/common/js/utils";
 import Jsr233ProcessorContent from "@/business/components/api/automation/scenario/common/Jsr233ProcessorContent";
 import {createComponent} from "@/business/components/api/definition/components/jmeter/components";
 import EnvironmentGlobalScript from "@/business/components/api/test/components/environment/EnvironmentGlobalScript";
@@ -192,12 +208,12 @@ export default {
     }
     if (!this.environment.config.assertions) {
       this.environment.config.assertions = {
-        duration:{duration:0},
-        regex:[],
-        jsonPath:[],
-        xpath2:[],
-        jsr223:[],
-        document:{type:"json",data:{json:[],xml:[]}},
+        duration: {duration: 0},
+        regex: [],
+        jsonPath: [],
+        xpath2: [],
+        jsr223: [],
+        document: {type: "json", data: {json: [], xml: []}},
       };
     }
   },
@@ -241,12 +257,12 @@ export default {
       }
       if (!this.environment.config.assertions) {
         this.environment.config.assertions = {
-          duration:{duration:0},
-          regex:[],
-          jsonPath:[],
-          xpath2:[],
-          jsr223:[],
-          document:{type:"json",data:{json:[],xml:[]}},
+          duration: {duration: 0},
+          regex: [],
+          jsonPath: [],
+          xpath2: [],
+          jsr223: [],
+          document: {type: "json", data: {json: [], xml: []}},
         };
       }
 
@@ -258,8 +274,8 @@ export default {
     }
   },
   computed: {
-    hasLicense(){
-      let license= hasLicense();
+    hasLicense() {
+      let license = hasLicense();
       return license;
     },
   },
@@ -380,6 +396,9 @@ export default {
     cancel() {
       this.$emit('close');
     },
+    confirm() {
+      this.$emit("confirm");
+    },
     clearValidate() {
       this.$refs["environment"].clearValidate();
     },
diff --git a/frontend/src/business/components/common/components/MsDialogHeader.vue b/frontend/src/business/components/common/components/MsDialogHeader.vue
index 011534c0ce..a7dfaf3eb3 100644
--- a/frontend/src/business/components/common/components/MsDialogHeader.vue
+++ b/frontend/src/business/components/common/components/MsDialogHeader.vue
@@ -1,9 +1,9 @@
 <template>
 
   <div class="msDialogHeader">
-    <span style="float: left;font-size: 18px;color: #303133;">{{title}}</span>
+    <span style="float: left;font-size: 18px;color: #303133;">{{ title }}</span>
 
-    <div style="float: right;width: fit-content;">
+    <div v-if="!hideButton" style="float: right;width: fit-content;">
       <div style="float: left; margin-right: 8px;">
         <slot name="other"></slot>
       </div>
@@ -30,6 +30,7 @@ export default {
         return 'small';
       }
     },
+    hideButton: Boolean,
     enableCancel: Boolean
   },
   methods: {
@@ -44,11 +45,12 @@ export default {
 </script>
 
 <style scoped>
-  .ms_btn {
-    float: right;
-    margin-right: 50px;
-  }
-  .msDialogHeader {
-    margin-bottom: 5px;
-  }
+.ms_btn {
+  float: right;
+  margin-right: 50px;
+}
+
+.msDialogHeader {
+  margin-bottom: 5px;
+}
 </style>
diff --git a/frontend/src/business/components/project/menu/EnvironmentList.vue b/frontend/src/business/components/project/menu/EnvironmentList.vue
index aff1cda7f7..8e43c3a48b 100644
--- a/frontend/src/business/components/project/menu/EnvironmentList.vue
+++ b/frontend/src/business/components/project/menu/EnvironmentList.vue
@@ -59,7 +59,7 @@
         <!-- 创建、编辑、复制环境时的对话框 -->
         <el-dialog :visible.sync="dialogVisible" :close-on-click-modal="false" width="66%" top="50px">
           <template #title>
-            <ms-dialog-header :title="dialogTitle"
+            <ms-dialog-header :title="dialogTitle" :hide-button="true"
                               @cancel="dialogVisible = false"
                               @confirm="save"/>
           </template>
diff --git a/frontend/src/business/components/track/plan/view/comonents/load/LoadCaseReportView.vue b/frontend/src/business/components/track/plan/view/comonents/load/LoadCaseReportView.vue
index d63a68de88..def3c69474 100644
--- a/frontend/src/business/components/track/plan/view/comonents/load/LoadCaseReportView.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/load/LoadCaseReportView.vue
@@ -52,12 +52,18 @@
             <span class="ms-report-time-desc" v-if="startTime !== '0'">
               {{ $t('report.test_start_time') }}：{{ startTime | timestampFormatDate }}
             </span>
+            <span class="ms-report-time-desc" v-else-if="planReportTemplate && planReportTemplate.startTime">
+              {{ $t('report.test_start_time') }}：{{ planReportTemplate.startTime | timestampFormatDate }}
+            </span>
             <span class="ms-report-time-desc" v-else>
               {{ $t('report.test_start_time') }}：-
             </span>
             <span class="ms-report-time-desc" v-if="report.status === 'Completed' && endTime !== '0'">
               {{ $t('report.test_end_time') }}：{{ endTime | timestampFormatDate }}
             </span>
+            <span class="ms-report-time-desc" v-else-if="planReportTemplate && planReportTemplate.endTime">
+              {{ $t('report.test_end_time') }}：{{ planReportTemplate.endTime | timestampFormatDate }}
+            </span>
             <span class="ms-report-time-desc" v-else>
               {{ $t('report.test_end_time') }}：-
             </span>
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportButtons.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportButtons.vue
index 3ea088e1a7..a175925bef 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportButtons.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportButtons.vue
@@ -128,8 +128,10 @@ export default {
       if (this.isShare) {
         config.url = '/share' + config.url;
       }
-      this.result = this.$download(config, this.report.name + '.html');
-    }
+      this.result = this.$download(config, this.report.name + '.html',()=>{
+        this.$success(this.$t("organization.integration.successful_operation"));
+      });
+    },
   }
 }
 </script>