From 67b86d44872d2a9f77505a1cf413307ca5861223 Mon Sep 17 00:00:00 2001
From: baiqi <qi.bai@fit2cloud.com>
Date: Tue, 24 Sep 2024 10:53:31 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20cu?=
 =?UTF-8?q?rl=20=E5=AF=BC=E5=85=A5xml=20=E5=8F=8A=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=96=B0=E5=BB=BA=E8=AF=B7=E6=B1=82=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1047024 --user=白奇 【接口测试】场景自定义请求curl导入xml请求类型-导入后请求体无数据 https://www.tapd.cn/55049933/s/1584459
---
 frontend/src/models/apiTest/common.ts               |  2 +-
 .../components/requestComposition/index.vue         |  2 +-
 frontend/src/views/api-test/components/utils.ts     | 13 ++++++++++---
 .../views/api-test/debug/components/moduleTree.vue  |  2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/frontend/src/models/apiTest/common.ts b/frontend/src/models/apiTest/common.ts
index 34a5a79e2b..08d905dda7 100644
--- a/frontend/src/models/apiTest/common.ts
+++ b/frontend/src/models/apiTest/common.ts
@@ -468,7 +468,7 @@ export interface CurlParseResult {
   method: RequestMethods | string;
   url: string;
   headers: Record<string, any>;
-  body: Record<string, any>;
+  body: Record<string, any> | string;
   bodyType: RequestBodyFormat;
   queryParams: Record<string, any>;
 }
diff --git a/frontend/src/views/api-test/components/requestComposition/index.vue b/frontend/src/views/api-test/components/requestComposition/index.vue
index 79bcbd313c..2c70765785 100644
--- a/frontend/src/views/api-test/components/requestComposition/index.vue
+++ b/frontend/src/views/api-test/components/requestComposition/index.vue
@@ -80,7 +80,7 @@
               @input="() => (isUrlError = false)"
               @change="handleUrlChange"
             >
-              <template v-if="hasAnyPermission(['PROJECT_API_DEBUG:READ+IMPORT'])" #suffix>
+              <template v-if="!props.isDefinition" #suffix>
                 <MsIcon
                   type="icon-icon_curl"
                   :size="18"
diff --git a/frontend/src/views/api-test/components/utils.ts b/frontend/src/views/api-test/components/utils.ts
index fb3a3e04c3..9549b30401 100644
--- a/frontend/src/views/api-test/components/utils.ts
+++ b/frontend/src/views/api-test/components/utils.ts
@@ -280,7 +280,7 @@ export function filterAssertions(assertionConfig: ExecuteAssertionConfig, isExec
  * @param bodyType body 类型
  * @param body body 参数对象
  */
-export function parseCurlBody(bodyType: RequestBodyFormat, body: Record<string, any>) {
+export function parseCurlBody(bodyType: RequestBodyFormat, body: Record<string, any> | string) {
   const requestBody = cloneDeep(defaultBodyParams);
   switch (bodyType) {
     case RequestBodyFormat.JSON:
@@ -291,6 +291,13 @@ export function parseCurlBody(bodyType: RequestBodyFormat, body: Record<string,
         jsonValue: JSON.stringify(body),
       };
       break;
+    case RequestBodyFormat.XML:
+      requestBody.bodyType = bodyType;
+      requestBody.xmlBody = {
+        ...cloneDeep(defaultBodyParams.xmlBody),
+        value: body as string,
+      };
+      break;
     case RequestBodyFormat.FORM_DATA:
       requestBody.bodyType = bodyType;
       requestBody.formDataBody = {
@@ -298,7 +305,7 @@ export function parseCurlBody(bodyType: RequestBodyFormat, body: Record<string,
         formValues: Object.keys(body).map((e) => ({
           ...defaultBodyParamsItem,
           key: e,
-          value: body[e],
+          value: (body as Record<string, any>)[e],
         })),
       };
       break;
@@ -309,7 +316,7 @@ export function parseCurlBody(bodyType: RequestBodyFormat, body: Record<string,
         formValues: Object.keys(body).map((e) => ({
           ...defaultBodyParamsItem,
           key: e,
-          value: body[e],
+          value: (body as Record<string, any>)[e],
         })),
       };
       break;
diff --git a/frontend/src/views/api-test/debug/components/moduleTree.vue b/frontend/src/views/api-test/debug/components/moduleTree.vue
index 78efc77f79..96c5d3f38d 100644
--- a/frontend/src/views/api-test/debug/components/moduleTree.vue
+++ b/frontend/src/views/api-test/debug/components/moduleTree.vue
@@ -2,7 +2,7 @@
   <div class="flex h-full flex-col p-[12px_16px]">
     <div class="mb-[8px] flex items-center gap-[8px]">
       <a-input v-model:model-value="moduleKeyword" :placeholder="t('apiTestDebug.searchTip')" allow-clear />
-      <a-button v-permission="['PROJECT_API_DEBUG:READ+ADD']" type="primary">
+      <a-button v-permission="['PROJECT_API_DEBUG:READ+ADD']" type="primary" @click="emit('newApi')">
         {{ t('apiTestDebug.newApi') }}
       </a-button>
     </div>