From 4726ef6514e7760a5310f2cb48b68a2cf5d533db Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 13 Oct 2023 14:55:01 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96mock=E7=8E=AF=E5=A2=83http=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1031675 --user=王孝刚
【接口测试】github#27023，mock环境修改地址-调试-修改的地址生效，然后再进入调试mock地址又变回去了
https://www.tapd.cn/55049933/s/1425819
---
 .../components/environment/EnvironmentHttpConfig.vue   |  3 ++-
 framework/sdk-parent/frontend/src/i18n/lang/en-US.js   |  2 +-
 framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js   | 10 +++++-----
 framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js   | 10 +++++-----
 .../environment/components/EnvironmentHttpConfig.vue   |  2 +-
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/framework/sdk-parent/frontend/src/components/environment/EnvironmentHttpConfig.vue b/framework/sdk-parent/frontend/src/components/environment/EnvironmentHttpConfig.vue
index 69a0fcb3fb..9284875f05 100644
--- a/framework/sdk-parent/frontend/src/components/environment/EnvironmentHttpConfig.vue
+++ b/framework/sdk-parent/frontend/src/components/environment/EnvironmentHttpConfig.vue
@@ -6,7 +6,7 @@
         <el-row type="flex" justify="space-between">
           <el-col :span="14">
             <span class="ms-env-span" style="line-height: 30px;">{{ $t('api_test.environment.socket') }}</span>
-            <el-input v-model="condition.socket" style="width: 85%"
+            <el-input v-model="condition.socket" style="width: 85%" :disabled="httpConfig.isMock"
                       :placeholder="$t('api_test.request.url_description')" clearable size="small">
               <template slot="prepend">
                 <el-select v-model="condition.protocol" class="request-protocol-select" size="small">
@@ -143,6 +143,7 @@ export default {
     },
   },
   created() {
+    console.log(this.httpConfig)
     this.list();
   },
   data() {
diff --git a/framework/sdk-parent/frontend/src/i18n/lang/en-US.js b/framework/sdk-parent/frontend/src/i18n/lang/en-US.js
index 29de8863e0..cebd669b66 100644
--- a/framework/sdk-parent/frontend/src/i18n/lang/en-US.js
+++ b/framework/sdk-parent/frontend/src/i18n/lang/en-US.js
@@ -2059,7 +2059,7 @@ const message = {
       post_export_tip: "Export the test collection by Postman",
       swagger_export_tip: "Export jSON-formatted files via Swagger website",
       jmeter_export_tip: "Generating JMX file through JMeter",
-      jmeter_tip: "JMX files supporting JMeter 5.2-5.4",
+      jmeter_tip: "JMX files supporting JMeter 5.2-5.5",
       suffixFormatErr: "The file format does not meet the requirements",
       swagger_url_import: "Import using URL",
       add_request_params: "Add request Parameters",
diff --git a/framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js b/framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js
index ce695d9b6e..127c8c7418 100644
--- a/framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js
+++ b/framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js
@@ -20,10 +20,10 @@ const message = {
     trash: "回收站",
     yes: "是",
     no: "否",
-        running: "运行中",
-      idle: "空闲",
-      running_status: "运行状态",
-      cpu_usage: "CPU 使用率",
+    running: "运行中",
+    idle: "空闲",
+    running_status: "运行状态",
+    cpu_usage: "CPU 使用率",
     expand_all: "一键展开",
     close_all: "一键收起",
     example: "示例",
@@ -1988,7 +1988,7 @@ const message = {
       post_export_tip: "通过 Postman 导出测试集合",
       swagger_export_tip: "通过 Swagger 页面导出",
       jmeter_export_tip: "通过 JMeter 生成 JMX 文件",
-      jmeter_tip: "支持 JMeter5.2-5.4版本的 JMX 文件",
+      jmeter_tip: "支持 JMeter5.2-5.5版本的 JMX 文件",
       suffixFormatErr: "文件格式不符合要求",
       file_name_to_long: "文件名称过长",
       swagger_url_import: "使用 URL 导入",
diff --git a/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js b/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js
index 703aedef2b..65399c4bd6 100644
--- a/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js
+++ b/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js
@@ -20,10 +20,10 @@ const message = {
     trash: "回收站",
     yes: "是",
     no: "否",
-        running: "運行中",
-      idle: "空閑",
-      running_status: "運行狀態",
-      cpu_usage: "CPU 使用率",
+    running: "運行中",
+    idle: "空閑",
+    running_status: "運行狀態",
+    cpu_usage: "CPU 使用率",
     expand_all: "一鍵展開",
     close_all: "一鍵收起",
     example: "示例",
@@ -1987,7 +1987,7 @@ const message = {
       post_export_tip: "通過 Postman 導出測試集合",
       swagger_export_tip: "通過 Swagger 頁面導出",
       jmeter_export_tip: "通過 JMeter 生成 JMX 文件",
-      jmeter_tip: "支持 JMeter5.2-5.4版本的 JMX 文件",
+      jmeter_tip: "支持 JMeter5.2-5.5版本的 JMX 文件",
       suffixFormatErr: "文件格式不符合要求",
       file_name_to_long: "文件名稱過長",
       swagger_url_import: "使用 URL 導入",
diff --git a/project-management/frontend/src/business/menu/environment/components/EnvironmentHttpConfig.vue b/project-management/frontend/src/business/menu/environment/components/EnvironmentHttpConfig.vue
index 3672065a7d..24f037f82a 100644
--- a/project-management/frontend/src/business/menu/environment/components/EnvironmentHttpConfig.vue
+++ b/project-management/frontend/src/business/menu/environment/components/EnvironmentHttpConfig.vue
@@ -6,7 +6,7 @@
         <el-row type="flex" justify="space-between">
           <el-col :span="14">
             <span class="ms-env-span" style="line-height: 30px;">{{ $t('api_test.environment.socket') }}</span>
-            <el-input v-model="condition.socket" style="width: 85%"
+            <el-input v-model="condition.socket" style="width: 85%" :disabled="httpConfig.isMock"
                       :placeholder="$t('api_test.request.url_description')" clearable size="small">
               <template slot="prepend">
                 <el-select v-model="condition.protocol" class="request-protocol-select" size="small">