From 505a99010765e10f6ea3dd404c231e5fcf2ca520 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Thu, 21 Oct 2021 15:05:40 +0800
Subject: [PATCH] =?UTF-8?q?fix(Mock=E8=87=AA=E5=AE=9A=E4=B9=89=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC):=20=E4=BF=AE=E5=A4=8DMock=E6=9C=9F=E6=9C=9B=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99=E6=97=B6=E5=AD=98=E5=9C=A8=E7=9A=84=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复Mock期望填写时存在的样式问题
---
 .../java/io/metersphere/api/service/MockConfigService.java  | 6 +++++-
 .../components/mock/Components/MockApiScriptEditor.vue      | 6 +++---
 .../components/mock/Components/MockResponseParam.vue        | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/MockConfigService.java b/backend/src/main/java/io/metersphere/api/service/MockConfigService.java
index 72bdfcf92e..520cf85bcc 100644
--- a/backend/src/main/java/io/metersphere/api/service/MockConfigService.java
+++ b/backend/src/main/java/io/metersphere/api/service/MockConfigService.java
@@ -651,7 +651,11 @@ public class MockConfigService {
                     returnStr = MockApiUtils.getResultByResponseResult(responseJsonObj.getJSONObject("body"), url, headerMap, requestMockParams);
                 }
                 if (responseJsonObj.containsKey("httpCode")) {
-                    response.setStatus(Integer.parseInt(responseJsonObj.getString("httpCode")));
+                    int httpCodeNum = 500;
+                    try {
+                        httpCodeNum = Integer.parseInt(responseJsonObj.getString("httpCode"));
+                    }catch (Exception e){}
+                    response.setStatus(httpCodeNum);
                 }
                 if (responseJsonObj.containsKey("delayed")) {
                     try {
diff --git a/frontend/src/business/components/api/definition/components/mock/Components/MockApiScriptEditor.vue b/frontend/src/business/components/api/definition/components/mock/Components/MockApiScriptEditor.vue
index 46af689ba5..c58af354c3 100644
--- a/frontend/src/business/components/api/definition/components/mock/Components/MockApiScriptEditor.vue
+++ b/frontend/src/business/components/api/definition/components/mock/Components/MockApiScriptEditor.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-row type="flex" :gutter="10">
+    <el-row type="flex">
       <el-col :span="codeSpan" class="script-content">
         <ms-code-edit v-if="isCodeEditAlive" :mode="codeEditModeMap[jsr223ProcessorData.scriptLanguage]"
                       :read-only="isReadOnly"
@@ -15,10 +15,10 @@
              @click="switchMenu"></i>
         </div>
       </div>
-      <el-col :span="menuSpan" class="script-index">
+      <el-col :span="menuSpan" style="width: 200px" class="script-index">
         <ms-dropdown :default-command="jsr223ProcessorData.scriptLanguage" :commands="languages" style="margin-bottom: 5px;margin-left: 15px;"
                      @command="languageChange"/>
-        <mock-script-nav-menu ref="scriptNavMenu" :language="jsr223ProcessorData.scriptLanguage" :menus="baseCodeTemplates"
+        <mock-script-nav-menu ref="scriptNavMenu" style="width: 90%" :language="jsr223ProcessorData.scriptLanguage" :menus="baseCodeTemplates"
                          @handleCode="handleCodeTemplate"/>
       </el-col>
     </el-row>
diff --git a/frontend/src/business/components/api/definition/components/mock/Components/MockResponseParam.vue b/frontend/src/business/components/api/definition/components/mock/Components/MockResponseParam.vue
index 8f2518f662..3fbf5cc1cf 100644
--- a/frontend/src/business/components/api/definition/components/mock/Components/MockResponseParam.vue
+++ b/frontend/src/business/components/api/definition/components/mock/Components/MockResponseParam.vue
@@ -5,7 +5,7 @@
       <el-collapse-transition>
         <el-tabs v-model="activeName" v-show="isActive" style="margin: 20px">
           <el-tab-pane v-if="!isTcp" :label="$t('api_test.definition.request.response_header')" name="headers" class="pane">
-            <ms-api-key-value :isShowEnable="false" :suggestions="headerSuggestions" :items="response.headers"/>
+            <ms-api-key-value style="width: 95%" :isShowEnable="false" :suggestions="headerSuggestions" :items="response.headers"/>
           </el-tab-pane>
           <el-tab-pane :label="$t('api_test.definition.request.response_body')" name="body" class="pane">
             <mock-api-response-body :isReadOnly="false" :isShowEnable="false" :api-id="apiId" :body="response.body" :headers="response.headers"/>
@@ -15,7 +15,7 @@
             <el-row>
               <el-col :span="2"/>
               <el-col :span="20">
-                <el-input class="ms-http-input" size="small" v-model="response.httpCode"/>
+                <el-input size="small" style="width: 180px;margin-top: 10px" v-model="response.httpCode"/>
               </el-col>
               <el-col :span="2"/>
             </el-row>