From ffdd3ebd40b4bad76218ae78f97b3bc37b8dbfb9 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 2 Jun 2020 16:48:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=B1=A0=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E6=97=B6=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=8E=8B=E5=8A=9B=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AETab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/test/EditPerformanceTestPlan.vue    | 13 +++++++++----
 .../test/components/PerformancePressureConfig.vue   |  2 ++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/performance/test/EditPerformanceTestPlan.vue b/frontend/src/business/components/performance/test/EditPerformanceTestPlan.vue
index ecc3fa1dec..63516426e1 100644
--- a/frontend/src/business/components/performance/test/EditPerformanceTestPlan.vue
+++ b/frontend/src/business/components/performance/test/EditPerformanceTestPlan.vue
@@ -32,7 +32,7 @@
             <performance-basic-config :test-plan="testPlan" ref="basicConfig"/>
           </el-tab-pane>
           <el-tab-pane :label="$t('load_test.pressure_config')">
-            <performance-pressure-config :test-plan="testPlan" :test-id="testId" ref="pressureConfig"/>
+            <performance-pressure-config :test-plan="testPlan" :test-id="testId" ref="pressureConfig" @changeActive="changeTabActive"/>
           </el-tab-pane>
           <el-tab-pane :label="$t('load_test.advanced_config')" class="advanced-config">
             <performance-advanced-config :test-id="testId" ref="advancedConfig"/>
@@ -156,9 +156,9 @@
         });
       },
       saveAndRun() {
-        // if (!this.validTestPlan()) {
-        //   return;
-        // }
+        if (!this.validTestPlan()) {
+          return;
+        }
 
         let options = this.getSaveOption();
 
@@ -239,6 +239,11 @@
         /// todo: 其他校验
 
         return true;
+      },
+      changeTabActive(activeName) {
+        this.$nextTick(()=> {
+          this.active = activeName;
+        });
       }
     }
   }
diff --git a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
index ebc465b4ee..1d17af9dec 100644
--- a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
@@ -299,6 +299,8 @@
       validConfig() {
         if (!this.resourcePool) {
           this.$warning(this.$t('load_test.resource_pool_is_null'));
+          // 资源池为空，设置参数为资源池所在Tab的name
+          this.$emit('changeActive', '1');
           return false;
         }