From dd3b12638136972b4e90815b25e56736745aa53e Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 19 Jul 2022 16:40:36 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=8E=AF=E5=A2=83=E9=BB=98=E8=AE=A4=E4=B8=BA?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1014832 --user=李玉号 【项目设置】项目下导入环境，不需要选择环境，默认为当前环境
https://www.tapd.cn/55049933/s/1204441
---
 .../project/menu/EnvironmentImport.vue           | 16 +++++++++++++---
 .../components/project/menu/EnvironmentList.vue  |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/project/menu/EnvironmentImport.vue b/frontend/src/business/components/project/menu/EnvironmentImport.vue
index 1b38a3c464..e43380935d 100644
--- a/frontend/src/business/components/project/menu/EnvironmentImport.vue
+++ b/frontend/src/business/components/project/menu/EnvironmentImport.vue
@@ -1,11 +1,11 @@
 <template>
   <el-dialog :visible="dialogVisible" :title="dialogTitle"
              @close="close" :close-on-click-modal="false"
-              width="50%">
+              :width="!toImportProjectId ? `50%` : `25%`">
     <el-form>
       <el-row>
         <el-col :span="6">
-          <div class="project-item">
+          <div class="project-item" v-if="!toImportProjectId">
             <div style="margin-bottom: 10px">
               {{$t('project.select')}}
             </div>
@@ -52,6 +52,12 @@ export default {
         return [];
       }
     },
+    toImportProjectId: {
+      type: String,
+      default() {
+        return "";
+      }
+    }
   },
   data() {
     return {
@@ -92,7 +98,11 @@ export default {
               try {
                 JSON.parse(fileString).map(env => {
                   //projectId为空字符串要转换为null，空字符串会被认为有projectId
-                  env.projectId = this.currentProjectId === '' ? null : this.currentProjectId;
+                  if (this.toImportProjectId) {
+                    env.projectId = this.toImportProjectId;
+                  } else {
+                    env.projectId = this.currentProjectId === '' ? null : this.currentProjectId;
+                  }
                   if (!env.projectId) {
                     this.$warning(this.$t('api_test.environment.project_warning'));
                     return;
diff --git a/frontend/src/business/components/project/menu/EnvironmentList.vue b/frontend/src/business/components/project/menu/EnvironmentList.vue
index fecf1f5571..d4d184216b 100644
--- a/frontend/src/business/components/project/menu/EnvironmentList.vue
+++ b/frontend/src/business/components/project/menu/EnvironmentList.vue
@@ -68,7 +68,7 @@
                             :project-id="currentProjectId" @refreshAfterSave="refresh">
           </environment-edit>
         </el-dialog>
-        <environment-import :project-list="projectList" @refresh="refresh" ref="envImport"></environment-import>
+        <environment-import :project-list="projectList" :to-import-project-id="currentProjectId" @refresh="refresh" ref="envImport"></environment-import>
 
         <el-dialog title="域名列表" :visible.sync="domainVisible">
           <el-table :data="conditions">