From 6ed2d6ebf9bcea93258b9dcccf8d8b824c7c4209 Mon Sep 17 00:00:00 2001
From: metersphere-bot <78466014+metersphere-bot@users.noreply.github.com>
Date: Thu, 24 Mar 2022 14:57:44 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8Dsql=E5=8D=8F=E8=AE=AE=E5=89=8D=E5=90=8E?=
 =?UTF-8?q?=E7=BD=AEsql=E8=BF=90=E8=A1=8C=E7=8E=AF=E5=A2=83=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=8E=AF=E5=A2=83=E6=8C=89=E9=92=AE=E5=92=8C=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9C=AA=E5=AF=B9?=
 =?UTF-8?q?=E9=BD=90=20(#11923)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1011638 --user=王孝刚
【接口测试】sql协议-api-test-前/后置sql运行环境-配置环境按钮和环境列表数据未对齐
https://www.tapd.cn/55049933/s/1125530

Co-authored-by: wxg0103 <727495428@qq.com>
---
 .../api/automation/scenario/api/RelevanceApiList.vue        | 1 +
 .../api/automation/scenario/api/RelevanceCaseList.vue       | 1 +
 .../api/automation/scenario/common/JDBCProcessorContent.vue | 5 +++++
 .../api/automation/scenario/component/ConstantTimer.vue     | 3 ++-
 .../api/automation/scenario/component/JDBCProcessor.vue     | 6 ++++++
 .../components/request/database/BasisParameters.vue         | 5 +++++
 6 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue b/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
index a116bd4512..5d0ff3ca1d 100644
--- a/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
@@ -170,6 +170,7 @@ export default {
             });
           });
         });
+      setTimeout(this.$refs.table.reloadTable, 200);
       },
       setEnvironment(data) {
         this.environmentId = data.id;
diff --git a/frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue b/frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue
index b4ca903315..14468062ff 100644
--- a/frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue
@@ -254,6 +254,7 @@ export default {
           }
         });
       });
+      setTimeout(this.$refs.table.reloadTable, 200);
     },
     clear() {
       if (this.$refs.table) {
diff --git a/frontend/src/business/components/api/automation/scenario/common/JDBCProcessorContent.vue b/frontend/src/business/components/api/automation/scenario/common/JDBCProcessorContent.vue
index 305eaf9565..baec54fa03 100644
--- a/frontend/src/business/components/api/automation/scenario/common/JDBCProcessorContent.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/JDBCProcessorContent.vue
@@ -278,6 +278,11 @@ export default {
   margin: 6px 0px 8px 30px;
 }
 
+.environment-button {
+  margin-left: 20px;
+  padding: 7px;
+}
+
 /deep/ .el-form-item {
   margin-bottom: 15px;
 }
diff --git a/frontend/src/business/components/api/automation/scenario/component/ConstantTimer.vue b/frontend/src/business/components/api/automation/scenario/component/ConstantTimer.vue
index b4b7ac9b0d..c00c6a086a 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ConstantTimer.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ConstantTimer.vue
@@ -12,7 +12,8 @@
     :title="$t('api_test.automation.wait_controller')">
 
     <template v-slot:headerLeft>
-      <el-input-number class="time-input" size="mini" v-model="timer.delay" :min="0" :step="1000" ref="nameInput"/>
+      <el-input-number class="time-input" size="mini" v-model="timer.delay" :min="0" :step="1000" ref="nameInput"
+                       :disabled="timer.disabled"/>
       ms
     </template>
 
diff --git a/frontend/src/business/components/api/automation/scenario/component/JDBCProcessor.vue b/frontend/src/business/components/api/automation/scenario/component/JDBCProcessor.vue
index 46aacc2762..a059210896 100644
--- a/frontend/src/business/components/api/automation/scenario/component/JDBCProcessor.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/JDBCProcessor.vue
@@ -91,4 +91,10 @@ export default {
 /deep/ .el-divider {
   margin-bottom: 10px;
 }
+
+.environment-button {
+  margin-left: 20px;
+  padding: 7px;
+}
+
 </style>
diff --git a/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue b/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue
index 0ba2a202dc..ca18998cec 100644
--- a/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue
+++ b/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue
@@ -344,6 +344,11 @@
     border-radius: 50%;
   }
 
+  .environment-button {
+    margin-left: 20px;
+    padding: 7px;
+  }
+
   .ms-left-buttion {
     margin: 6px 0px 8px 30px;
   }