From e2c5f37a52ab6c05a1d1d840511b4fa6e3ed8bfe Mon Sep 17 00:00:00 2001
From: "nathan.liu" <yao.liu@fit2cloud.com>
Date: Fri, 29 Jul 2022 11:43:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(UI=E8=87=AA=E5=8A=A8=E5=8C=96):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=9D=9E=E6=80=A7=E8=83=BD=E6=A8=A1=E5=BC=8F=E4=B8=8B?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=88=AA=E5=9B=BE=E8=AF=AD=E8=A8=80=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1014842 --user=刘瑶
【UI测试】非性能模式下-报告中的截图和实际系统（语言）不一致
https://www.tapd.cn/55049933/s/1215172
---
 .../metersphere/api/dto/definition/RunDefinitionRequest.java  | 2 ++
 .../api/dto/definition/request/ParameterConfig.java           | 2 ++
 backend/src/main/java/io/metersphere/xpack                    | 2 +-
 .../business/components/api/automation/scenario/DebugRun.vue  | 4 +++-
 frontend/src/business/components/xpack                        | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/RunDefinitionRequest.java b/backend/src/main/java/io/metersphere/api/dto/definition/RunDefinitionRequest.java
index 43de8b3592..71a428325d 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/RunDefinitionRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/RunDefinitionRequest.java
@@ -24,6 +24,8 @@ public class RunDefinitionRequest {
 
     private boolean runLocal;
 
+    private String browserLanguage;
+
     private String requestId;
 
     private String name;
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/ParameterConfig.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/ParameterConfig.java
index b3a1335bc8..57085069dc 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/ParameterConfig.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/ParameterConfig.java
@@ -88,6 +88,8 @@ public class ParameterConfig extends MsParameter {
 
     private boolean runLocal;
 
+    private String browserLanguage;
+
     /**
      * 排除生成临界控制器的场景
      */
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 1965e5d82c..a15c62585f 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 1965e5d82cd95cc8ceb8ee5a072acd7380849249
+Subproject commit a15c62585f8e3afe994a8f94817124ad51189b71
diff --git a/frontend/src/business/components/api/automation/scenario/DebugRun.vue b/frontend/src/business/components/api/automation/scenario/DebugRun.vue
index 6676c30932..28731f72fa 100644
--- a/frontend/src/business/components/api/automation/scenario/DebugRun.vue
+++ b/frontend/src/business/components/api/automation/scenario/DebugRun.vue
@@ -21,7 +21,8 @@ export default {
     runLocal: Boolean,
     saved: Boolean,
     environmentType: String,
-    environmentGroupId: String
+    environmentGroupId: String,
+    browserLanguage: String
   },
   data() {
     return {
@@ -80,6 +81,7 @@ export default {
         reqObj.variables = this.runData.variables;
       }
       reqObj.runLocal = this.runLocal;
+      reqObj.browserLanguage = this.browserLanguage;
       reqObj.uiRunMode = this.uiRunMode;
       this.$emit('runRefresh', {});
 
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 311095fddb..0179ce8659 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 311095fddb07b11b034b139152a59810cd5ed7d1
+Subproject commit 0179ce86590df2cc2f00f46892a3bb08b0ab5204