From 269184fe2cc3f7d1c26a860971b85aaf9ac47e4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BB=BA=E5=9B=BD?= <tianyang.song@fit2cloud.com>
Date: Fri, 14 Apr 2023 15:00:21 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E6=97=B6=E5=8F=96=E6=B6=88=E4=BD=BF=E7=94=A8=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=B1=A0=EF=BC=8C=E4=BD=86=E6=98=AF=E4=BE=9D=E7=84=B6?=
 =?UTF-8?q?=E4=BC=9A=E6=A0=B9=E6=8D=AE=E4=B8=8B=E6=8B=89=E6=A1=86=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=9A=84=E8=B5=84=E6=BA=90=E6=B1=A0=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1025386 --user=宋天阳 【测试跟踪】github #23610，测试计划执行，资源池取消勾选，选中的资源池未清空
https://www.tapd.cn/55049933/s/1362869
---
 .../src/business/menu/file/edit/EditFileMetadata.vue      | 8 ++++++++
 .../java/io/metersphere/plan/service/TestPlanService.java | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/project-management/frontend/src/business/menu/file/edit/EditFileMetadata.vue b/project-management/frontend/src/business/menu/file/edit/EditFileMetadata.vue
index e79d9e96ce..a452968375 100644
--- a/project-management/frontend/src/business/menu/file/edit/EditFileMetadata.vue
+++ b/project-management/frontend/src/business/menu/file/edit/EditFileMetadata.vue
@@ -119,6 +119,14 @@
                     <span>{{ fileBranch }}</span>
                   </el-form-item>
 
+                  <el-form-item
+                    v-if="isRepositoryFile()"
+                    :label="$t('project.project_file.file.path')"
+                    prop="type"
+                  >
+                    <span>{{ data.path }}</span>
+                  </el-form-item>
+
                   <el-form-item :label="$t('load_test.file_type')" prop="type">
                     <span>{{ data.type }}</span>
                   </el-form-item>
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
index 1dbcd039c7..ef525cde2a 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
@@ -2000,6 +2000,11 @@ public class TestPlanService {
         RunModeConfigDTO runModeConfig = getRunModeConfigDTO(testplanRunRequest, envType, envMap, environmentGroupId, testPlanId);
         runModeConfig.setTestPlanDefaultEnvMap(testplanRunRequest.getTestPlanDefaultEnvMap());
 
+        if (!testplanRunRequest.isRunWithinResourcePool()) {
+            //未勾选资源池运行时，将资源池ID赋空
+            runModeConfig.setResourcePoolId(null);
+        }
+        
         String apiRunConfig = JSON.toJSONString(runModeConfig);
         return this.runTestPlan(testPlanId, testplanRunRequest.getProjectId(),
                 testplanRunRequest.getUserId(), testplanRunRequest.getTriggerMode(), testplanRunRequest.getReportId(), testplanRunRequest.getExecutionWay(), apiRunConfig);