From 9311cd828af960e3c1bdf207bda88c8a95336608 Mon Sep 17 00:00:00 2001
From: junhong <junhong.zhou@fit2cloud.com>
Date: Mon, 14 Feb 2022 22:42:07 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?=
 =?UTF-8?q?=20=E5=85=A8=E5=B1=80=E5=89=8D=E5=90=8E=E7=BD=AE=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E6=96=B0=E5=A2=9E=E5=8F=98=E6=9B=B4=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../environment/EnvironmentEdit.vue           | 31 +++++++++----------
 .../project/menu/EnvironmentList.vue          |  5 ++-
 .../workspace/environment/EnvironmentList.vue | 12 +++----
 3 files changed, 24 insertions(+), 24 deletions(-)

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 8cad79be4d..7dd4e3fba4 100644
--- a/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue
+++ b/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue
@@ -5,6 +5,10 @@
       <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/>
+        <ms-dialog-header class="ms-opt-btn"
+          :btn-size="'medium'"
+          @cancel="cancel"
+          @confirm="save()"/>
       </el-form-item>
 
 
@@ -30,7 +34,7 @@
                                        :is-read-only="isReadOnly"/>
         </el-tab-pane>
         <el-tab-pane :label="$t('api_test.definition.request.all_pre_script')" name="prescript">
-          <div style="padding-bottom: 20px;">
+          <div style="padding-bottom: 20px;" v-if="!ifCreate">
             <el-link style="float: right;" type="primary" @click="openHis">
               {{ $t('operating_log.change_history') }}
             </el-link>
@@ -47,7 +51,7 @@
             @updateGlobalScript="updateGlobalScript"/>
         </el-tab-pane>
         <el-tab-pane :label="$t('api_test.definition.request.all_post_script')" name="postscript">
-          <div style="padding-bottom: 20px;">
+          <div style="padding-bottom: 20px;" v-if="!ifCreate">
             <el-link style="float: right;" type="primary" @click="openHis">
               {{ $t('operating_log.change_history') }}
             </el-link>
@@ -138,6 +142,10 @@ export default {
       type: Boolean,
       default: false
     },
+    ifCreate: {
+      type: Boolean,
+      default: false
+    },
   },
   data() {
     return {
@@ -382,20 +390,11 @@ export default {
 
 <style scoped>
 
-.el-main {
-  border: solid 1px #EBEEF5;
-  margin-left: 200px;
-  min-height: 400px;
-  max-height: 550px;
-}
-
-.el-row {
-  margin-bottom: 15px;
-}
-
-.environment-footer {
-  margin-top: 15px;
-  float: right;
+.ms-opt-btn {
+  position: fixed;
+  right: 290px;
+  z-index: 10;
+  top: 80px;
 }
 
 span {
diff --git a/frontend/src/business/components/project/menu/EnvironmentList.vue b/frontend/src/business/components/project/menu/EnvironmentList.vue
index 15989349c9..c3c5104571 100644
--- a/frontend/src/business/components/project/menu/EnvironmentList.vue
+++ b/frontend/src/business/components/project/menu/EnvironmentList.vue
@@ -58,7 +58,7 @@
 
         <!-- 创建、编辑、复制环境时的对话框 -->
         <el-dialog :visible.sync="dialogVisible" :close-on-click-modal="false" :title="dialogTitle" width="66%" top="50px">
-          <environment-edit :environment="currentEnvironment" ref="environmentEdit" @close="close"
+          <environment-edit :if-create="ifCreate" :environment="currentEnvironment" ref="environmentEdit" @close="close"
                             :project-id="currentProjectId" @refreshAfterSave="refresh">
           </environment-edit>
         </el-dialog>
@@ -162,6 +162,7 @@ export default {
       projectIds: [],   //当前工作空间所拥有的所有项目id
       projectFilters: [],
       screenHeight: 'calc(100vh - 195px)',
+      ifCreate: false, //是否是创建环境
     }
   },
   created() {
@@ -253,6 +254,7 @@ export default {
       this.dialogVisible = true;
       this.currentEnvironment = new Environment();
       this.currentEnvironment.projectId = this.currentProjectId;
+      this.ifCreate = true;
     },
     search() {
       this.list()
@@ -265,6 +267,7 @@ export default {
       parseEnvironment(temEnv);   //parseEnvironment会改变环境对象的内部结构，从而影响前端列表的显示，所以复制一个环境对象作为代替
       this.currentEnvironment = temEnv;
       this.dialogVisible = true;
+      this.ifCreate = false;
     },
 
     copyEnv(environment) {
diff --git a/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue b/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue
index 1121401b97..eed97f8471 100644
--- a/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue
+++ b/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue
@@ -63,11 +63,6 @@
 
     <!-- 创建、编辑、复制环境时的对话框 -->
     <el-dialog :visible.sync="dialogVisible" :close-on-click-modal="false" :title="dialogTitle" top="50px" width="66%">
-      <ms-dialog-header
-        style="margin-bottom: 10px; float: right;"
-        :btn-size="'medium'"
-        @cancel="close"
-        @confirm="save()"/>
       <el-form label-width="80px" :rules="rules" style="display: flow-root">
         <el-form-item class="project-item" prop="currentProjectId" :label="$t('project.select')">
           <el-select @change="handleProjectChange" v-model="currentProjectId" filterable clearable>
@@ -75,7 +70,7 @@
           </el-select>
         </el-form-item>
       </el-form>
-      <environment-edit :environment="currentEnvironment" ref="environmentEdit" @close="close"
+      <environment-edit :if-create="ifCreate" :environment="currentEnvironment" ref="environmentEdit" @close="close"
                         :project-id="currentProjectId" @refreshAfterSave="refresh">
       </environment-edit>
     </el-dialog>
@@ -196,7 +191,8 @@ export default {
         {
           name: this.$t('workspace.env_group.batch_add_to_ws'), handleClick: this.batchAddToGroup
         },
-      ]
+      ],
+      ifCreate: false, //是否是创建环境
     };
   },
   created() {
@@ -301,6 +297,7 @@ export default {
       this.currentProjectId = '';
       this.dialogTitle = this.$t('api_test.environment.create');
       this.dialogVisible = true;
+      this.ifCreate = true;
       this.currentEnvironment = new Environment();
     },
     search() {
@@ -314,6 +311,7 @@ export default {
       parseEnvironment(temEnv);   //parseEnvironment会改变环境对象的内部结构，从而影响前端列表的显示，所以复制一个环境对象作为代替
       this.currentEnvironment = temEnv;
       this.dialogVisible = true;
+      this.ifCreate = false;
     },
     save(){
       this.$refs.environmentEdit.save();