From 6444e3f9dae3d1df0f1bcb63ae298ddc8db2a031 Mon Sep 17 00:00:00 2001
From: baiqi <qi.bai@fit2cloud.com>
Date: Mon, 12 Aug 2024 19:11:11 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D&?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/pure/ms-form-table/index.vue    |  4 ++--
 .../components/pure/ms-table/base-table.vue    |  2 +-
 .../response/result/assertionTable.vue         | 18 +++++++++++++-----
 .../response/result/extractTable.vue           |  9 ++++++++-
 .../src/views/api-test/components/utils.ts     |  2 +-
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/pure/ms-form-table/index.vue b/frontend/src/components/pure/ms-form-table/index.vue
index 02948315b7..cb2134d7f0 100644
--- a/frontend/src/components/pure/ms-form-table/index.vue
+++ b/frontend/src/components/pure/ms-form-table/index.vue
@@ -174,13 +174,13 @@
               @change="() => handleFormChange(record, rowIndex, item)"
             >
             </MsQuickInput>
-            <template v-else-if="item.inputType === 'text'">
+            <div v-else-if="item.inputType === 'text'" class="pl-[8px]">
               {{
                 typeof item.valueFormat === 'function'
                   ? item.valueFormat(record)
                   : record[item.dataIndex as string] || '-'
               }}
-            </template>
+            </div>
             <template v-else-if="item.dataIndex === 'action'">
               <div
                 :key="item.dataIndex"
diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue
index d988af683d..0651230158 100644
--- a/frontend/src/components/pure/ms-table/base-table.vue
+++ b/frontend/src/components/pure/ms-table/base-table.vue
@@ -174,7 +174,7 @@
                 />
                 <a-tooltip
                   v-else
-                  position="top"
+                  position="tl"
                   content-class="max-w-[400px]"
                   :content="String(record[item.dataIndex as string])"
                   :disabled="record[item.dataIndex as string] === '' || record[item.dataIndex as string] === undefined || record[item.dataIndex as string] === null"
diff --git a/frontend/src/views/api-test/components/requestComposition/response/result/assertionTable.vue b/frontend/src/views/api-test/components/requestComposition/response/result/assertionTable.vue
index ee14c99210..1e2e552438 100644
--- a/frontend/src/views/api-test/components/requestComposition/response/result/assertionTable.vue
+++ b/frontend/src/views/api-test/components/requestComposition/response/result/assertionTable.vue
@@ -20,11 +20,13 @@
         </a-tooltip>
       </template>
       <template #condition="{ record }">
-        {{
-          record.assertionType === FullResponseAssertionType.RESPONSE_TIME
-            ? t('advanceFilter.operator.le')
-            : t(statusCodeOptions.find((item) => item.value === record.condition)?.label || '-')
-        }}
+        <div class="pl-[8px]">
+          {{
+            record.assertionType === FullResponseAssertionType.RESPONSE_TIME
+              ? t('advanceFilter.operator.le')
+              : t(statusCodeOptions.find((item) => item.value === record.condition)?.label || '-')
+          }}
+        </div>
       </template>
       <template #status="{ record }">
         <MsTag :type="record.pass === true ? 'success' : 'danger'" theme="light">
@@ -69,7 +71,9 @@
     {
       title: 'apiTestDebug.actualValue',
       dataIndex: 'actualValue',
+      slotName: 'actualValue',
       showTooltip: true,
+      inputType: 'text',
       width: 200,
     },
     {
@@ -81,7 +85,9 @@
     {
       title: 'apiTestDebug.expectedValue',
       dataIndex: 'expectedValue',
+      slotName: 'expectedValue',
       showTooltip: true,
+      inputType: 'text',
       width: 200,
     },
     {
@@ -93,7 +99,9 @@
     {
       title: 'apiTestDebug.reason',
       dataIndex: 'message',
+      slotName: 'message',
       showTooltip: true,
+      inputType: 'text',
       width: 300,
     },
   ];
diff --git a/frontend/src/views/api-test/components/requestComposition/response/result/extractTable.vue b/frontend/src/views/api-test/components/requestComposition/response/result/extractTable.vue
index 3c0ae624a7..c871000c89 100644
--- a/frontend/src/views/api-test/components/requestComposition/response/result/extractTable.vue
+++ b/frontend/src/views/api-test/components/requestComposition/response/result/extractTable.vue
@@ -7,7 +7,7 @@
       :scroll="props.scroll"
     >
       <template #type="{ record }">
-        {{ t(extractTypeOptions.find((item) => item.value === record.type)?.label || '') }}
+        <div class="pl-[8px]">{{ t(extractTypeOptions.find((item) => item.value === record.type)?.label || '') }}</div>
       </template>
     </MsFormTable>
   </a-scrollbar>
@@ -38,25 +38,32 @@
     {
       title: 'apiTestDebug.paramName',
       dataIndex: 'name',
+      slotName: 'name',
       showTooltip: true,
+      inputType: 'text',
       width: 200,
     },
     {
       title: 'apiTestDebug.extractValue',
       dataIndex: 'value',
+      slotName: 'value',
       showTooltip: true,
+      inputType: 'text',
       width: 200,
     },
     {
       title: 'apiTestDebug.paramType',
       dataIndex: 'type',
       slotName: 'type',
+      inputType: 'text',
       width: 120,
     },
     {
       title: 'apiTestDebug.expression',
       dataIndex: 'expression',
+      slotName: 'expression',
       showTooltip: true,
+      inputType: 'text',
       width: 200,
     },
   ];
diff --git a/frontend/src/views/api-test/components/utils.ts b/frontend/src/views/api-test/components/utils.ts
index 55d1e6f271..40c47886d1 100644
--- a/frontend/src/views/api-test/components/utils.ts
+++ b/frontend/src/views/api-test/components/utils.ts
@@ -247,7 +247,7 @@ export function filterAssertions(assertionConfig: ExecuteAssertionConfig, isExec
   return assertionConfig.assertions.map((assertItem: any) => {
     const lastItem =
       assertItem?.jsonPathAssertion?.assertions[(assertItem?.jsonPathAssertion?.assertions.length || 1) - 1];
-    if (lastItem.expression === '' && lastItem.expectedValue === '' && lastItem.enable === true) {
+    if (lastItem && lastItem.expression === '' && lastItem.expectedValue === '' && lastItem.enable === true) {
       // 最后一行是空行，将其删除
       assertItem.jsonPathAssertion.assertions.splice(-1, 1);
     }