From 71b5d7f48466570522e6ff91c3d3c1a188db1ceb Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Tue, 2 Apr 2024 19:35:25 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E7=AE=A1=E7=90=86):?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3=E7=AE=A1=E7=90=86=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1037871 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001037871
--bug=1037475 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001037475
--bug=1037517 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001037517
---
 .../ms-assertion/comp/ResponseBodyTab.vue       |  9 ++++-----
 .../components/requestComposition/index.vue     | 17 ++++++++++++++++-
 .../src/views/api-test/debug/locale/en-US.ts    |  1 +
 .../src/views/api-test/debug/locale/zh-CN.ts    |  1 +
 .../management/api/preview/detail.vue           | 10 +++++-----
 5 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/business/ms-assertion/comp/ResponseBodyTab.vue b/frontend/src/components/business/ms-assertion/comp/ResponseBodyTab.vue
index 4c61328f1b..210264c77d 100644
--- a/frontend/src/components/business/ms-assertion/comp/ResponseBodyTab.vue
+++ b/frontend/src/components/business/ms-assertion/comp/ResponseBodyTab.vue
@@ -288,7 +288,7 @@
               @change="() => handleExpressionChange(rowIndex)"
             >
               <template #suffix>
-                <a-tooltip :disabled="!disabledExpressionSuffix">
+                <a-tooltip :disabled="disabledExpressionSuffix || props.disabled">
                   <template #content>
                     <div>{{ t('apiTestDebug.expressionTip1') }}</div>
                     <div>{{ t('apiTestDebug.expressionTip2') }}</div>
@@ -297,11 +297,10 @@
                   <MsIcon
                     type="icon-icon_flashlamp"
                     :size="15"
-                    :disabled="props.disabled"
                     :class="
                       disabledExpressionSuffix || props.disabled
-                        ? 'ms-params-input-suffix-icon--disabled'
-                        : 'ms-params-input-suffix-icon'
+                        ? 'ms-params-input-suffix-icon'
+                        : 'ms-params-input-suffix-icon--disabled'
                     "
                     @click.stop="() => showFastExtraction(record, RequestExtractExpressionEnum.REGEX)"
                   />
@@ -774,7 +773,7 @@
   function deleteListItem(id: string | number) {}
 
   function showFastExtraction(record: ExpressionConfig, type: ExpressionType) {
-    if (props.disabled) return;
+    if (!props.disabled) return;
     activeRecord.value = { ...record, extractType: type };
     fastExtractionVisible.value = true;
   }
diff --git a/frontend/src/views/api-test/components/requestComposition/index.vue b/frontend/src/views/api-test/components/requestComposition/index.vue
index d280336e04..72f401ee7c 100644
--- a/frontend/src/views/api-test/components/requestComposition/index.vue
+++ b/frontend/src/views/api-test/components/requestComposition/index.vue
@@ -48,7 +48,7 @@
               "
               allow-clear
               class="hover:z-10"
-              :style="isUrlError ? 'border: 1px solid rgb(var(--danger-6);z-index: 10' : ''"
+              :style="isUrlError ? 'border: 1px solid rgb(var(--danger-6));z-index: 10' : ''"
               @input="() => (isUrlError = false)"
               @change="handleUrlChange"
             />
@@ -151,6 +151,9 @@
         </div>
       </div>
     </div>
+    <div v-if="isUrlError" class="url-input-tip">
+      <span>{{ t('apiTestDebug.apiUrlRequired') }}</span>
+    </div>
     <div class="px-[16px]">
       <MsTab
         v-model:active-key="requestVModel.activeTab"
@@ -1654,4 +1657,16 @@
       @apply block;
     }
   }
+  .url-input-tip {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    margin-left: 250px;
+    color: rgb(var(--danger-6));
+    font-size: 12px;
+    line-height: 16px;
+    margin-top: 2px;
+  }
 </style>
diff --git a/frontend/src/views/api-test/debug/locale/en-US.ts b/frontend/src/views/api-test/debug/locale/en-US.ts
index f7ce1b3321..ec5ac2aaca 100644
--- a/frontend/src/views/api-test/debug/locale/en-US.ts
+++ b/frontend/src/views/api-test/debug/locale/en-US.ts
@@ -188,6 +188,7 @@ export default {
   'apiTestDebug.requestNamePlaceholder': 'Please enter a request name',
   'apiTestDebug.requestUrl': 'Request URL',
   'apiTestDebug.requestUrlRequired': 'Request URL cannot be empty',
+  'apiTestDebug.apiUrlRequired': 'URL cannot be empty',
   'apiTestDebug.requestModule': 'Belonging module',
   'apiTestDebug.closeOther': 'Close other',
   'apiTestDebug.importByCURL': 'Import cURL',
diff --git a/frontend/src/views/api-test/debug/locale/zh-CN.ts b/frontend/src/views/api-test/debug/locale/zh-CN.ts
index 491dde9e98..21b7779198 100644
--- a/frontend/src/views/api-test/debug/locale/zh-CN.ts
+++ b/frontend/src/views/api-test/debug/locale/zh-CN.ts
@@ -177,6 +177,7 @@ export default {
   'apiTestDebug.requestNamePlaceholder': '请输入请求名称',
   'apiTestDebug.requestUrl': '请求 URL',
   'apiTestDebug.requestUrlRequired': '请求 URL不能为空',
+  'apiTestDebug.apiUrlRequired': 'URL 不能为空',
   'apiTestDebug.requestModule': '请求所属模块',
   'apiTestDebug.closeOther': '关闭其他请求',
   'apiTestDebug.importByCURL': '导入 cURL',
diff --git a/frontend/src/views/api-test/management/components/management/api/preview/detail.vue b/frontend/src/views/api-test/management/components/management/api/preview/detail.vue
index d5f95ca541..fea5f2d401 100644
--- a/frontend/src/views/api-test/management/components/management/api/preview/detail.vue
+++ b/frontend/src/views/api-test/management/components/management/api/preview/detail.vue
@@ -1,6 +1,6 @@
 <template>
   <a-collapse v-model:active-key="activeDetailKey" :bordered="false">
-    <a-collapse-item key="request">
+    <a-collapse-item v-if="previewDetail.body.bodyType !== RequestBodyFormat.NONE" key="request">
       <template #header>
         <div class="flex items-center gap-[4px]">
           <div v-if="activeDetailKey.includes('request')" class="down-icon">
@@ -146,14 +146,14 @@
                     <a-radio value="code">Code</a-radio>
                   </a-radio-group> -->
             </div>
-            <div
+            <!--            <div
               v-if="previewDetail.body.bodyType === RequestBodyFormat.NONE"
-              class="flex h-[100px] items-center justify-center rounded-[var(--border-radius-small)] bg-[var(--color-text-n9)] text-[var(--color-text-4)]"
+              class="flex h-[100px] items-center justify-center rounded-[var(&#45;&#45;border-radius-small)] bg-[var(&#45;&#45;color-text-n9)] text-[var(&#45;&#45;color-text-4)]"
             >
               {{ t('apiTestDebug.noneBody') }}
-            </div>
+            </div>-->
             <MsFormTable
-              v-else-if="
+              v-if="
                 previewDetail.body.bodyType === RequestBodyFormat.FORM_DATA ||
                 previewDetail.body.bodyType === RequestBodyFormat.WWW_FORM ||
                 previewDetail.body.bodyType === RequestBodyFormat.BINARY