From 1d6e4ef4a89f153eff9df14c6f0b1bfb114073dc Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 15 Aug 2023 16:48:15 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E9=BB=98=E8=AE=A4=E7=8E=AF=E5=A2=83=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1028768 --user=赵勇 【接口测试】场景列表-批量执行-默认环境展示了环境明细 https://www.tapd.cn/55049933/s/1403943

Signed-off-by: fit2-zhao <yong.zhao@fit2cloud.com>
---
 .../automation/scenario/EnvSelectPopover.vue  | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/api-test/frontend/src/business/automation/scenario/EnvSelectPopover.vue b/api-test/frontend/src/business/automation/scenario/EnvSelectPopover.vue
index 9b8ccc0b9d..52432edd75 100644
--- a/api-test/frontend/src/business/automation/scenario/EnvSelectPopover.vue
+++ b/api-test/frontend/src/business/automation/scenario/EnvSelectPopover.vue
@@ -2,7 +2,9 @@
   <div>
     <el-radio-group v-model="radio" style="width: 100%" @change="radioChange" class="radio-change">
       <el-radio :label="ENV_TYPE.JSON">{{ $t('workspace.env_group.env_list') }}</el-radio>
-      <el-radio :label="ENV_TYPE.GROUP"  v-if="isScenario">{{ $t('workspace.env_group.name') }}<i class="el-icon-tickets mode-span" @click="viewGroup"></i></el-radio>
+      <el-radio :label="ENV_TYPE.GROUP" v-if="isScenario"
+        >{{ $t('workspace.env_group.name') }}<i class="el-icon-tickets mode-span" @click="viewGroup"></i
+      ></el-radio>
     </el-radio-group>
     <div v-for="(pe, pIndex) in eventData" :key="pe.id" v-show="!radio || radio === ENV_TYPE.JSON">
       <el-card shadow="never" style="margin-top: 8px; background: #f5f6f7; border-radius: 4px">
@@ -26,14 +28,6 @@
               $t('api_test.environment.choose_new_environment')
             }}</el-radio>
           </el-radio-group>
-          <el-tag
-            v-show="!pe.showEnvSelect"
-            v-for="(itemName, index) in selectedEnvName.get(pe.id)"
-            :key="index"
-            size="mini"
-            style="margin-left: 0; margin-right: 2px; margin-top: 8px"
-            >{{ itemName }}</el-tag
-          >
           <el-select
             v-show="pe.showEnvSelect"
             v-model="pe['selectEnv']"
@@ -51,20 +45,27 @@
         </div>
       </el-card>
     </div>
-    <div v-show="radio === ENV_TYPE.GROUP ">
-      <div >
-        <el-select  v-show="!hasOptionGroup" v-model="envGroupId" :placeholder="$t('workspace.env_group.select')" @change="chooseEnvGroup"
-                   style="margin-top: 8px;width: 100%;" size="small">
-          <el-option v-for="(group, index) in groups" :key="index"
-                     :disabled="group.disabled"
-                     :label="group.name"
-                     :value="group.id"/>
+    <div v-show="radio === ENV_TYPE.GROUP">
+      <div>
+        <el-select
+          v-show="!hasOptionGroup"
+          v-model="envGroupId"
+          :placeholder="$t('workspace.env_group.select')"
+          @change="chooseEnvGroup"
+          style="margin-top: 8px; width: 100%"
+          size="small">
+          <el-option
+            v-for="(group, index) in groups"
+            :key="index"
+            :disabled="group.disabled"
+            :label="group.name"
+            :value="group.id" />
         </el-select>
         <el-select
           v-show="hasOptionGroup"
           v-model="envGroupId"
           :placeholder="$t('workspace.env_group.select')"
-          style="margin-top: 8px;width: 100%;"
+          style="margin-top: 8px; width: 100%"
           size="small"
           @change="chooseEnvGroup"
           clearable>
@@ -79,33 +80,33 @@
           </el-option-group>
         </el-select>
       </div>
-      <el-dialog :visible="visible" append-to-body :title="$t('workspace.env_group.name')" @close="visible = false"
-                 style="height: 800px;">
+      <el-dialog
+        :visible="visible"
+        append-to-body
+        :title="$t('workspace.env_group.name')"
+        @close="visible = false"
+        style="height: 800px">
         <template>
-          <environment-group style="overflow-y: auto;"
-                             :screen-height="'350px'"
-                             :read-only="true"
-          ></environment-group>
+          <environment-group style="overflow-y: auto" :screen-height="'350px'" :read-only="true"></environment-group>
         </template>
       </el-dialog>
     </div>
     <!-- 对环境组选项进行分类 可用｜不可用 -->
-
   </div>
 </template>
 
 <script>
 import { ENV_TYPE } from 'metersphere-frontend/src/utils/constants';
-import { environmentGetALL,getEnvironmentOptions } from 'metersphere-frontend/src/api/environment';
+import { environmentGetALL, getEnvironmentOptions } from 'metersphere-frontend/src/api/environment';
 import MsTag from 'metersphere-frontend/src/components/MsTag';
 import { parseEnvironment } from 'metersphere-frontend/src/model/EnvironmentModel';
 import { getEnvironmentByProjectId } from '@/api/api-environment';
 import EnvironmentGroup from '@/business/commons/EnvironmentGroupList';
-import EnvGroupWithOption from "@/business/automation/scenario/EnvGroupWithOption";
+import EnvGroupWithOption from '@/business/automation/scenario/EnvGroupWithOption';
 
 export default {
   name: 'EnvSelectPopover',
-  components: { EnvironmentGroup,MsTag,EnvGroupWithOption},
+  components: { EnvironmentGroup, MsTag, EnvGroupWithOption },
   data() {
     return {
       radio: this.environmentType,
@@ -170,8 +171,8 @@ export default {
       this.initDefaultEnv();
       this.getgroups();
     },
-    chooseEnvGroup(envGroupId){
-      this.$emit("setEnvGroup", envGroupId);
+    chooseEnvGroup(envGroupId) {
+      this.$emit('setEnvGroup', envGroupId);
     },
     radioChange(val) {
       this.$emit('update:environmentType', val);
@@ -280,7 +281,6 @@ export default {
         this.eventData[index].expendStatus = 'open';
       }
     },
-
   },
 };
 </script>