From 7dfa50d348fa5dd473a356b8b181e3d95cc50492 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 11 Mar 2021 17:03:29 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?=
 =?UTF-8?q?=20=E4=BF=9D=E5=AD=98=E7=94=A8=E4=BE=8B=E6=9C=80=E5=90=8E?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/sampler/MsDubboSampler.java       |  3 ++
 .../request/sampler/MsJDBCSampler.java        |  3 ++
 .../components/case/ApiCaseHeader.vue         | 44 ++-----------------
 .../components/case/ApiCaseItem.vue           | 13 ++++--
 .../components/case/ApiCaseList.vue           | 29 ++++++++----
 .../components/case/MsEnvironmentSelect.vue   | 11 +++--
 6 files changed, 47 insertions(+), 56 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsDubboSampler.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsDubboSampler.java
index 43f0534cf5..36e85f2570 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsDubboSampler.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsDubboSampler.java
@@ -52,6 +52,9 @@ public class MsDubboSampler extends MsTestElement {
     @JSONField(ordinal = 59)
     private List<KeyValue> attachmentArgs;
 
+    @JSONField(ordinal = 60)
+    private String useEnvironment;
+
 //    @JSONField(ordinal = 60)
 //    private Object requestResult;
 
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java
index 1b44c9141d..3411db8234 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java
@@ -53,6 +53,9 @@ public class MsJDBCSampler extends MsTestElement {
     @JSONField(ordinal = 29)
     private String protocol = "SQL";
 
+    @JSONField(ordinal = 30)
+    private String useEnvironment;
+
     @Override
     public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
         if (this.getReferenced() != null && MsTestElementConstants.REF.name().equals(this.getReferenced())) {
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseHeader.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseHeader.vue
index 03a44c66da..3b981d48be 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseHeader.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseHeader.vue
@@ -47,6 +47,7 @@
             <ms-environment-select
               :project-id="projectId"
               :is-read-only="isReadOnly"
+              :useEnvironment='useEnvironment'
               @setEnvironment="setEnvironment"/>
           </div>
         </el-col>
@@ -65,7 +66,6 @@
 <script>
 
   import ApiEnvironmentConfig from "../../../test/components/ApiEnvironmentConfig";
-  import {parseEnvironment} from "../../../test/model/EnvironmentModel";
   import MsTag from "../../../../common/components/MsTag";
   import MsEnvironmentSelect from "./MsEnvironmentSelect";
   import {API_METHOD_COLOUR} from "../../model/JsonData";
@@ -76,8 +76,6 @@
     components: {MsEnvironmentSelect, MsTag, ApiEnvironmentConfig, MsTableAdvSearchBar},
     data() {
       return {
-        environments: [],
-        environment: {},
         methodColorMap: new Map(API_METHOD_COLOUR),
         isSelectAll: false
       }
@@ -88,6 +86,7 @@
       priorities: Array,
       apiCaseList: Array,
       isReadOnly: Boolean,
+      useEnvironment: String,
       isCaseEdit: Boolean,
       condition: {
         type: Object,
@@ -97,50 +96,15 @@
       }
     },
     created() {
-      this.environment = undefined;
-      this.getEnvironments();
     },
     watch: {
-      environment() {
-        this.$emit('setEnvironment', this.environment);
-      },
       isSelectAll() {
         this.$emit('selectAll', this.isSelectAll);
-      }
+      },
     },
     methods: {
-      getEnvironments() {
-        if (this.projectId) {
-          this.$get('/api/environment/list/' + this.projectId, response => {
-            this.environments = response.data;
-            this.environments.forEach(environment => {
-              parseEnvironment(environment);
-            });
-          });
-        } else {
-          this.environment = undefined;
-        }
-      },
-      openEnvironmentConfig() {
-        if (!this.projectId) {
-          this.$error(this.$t('api_test.select_project'));
-          return;
-        }
-        this.$refs.environmentConfig.open(this.projectId);
-      },
-      environmentChange(value) {
-        for (let i in this.environments) {
-          if (this.environments[i].id === value) {
-            this.environment = this.environments[i];
-            break;
-          }
-        }
-      },
-      environmentConfigClose() {
-        this.getEnvironments();
-      },
       setEnvironment(data) {
-        this.$emit('setEnvironment', data);
+        this.$emit('setEnvironment', data.id);
       },
       search() {
         if (this.priorities && this.condition.order) {
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
index 76c6bb56f7..f39fce3b76 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
@@ -79,14 +79,14 @@
           </div>
         </el-col>
       </el-row>
-      <el-divider ></el-divider>
+      <el-divider></el-divider>
     </div>
 
     <!-- 请求参数-->
     <el-collapse-transition>
       <div v-if="apiCase.active||type==='detail'">
         <p class="tip">{{ $t('api_test.definition.request.req_param') }} </p>
-        <ms-api-request-form  :isShowEnable="true" :showScript="true" :is-read-only="isReadOnly" :headers="apiCase.request.headers " :request="apiCase.request" v-if="api.protocol==='HTTP'"/>
+        <ms-api-request-form :isShowEnable="true" :showScript="true" :is-read-only="isReadOnly" :headers="apiCase.request.headers " :request="apiCase.request" v-if="api.protocol==='HTTP'"/>
         <ms-tcp-basis-parameters :showScript="true" :request="apiCase.request" v-if="api.protocol==='TCP'"/>
         <ms-sql-basis-parameters :showScript="true" :request="apiCase.request" v-if="api.protocol==='SQL'"/>
         <ms-dubbo-basis-parameters :showScript="true" :request="apiCase.request" v-if="api.protocol==='DUBBO'"/>
@@ -169,7 +169,7 @@
           return {}
         },
       },
-      environment: {},
+      environment: String,
       index: {
         type: Number,
         default() {
@@ -182,7 +182,7 @@
           return {}
         }
       },
-      type:String,
+      type: String,
       isCaseEdit: Boolean,
     },
     watch: {},
@@ -207,7 +207,12 @@
         });
       },
       singleRun(data) {
+        if (!this.environment) {
+          this.$warning(this.$t('api_test.environment.select_environment'));
+          return;
+        }
         data.message = true;
+        data.request.useEnvironment = this.environment;
         this.saveTestCase(data);
         this.$emit('singleRun', data);
       },
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
index 3acbe1b7a1..5318d26e01 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
@@ -13,6 +13,7 @@
           :apiCaseList="apiCaseList"
           :is-read-only="isReadOnly"
           :project-id="projectId"
+          :useEnvironment="useEnvironment"
           :is-case-edit="isCaseEdit"
           ref="header"
         />
@@ -38,7 +39,7 @@
     </ms-drawer>
 
     <!-- 执行组件 -->
-    <ms-run :debug="false" :environment="environment" :reportId="reportId" :run-data="runData" :env-map="envMap"
+    <ms-run :debug="false" :reportId="reportId" :run-data="runData" :env-map="envMap"
             @runRefresh="runRefresh" ref="runTest"/>
     <!--批量编辑-->
     <ms-batch-edit ref="batchEdit" @batchEdit="batchEdit" :typeArr="typeArr" :value-arr="valueArr"/>
@@ -77,7 +78,7 @@
       return {
         result: {},
         grades: [],
-        environment: {},
+        environment: "",
         isReadOnly: false,
         selectedEvent: Object,
         priorities: CASE_ORDER,
@@ -111,7 +112,8 @@
           priority: CASE_PRIORITY,
           method: REQ_METHOD,
         },
-        envMap: new Map
+        envMap: new Map,
+        useEnvironment: "",
       }
     },
     watch: {
@@ -190,8 +192,13 @@
             this.$set(item, 'selected', false);
           })
         }
-        this.$success(this.$t('organization.integration.successful_operation'));
+        // 更新最后一条的环境
+        let cases = this.apiCaseList[0];
+        cases.request.useEnvironment = this.environment;
+        cases.message = true;
+        this.$refs.apiCaseItem[0].saveCase(cases);
         this.refresh();
+        this.$success(this.$t('organization.integration.successful_operation'));
       },
 
       refresh() {
@@ -204,12 +211,13 @@
         })
       },
       getApiTest(addCase) {
+        this.useEnvironment = "";
         if (this.api) {
           this.condition.projectId = this.projectId;
           if (this.isCaseEdit) {
             this.condition.id = this.testCaseId;
           }
-          if(this.api){
+          if (this.api) {
             this.condition.apiDefinitionId = this.api.id;
           }
 
@@ -226,7 +234,12 @@
               if (!apiCase.request.hashTree) {
                 apiCase.request.hashTree = [];
               }
+
             })
+            if (!this.useEnvironment && this.apiCaseList[0].request && this.apiCaseList[0].request.useEnvironment) {
+              this.useEnvironment = this.apiCaseList[0].request.useEnvironment;
+              this.environment = this.useEnvironment;
+            }
             if (addCase && this.apiCaseList.length == 0 && !this.loaded) {
               this.addCase();
             }
@@ -264,7 +277,7 @@
       },
 
       singleRun(row) {
-        if (!this.environment || !this.environment) {
+        if (!this.environment) {
           this.$warning(this.$t('api_test.environment.select_environment'));
           return;
         }
@@ -274,7 +287,7 @@
         row.request.name = row.id;
         this.$get('/api/definition/get/' + row.request.id, response => {
           row.request.path = response.data.path;  //  取的path是对应接口的path，因此查库以获得
-          row.request.useEnvironment = this.environment.id;
+          row.request.useEnvironment = this.environment;
           row.request.projectId = getCurrentProjectID();
           this.runData.push(row.request);
           /*触发执行操作*/
@@ -293,7 +306,7 @@
           this.apiCaseList.forEach(item => {
             if (item.selected && item.id) {
               item.request.name = item.id;
-              item.request.useEnvironment = this.environment.id;
+              item.request.useEnvironment = this.environment;
               this.runData.push(item.request);
               this.batchLoadingIds.push(item.id);
             }
diff --git a/frontend/src/business/components/api/definition/components/case/MsEnvironmentSelect.vue b/frontend/src/business/components/api/definition/components/case/MsEnvironmentSelect.vue
index 121fe913d0..cdc1046818 100644
--- a/frontend/src/business/components/api/definition/components/case/MsEnvironmentSelect.vue
+++ b/frontend/src/business/components/api/definition/components/case/MsEnvironmentSelect.vue
@@ -35,7 +35,7 @@
           environmentId: ""
         }
       },
-      props:['projectId','isReadOnly'],
+      props:['projectId','isReadOnly','useEnvironment'],
       created() {
         this.getEnvironments();
       },
@@ -49,6 +49,9 @@
         environmentId() {
           this.environmentChange(this.environmentId);
         },
+        useEnvironment(){
+          this.environmentId = this.useEnvironment;
+        }
         // planEnvironmentId() {
         //   this.environmentId = this.planEnvironmentId;
         // }
@@ -60,9 +63,9 @@
               this.environments = response.data;
               this.environments.forEach(environment => {
                 parseEnvironment(environment);
-                // if (this.planEnvironmentId && environment.id === this.planEnvironmentId) {
-                //   this.planEnvironmentId = environment.id;
-                // }
+                if (this.useEnvironment && this.useEnvironment.id === environment.id) {
+                  this.environmentId = this.useEnvironment;
+                }
               });
             });
           } else {

From 50d4d03380e95fd2d45907f27765c507a854c1c0 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 11 Mar 2021 17:54:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E5=9B=A0=E5=8D=A1=E9=A1=BF=20?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=8F=90=E4=BA=A4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/EditApiScenario.vue   | 77 ++++++++++---------
 frontend/src/business/main.js                 | 15 ++++
 2 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index d06a8b0e95..cfebd0feb7 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -5,7 +5,7 @@
 
         <!--操作按钮-->
         <div class="ms-opt-btn">
-          <el-button id="inputDelay" type="primary" size="small" @click="editScenario" title="ctrl + s">
+          <el-button id="inputDelay" type="primary" size="small" v-prevent-re-click @click="editScenario" title="ctrl + s">
             {{ $t('commons.save') }}
           </el-button>
         </div>
@@ -119,7 +119,7 @@
                                :project-list="projectList" ref="envPopover"/>
                 </el-col>
                 <el-col :span="2">
-                  <el-button :disabled="scenarioDefinition.length < 1" size="small" type="primary" @click="runDebug">{{$t('api_test.request.debug')}}</el-button>
+                  <el-button :disabled="scenarioDefinition.length < 1" size="small" type="primary" v-prevent-re-click @click="runDebug">{{$t('api_test.request.debug')}}</el-button>
                 </el-col>
               </el-row>
             </div>
@@ -707,29 +707,29 @@
       },
       runDebug() {
         /*触发执行操作*/
-        // if (!this.currentEnvironmentId) {
-        //   this.$error(this.$t('api_test.environment.select_environment'));
-        //   return;
-        // }
         let sign = this.$refs.envPopover.checkEnv();
         if (!sign) {
           return;
         }
         this.$refs['currentScenario'].validate((valid) => {
           if (valid) {
-            this.editScenario();
-            this.debugData = {
-              id: this.currentScenario.id,
-              name: this.currentScenario.name,
-              type: "scenario",
-              variables: this.currentScenario.variables,
-              referenced: 'Created',
-              enableCookieShare: this.enableCookieShare,
-              headers: this.currentScenario.headers,
-              environmentMap: this.projectEnvMap,
-              hashTree: this.scenarioDefinition
-            };
-            this.reportId = getUUID().substring(0, 8);
+            Promise.all([
+              this.editScenario()]).then(val => {
+              if (val) {
+                this.debugData = {
+                  id: this.currentScenario.id,
+                  name: this.currentScenario.name,
+                  type: "scenario",
+                  variables: this.currentScenario.variables,
+                  referenced: 'Created',
+                  enableCookieShare: this.enableCookieShare,
+                  headers: this.currentScenario.headers,
+                  environmentMap: this.projectEnvMap,
+                  hashTree: this.scenarioDefinition
+                };
+                this.reportId = getUUID().substring(0, 8);
+              }
+            });
           }
         })
       },
@@ -884,24 +884,27 @@
         return bodyUploadFiles;
       },
       editScenario() {
-        document.getElementById("inputDelay").focus();  //  保存前在input框自动失焦，以免保存失败
-        this.$refs['currentScenario'].validate((valid) => {
-          if (valid) {
-            this.setParameter();
-            let bodyFiles = this.getBodyUploadFiles(this.currentScenario);
-            this.$fileUpload(this.path, null, bodyFiles, this.currentScenario, response => {
-              this.$success(this.$t('commons.save_success'));
-              this.path = "/api/automation/update";
-              if (response.data) {
-                this.currentScenario.id = response.data.id;
-              }
-              if (this.currentScenario.tags instanceof String) {
-                this.currentScenario.tags = JSON.parse(this.currentScenario.tags);
-              }
-              this.$emit('refresh', this.currentScenario);
-            })
-          }
-        })
+        return new Promise((resolve, reject) => {
+          document.getElementById("inputDelay").focus();  //  保存前在input框自动失焦，以免保存失败
+          this.$refs['currentScenario'].validate((valid) => {
+            if (valid) {
+              this.setParameter();
+              let bodyFiles = this.getBodyUploadFiles(this.currentScenario);
+              this.$fileUpload(this.path, null, bodyFiles, this.currentScenario, response => {
+                this.$success(this.$t('commons.save_success'));
+                this.path = "/api/automation/update";
+                if (response.data) {
+                  this.currentScenario.id = response.data.id;
+                }
+                if (this.currentScenario.tags instanceof String) {
+                  this.currentScenario.tags = JSON.parse(this.currentScenario.tags);
+                }
+                this.$emit('refresh', this.currentScenario);
+                resolve();
+              })
+            }
+          })
+        });
       },
       getApiScenario() {
         if (this.currentScenario.tags != undefined && !(this.currentScenario.tags instanceof Array)) {
diff --git a/frontend/src/business/main.js b/frontend/src/business/main.js
index 1b2c601312..3afcf3d9ca 100644
--- a/frontend/src/business/main.js
+++ b/frontend/src/business/main.js
@@ -22,8 +22,10 @@ import {left2RightDrag, bottom2TopDrag, right2LeftDrag} from "../common/js/direc
 import JsonSchemaEditor from './components/common/json-schema/schema/index';
 import JSONPathPicker from 'vue-jsonpath-picker';
 import VueClipboard from 'vue-clipboard2'
+
 Vue.use(JsonSchemaEditor);
 import VuePapaParse from 'vue-papa-parse'
+
 Vue.use(VuePapaParse)
 
 Vue.config.productionTip = false;
@@ -56,6 +58,19 @@ Vue.directive('tester', tester);
 Vue.directive('left-to-right-drag', left2RightDrag);
 Vue.directive('right-to-left-drag', right2LeftDrag);
 Vue.directive('bottom-to-top-drag', bottom2TopDrag);
+// 防止重复点击
+Vue.directive('preventReClick', {
+  inserted(el, binding) {
+    el.addEventListener('click', () => {
+      if (!el.disabled) {
+        el.disabled = true
+        setTimeout(() => {
+          el.disabled = false
+        }, binding.value || 2000)
+      }
+    })
+  }
+})
 
 new Vue({
   el: '#app',

From 4c6760df8b105a90d155eeba5ef99eb5de4fe001 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 11 Mar 2021 18:40:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B):?=
 =?UTF-8?q?=20=E5=AD=97=E7=AC=A6=E4=B8=B2=E9=99=90=E5=88=B6=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #1574
---
 .../java/io/metersphere/excel/domain/TestCaseExcelDataCn.java | 2 +-
 .../components/track/case/components/TestCaseEdit.vue         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataCn.java b/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataCn.java
index 2d98f10baf..5bca529228 100644
--- a/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataCn.java
+++ b/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataCn.java
@@ -50,7 +50,7 @@ public class TestCaseExcelDataCn extends TestCaseExcelData {
 
     @ColumnWidth(50)
     @ExcelProperty("前置条件")
-    @Length(min = 0, max = 1000)
+    @Length(min = 0, max = 500)
     private String prerequisite;
 
     @ColumnWidth(50)
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index 38632c0c59..b7278ab371 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -373,7 +373,7 @@ export default {
         testId: [{required: true, message: this.$t('commons.please_select'), trigger: 'change'}],
         method: [{required: true, message: this.$t('test_track.case.input_method'), trigger: 'change'}],
         prerequisite: [{max: 500, message: this.$t('test_track.length_less_than') + '500', trigger: 'blur'}],
-        remark: [{max: 500, message: this.$t('test_track.length_less_than') + '500', trigger: 'blur'}]
+        remark: [{max: 1000, message: this.$t('test_track.length_less_than') + '1000', trigger: 'blur'}]
       },
       formLabelWidth: "120px",
       operationType: '',
@@ -767,7 +767,7 @@ export default {
       this.getModuleOptions();
       this.getMaintainerOptions();
       this.getTestOptions();
-      this.getDemandOptions()
+      // this.getDemandOptions()
     },
 
     resetForm() {