From edcd8bbbda46c2bc628e4b22bb5e05ce37c54479 Mon Sep 17 00:00:00 2001
From: teukkk <mengyuan.lv@fit2cloud.com>
Date: Fri, 10 May 2024 14:00:17 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=BA=E6=99=AF=E7=9A=84=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?API/CASE=E5=8F=82=E6=95=B0=E5=80=BC=E7=BC=BA=E9=99=B7&=E5=93=8D?=
 =?UTF-8?q?=E5=BA=94=E5=86=85=E5=AE=B9=E5=90=B8=E9=A1=B6=E8=A6=86=E7=9B=96?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0tab&=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=94=A8=E4=BE=8B=E6=8A=BD=E5=B1=89=E9=87=8C?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1040495 --user=吕梦园
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001040495
---
 .../components/business/ms-add-attachment/index.vue  |  1 +
 .../api-test/components/requestComposition/index.vue | 12 ++++++------
 .../components/requestComposition/response/index.vue |  2 +-
 .../management/case/createAndEditCaseDrawer.vue      |  3 +++
 .../scenario/components/common/customApiDrawer.vue   |  5 +++--
 .../scenario/components/common/customCaseDrawer.vue  |  4 ++--
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/business/ms-add-attachment/index.vue b/frontend/src/components/business/ms-add-attachment/index.vue
index 97df868dd9..1e2dab425a 100644
--- a/frontend/src/components/business/ms-add-attachment/index.vue
+++ b/frontend/src/components/business/ms-add-attachment/index.vue
@@ -78,6 +78,7 @@
             v-model:model-value="inputFiles"
             :input-class="props.inputClass"
             placeholder=" "
+            :disabled="props.disabled"
             :max-tag-count="1"
             :size="props.inputSize"
             readonly
diff --git a/frontend/src/views/api-test/components/requestComposition/index.vue b/frontend/src/views/api-test/components/requestComposition/index.vue
index 4a5cafe091..4acf4341fa 100644
--- a/frontend/src/views/api-test/components/requestComposition/index.vue
+++ b/frontend/src/views/api-test/components/requestComposition/index.vue
@@ -8,8 +8,8 @@
       <MsIcon type="icon-icon_plugin_outlined" size="48" />
     </template>
   </a-empty>
-  <div v-show="!pluginError || isHttpProtocol" class="flex h-full flex-col">
-    <div v-if="!props.isCase" class="px-[18px] pt-[8px]">
+  <div v-show="!pluginError || isHttpProtocol" class="request-composition flex h-full flex-col">
+    <div v-if="!props.isCase" class="mb-[8px] px-[18px] pt-[8px]">
       <div class="flex flex-wrap items-baseline justify-between gap-[12px]">
         <div class="flex flex-1 flex-wrap items-center gap-[16px]">
           <a-select
@@ -187,7 +187,7 @@
         </div>
       </div>
     </div>
-    <div :class="`${!props.isCase ? 'request-tab-and-response' : ''} mt-[8px] flex-1`">
+    <div :class="`${!props.isCase ? 'request-tab-and-response' : ''} flex-1`">
       <MsTab
         v-model:active-key="requestVModel.activeTab"
         :content-tab-list="contentTabList"
@@ -1647,8 +1647,8 @@
       .response :deep(.response-head) {
         @apply sticky bg-white;
 
-        top: 48px; // 请求参数tab高度(不算border-bottom)
-        z-index: 11;
+        top: 0;
+        z-index: 102; // 覆盖请求参数tab
       }
       .request-tab-pane {
         min-height: 400px;
@@ -1660,6 +1660,7 @@
       .request {
         flex: 1;
         overflow-x: auto;
+        border-right: 1px solid var(--color-text-n8);
         .ms-scroll-bar();
         .request-tab-pane {
           min-width: 800px;
@@ -1667,7 +1668,6 @@
       }
       .response {
         width: 500px;
-        border-left: 1px solid var(--color-text-n8);
       }
     }
   }
diff --git a/frontend/src/views/api-test/components/requestComposition/response/index.vue b/frontend/src/views/api-test/components/requestComposition/response/index.vue
index e12426e305..56fb9f98b6 100644
--- a/frontend/src/views/api-test/components/requestComposition/response/index.vue
+++ b/frontend/src/views/api-test/components/requestComposition/response/index.vue
@@ -235,7 +235,7 @@
   .response-head {
     @apply flex flex-wrap items-center justify-between border-b;
 
-    padding: 8px 16px;
+    padding: 13px 16px;
     border-color: var(--color-text-n8);
     gap: 8px;
   }
diff --git a/frontend/src/views/api-test/management/components/management/case/createAndEditCaseDrawer.vue b/frontend/src/views/api-test/management/components/management/case/createAndEditCaseDrawer.vue
index 4fab29bde2..e2738cb54b 100644
--- a/frontend/src/views/api-test/management/components/management/case/createAndEditCaseDrawer.vue
+++ b/frontend/src/views/api-test/management/components/management/case/createAndEditCaseDrawer.vue
@@ -398,5 +398,8 @@
     overflow-x: hidden;
     overflow-y: auto;
     .ms-scroll-bar();
+    :deep(.request-composition) {
+      height: calc(100% - 74px); // 74: formItem第二行52+请求参数文案22
+    }
   }
 </style>
diff --git a/frontend/src/views/api-test/scenario/components/common/customApiDrawer.vue b/frontend/src/views/api-test/scenario/components/common/customApiDrawer.vue
index 883da0dae9..85eb524fc7 100644
--- a/frontend/src/views/api-test/scenario/components/common/customApiDrawer.vue
+++ b/frontend/src/views/api-test/scenario/components/common/customApiDrawer.vue
@@ -1190,6 +1190,7 @@
             );
             if (index > -1) {
               (requestVModel.value.body[type] as ExecuteRequestFormBody).formValues[index].value = item.value;
+              (requestVModel.value.body[type] as ExecuteRequestFormBody).formValues[index].files = item.files;
             }
           });
         });
@@ -1326,8 +1327,8 @@
       .response :deep(.response-head) {
         @apply sticky bg-white;
 
-        top: 48px; // 请求参数tab高度(不算border-bottom)
-        z-index: 11;
+        top: 0;
+        z-index: 102; // 覆盖请求参数tab
       }
       .request-tab-pane {
         min-height: 400px;
diff --git a/frontend/src/views/api-test/scenario/components/common/customCaseDrawer.vue b/frontend/src/views/api-test/scenario/components/common/customCaseDrawer.vue
index 62d8f8c35f..025ad9e7f5 100644
--- a/frontend/src/views/api-test/scenario/components/common/customCaseDrawer.vue
+++ b/frontend/src/views/api-test/scenario/components/common/customCaseDrawer.vue
@@ -1083,8 +1083,8 @@
       .response :deep(.response-head) {
         @apply sticky bg-white;
 
-        top: 48px; // 请求参数tab高度(不算border-bottom)
-        z-index: 11;
+        top: 0;
+        z-index: 102; // 覆盖请求参数tab
       }
       .request-tab-pane {
         min-height: 400px;