From 9c704c84455f5e530dadff3b4197f265b4074140 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 2 Jun 2021 14:49:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96,=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20=E5=B9=B6?=
 =?UTF-8?q?=E8=A1=8C=E6=A8=A1=E5=BC=8F=E5=A2=9E=E5=8A=A0=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=B1=A0=E9=80=89=E9=A1=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/common/RunMode.vue    | 28 ++++++++++++++++--
 .../track/plan/common/PlanRunMode.vue         | 29 ++++++++++++++++++-
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/common/RunMode.vue b/frontend/src/business/components/api/automation/scenario/common/RunMode.vue
index 74159bdc9c..4eef6faf74 100644
--- a/frontend/src/business/components/api/automation/scenario/common/RunMode.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/RunMode.vue
@@ -7,7 +7,7 @@
   >
     <div>
       <span class="ms-mode-span">{{ $t("run_mode.title") }}：</span>
-      <el-radio-group v-model="runConfig.mode">
+      <el-radio-group v-model="runConfig.mode" @change="changeMode">
         <el-radio label="serial">{{ $t("run_mode.serial") }}</el-radio>
         <el-radio label="parallel">{{ $t("run_mode.parallel") }}</el-radio>
       </el-radio-group>
@@ -39,8 +39,28 @@
           </div>
         </el-col>
       </el-row>
-
     </div>
+    <div class="ms-mode-div" v-if="runConfig.mode === 'parallel'">
+      <el-row>
+        <el-col :span="6">
+          <span class="ms-mode-span">{{ $t("run_mode.other_config") }}：</span>
+        </el-col>
+        <el-col :span="18">
+            <el-checkbox v-model="runConfig.runWithinResourcePool" style="padding-right: 10px;">
+              {{ $t('run_mode.run_with_resource_pool') }}
+            </el-checkbox>
+            <el-select :disabled="!runConfig.runWithinResourcePool" v-model="runConfig.resourcePoolId" size="mini">
+              <el-option
+                v-for="item in resourcePools"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+            </el-select>
+        </el-col>
+      </el-row>
+    </div>
+
     <div class="ms-mode-div" v-if="runConfig.reportType === 'setReport' && runConfig.mode==='serial'">
       <span class="ms-mode-span">{{ $t("run_mode.report_name") }}：</span>
       <el-input
@@ -81,6 +101,10 @@ export default {
       this.runModeVisible = true;
       this.getResourcePools();
     },
+    changeMode() {
+      this.runConfig.runWithinResourcePool = false;
+      this.runConfig.resourcePoolId = null;
+    },
     close() {
       this.runConfig = {
         mode: "serial",
diff --git a/frontend/src/business/components/track/plan/common/PlanRunMode.vue b/frontend/src/business/components/track/plan/common/PlanRunMode.vue
index e628bed2cb..4b09032bcb 100644
--- a/frontend/src/business/components/track/plan/common/PlanRunMode.vue
+++ b/frontend/src/business/components/track/plan/common/PlanRunMode.vue
@@ -7,7 +7,7 @@
   >
     <div>
       <span class="ms-mode-span">{{ $t("run_mode.title") }}：</span>
-      <el-radio-group v-model="runConfig.mode">
+      <el-radio-group v-model="runConfig.mode" @change="changeMode">
         <el-radio label="serial">{{ $t("run_mode.serial") }}</el-radio>
         <el-radio label="parallel">{{ $t("run_mode.parallel") }}</el-radio>
       </el-radio-group>
@@ -37,6 +37,28 @@
         </el-col>
       </el-row>
     </div>
+    <div class="ms-mode-div" v-if="runConfig.mode === 'parallel'">
+      <el-row>
+        <el-col :span="6">
+          <span class="ms-mode-span">{{ $t("run_mode.other_config") }}：</span>
+        </el-col>
+        <el-col :span="18">
+          <div v-if="testType === 'API'">
+            <el-checkbox v-model="runConfig.runWithinResourcePool" style="padding-right: 10px;">
+              {{ $t('run_mode.run_with_resource_pool') }}
+            </el-checkbox>
+            <el-select :disabled="!runConfig.runWithinResourcePool" v-model="runConfig.resourcePoolId" size="mini">
+              <el-option
+                v-for="item in resourcePools"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
     <template v-slot:footer>
       <ms-dialog-footer @cancel="close" @confirm="handleRunBatch"/>
     </template>
@@ -69,6 +91,11 @@ export default {
       this.testType = testType;
       this.getResourcePools();
     },
+    changeMode() {
+      this.runConfig.onSampleError = false;
+      this.runConfig.runWithinResourcePool = false;
+      this.runConfig.resourcePoolId = null;
+    },
     close() {
       this.runConfig = {
         mode: "serial",