From e62728ad81bd37fcd2ddcda33e5a167f9e7af928 Mon Sep 17 00:00:00 2001
From: baiqi <qi.bai@fit2cloud.com>
Date: Fri, 26 Apr 2024 14:13:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=85=A8=E5=B1=80):=20=20=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/assets/style/var.less                       | 3 ---
 .../src/components/business/ms-case-associate/index.vue  | 2 +-
 .../business/ms-common-script/formApiImportDrawer.vue    | 2 +-
 .../src/components/business/ms-link-file/fileTree.vue    | 9 ++++-----
 frontend/src/components/pure/ms-table/base-table.vue     | 2 +-
 .../src/views/api-test/debug/components/moduleTree.vue   | 2 +-
 .../views/api-test/management/components/moduleTree.vue  | 4 ++--
 .../components/common/importApiDrawer/moduleTree.vue     | 2 +-
 .../scenario/components/operationScenarioModuleTree.vue  | 2 +-
 .../api-test/scenario/components/scenarioModuleTree.vue  | 2 +-
 .../views/api-test/scenario/components/scenarioTable.vue | 6 +-----
 frontend/src/views/api-test/scenario/index.vue           | 2 +-
 .../src/views/api-test/scenario/recycle/recycleTree.vue  | 2 +-
 .../caseManagementFeature/components/caseTree.vue        | 2 +-
 .../components/recycleCaseTable.vue                      | 2 +-
 .../tabContent/tabDependency/preAndPostCaseDrawer.vue    | 2 +-
 .../caseReview/components/detail/caseTree.vue            | 4 ++--
 .../caseReview/components/index/moduleTree.vue           | 4 ++--
 .../fileManagement/components/folderTree.vue             | 4 ++--
 .../fileManagement/components/storageList.vue            | 2 +-
 .../views/test-plan/testPlan/components/testPlanTree.vue | 2 +-
 21 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/frontend/src/assets/style/var.less b/frontend/src/assets/style/var.less
index ec9c102181..457ca9b919 100644
--- a/frontend/src/assets/style/var.less
+++ b/frontend/src/assets/style/var.less
@@ -279,7 +279,4 @@
   :deep(.arco-table-cell) {
     padding: 6px 8px;
   }
-  :deep(#ms-table-footer-wrapper) {
-    margin-top: 8px;
-  }
 }
diff --git a/frontend/src/components/business/ms-case-associate/index.vue b/frontend/src/components/business/ms-case-associate/index.vue
index 7d5c497d32..bb75dc37f3 100644
--- a/frontend/src/components/business/ms-case-associate/index.vue
+++ b/frontend/src/components/business/ms-case-associate/index.vue
@@ -90,7 +90,7 @@
             @select="folderNodeSelect"
           >
             <template #title="nodeData">
-              <div class="inline-flex w-full">
+              <div class="inline-flex w-full gap-[8px]">
                 <div class="one-line-text w-full text-[var(--color-text-1)]">{{ nodeData.name }}</div>
                 <div class="ms-tree-node-count ml-[4px] text-[var(--color-text-brand)]">{{ nodeData.count || 0 }}</div>
               </div>
diff --git a/frontend/src/components/business/ms-common-script/formApiImportDrawer.vue b/frontend/src/components/business/ms-common-script/formApiImportDrawer.vue
index ad1abef1d6..fb1a6d3fe0 100644
--- a/frontend/src/components/business/ms-common-script/formApiImportDrawer.vue
+++ b/frontend/src/components/business/ms-common-script/formApiImportDrawer.vue
@@ -51,7 +51,7 @@
             @select="folderNodeSelect"
           >
             <template #title="nodeData">
-              <div class="inline-flex w-full">
+              <div class="inline-flex w-full gap-[8px]">
                 <div class="one-line-text w-full text-[var(--color-text-1)]">{{ nodeData.name }}</div>
                 <div class="ms-tree-node-count ml-[4px] text-[var(--color-text-brand)]">{{ nodeData.count || 0 }}</div>
               </div>
diff --git a/frontend/src/components/business/ms-link-file/fileTree.vue b/frontend/src/components/business/ms-link-file/fileTree.vue
index 30af0c7239..f808052ee0 100644
--- a/frontend/src/components/business/ms-link-file/fileTree.vue
+++ b/frontend/src/components/business/ms-link-file/fileTree.vue
@@ -27,12 +27,11 @@
       @select="folderNodeSelect"
     >
       <template #title="nodeData">
-        <div class="inline-flex w-full">
+        <div class="inline-flex w-full gap-[8px]">
           <div class="one-line-text w-full text-[var(--color-text-1)]">
-            <MsIcon type="icon-icon_folder_filled1" size="14" class="mr-1 text-[var(--color-text-4)]" />{{
-              nodeData.name
-            }}</div
-          >
+            <MsIcon type="icon-icon_folder_filled1" size="14" class="mr-1 text-[var(--color-text-4)]" />
+            {{ nodeData.name }}
+          </div>
           <div class="ms-tree-node-count ml-[4px] text-[var(--color-text-brand)]">{{ nodeData.count || 0 }}</div>
         </div>
       </template>
diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue
index 4fa7c9d9e4..fa1be9928d 100644
--- a/frontend/src/components/pure/ms-table/base-table.vue
+++ b/frontend/src/components/pure/ms-table/base-table.vue
@@ -215,7 +215,7 @@
     <div
       v-if="showBatchAction || !!attrs.showPagination"
       id="ms-table-footer-wrapper"
-      class="mt-[16px] flex h-[32px] w-full flex-row flex-nowrap items-center overflow-hidden"
+      class="mt-[16px] flex w-full flex-row flex-nowrap items-center overflow-hidden"
       :class="{ 'justify-between': showBatchAction }"
     >
       <span v-if="props.actionConfig && selectedCount > 0 && !showBatchAction" class="title text-[var(--color-text-2)]">
diff --git a/frontend/src/views/api-test/debug/components/moduleTree.vue b/frontend/src/views/api-test/debug/components/moduleTree.vue
index f51fdcbcd5..3df98d0732 100644
--- a/frontend/src/views/api-test/debug/components/moduleTree.vue
+++ b/frontend/src/views/api-test/debug/components/moduleTree.vue
@@ -102,7 +102,7 @@
             <apiMethodName :method="nodeData.attachInfo?.method || nodeData.attachInfo?.protocol" />
             <div class="one-line-text w-full text-[var(--color-text-1)]">{{ nodeData.name }}</div>
           </div>
-          <div v-else class="inline-flex w-full">
+          <div v-else class="inline-flex w-full gap-[8px]">
             <div class="one-line-text w-full text-[var(--color-text-1)]">{{ nodeData.name }}</div>
             <div class="ms-tree-node-count ml-[4px] text-[var(--color-text-brand)]">{{ nodeData.count || 0 }}</div>
           </div>
diff --git a/frontend/src/views/api-test/management/components/moduleTree.vue b/frontend/src/views/api-test/management/components/moduleTree.vue
index 4e01a725ed..061bab078b 100644
--- a/frontend/src/views/api-test/management/components/moduleTree.vue
+++ b/frontend/src/views/api-test/management/components/moduleTree.vue
@@ -127,7 +127,7 @@
             <apiMethodName :method="nodeData.attachInfo?.method || nodeData.attachInfo?.protocol" />
             <div class="one-line-text w-full text-[var(--color-text-1)]">{{ nodeData.name }}</div>
           </div>
-          <div v-else :id="nodeData.id" class="inline-flex w-full">
+          <div v-else :id="nodeData.id" class="inline-flex w-full gap-[8px]">
             <div class="one-line-text w-full text-[var(--color-text-1)]">{{ nodeData.name }}</div>
             <div v-if="!props.isModal" class="ms-tree-node-count ml-[4px] text-[var(--color-text-brand)]">
               {{ modulesCount[nodeData.id] || 0 }}
@@ -286,7 +286,7 @@
       };
     }
     return {
-      height: 'calc(100vh - 305px)',
+      height: 'calc(100vh - 298px)',
       threshold: 200,
       fixedSize: true,
       buffer: 15, // 缓冲区默认 10 的时候，虚拟滚动的底部 padding 计算有问题
diff --git a/frontend/src/views/api-test/scenario/components/common/importApiDrawer/moduleTree.vue b/frontend/src/views/api-test/scenario/components/common/importApiDrawer/moduleTree.vue
index baf9e95869..709c6bcc59 100644
--- a/frontend/src/views/api-test/scenario/components/common/importApiDrawer/moduleTree.vue
+++ b/frontend/src/views/api-test/scenario/components/common/importApiDrawer/moduleTree.vue
@@ -46,7 +46,7 @@
         @select="handleNodeSelect"
       >
         <template #title="nodeData">
-          <div class="inline-flex w-full">
+          <div class="inline-flex w-full gap-[8px]">
             <div class="one-line-text w-full text-[var(--color-text-1)]">{{ nodeData.name }}</div>
             <div class="ms-tree-node-count ml-[4px] text-[var(--color-text-4)]"
               >({{ moduleCountMap[nodeData.id] || 0 }})</div
diff --git a/frontend/src/views/api-test/scenario/components/operationScenarioModuleTree.vue b/frontend/src/views/api-test/scenario/components/operationScenarioModuleTree.vue
index 3edee5225b..34277b4eaf 100644
--- a/frontend/src/views/api-test/scenario/components/operationScenarioModuleTree.vue
+++ b/frontend/src/views/api-test/scenario/components/operationScenarioModuleTree.vue
@@ -28,7 +28,7 @@
         @select="folderNodeSelect"
       >
         <template #title="nodeData">
-          <div :id="nodeData.id" class="inline-flex w-full">
+          <div :id="nodeData.id" class="inline-flex w-full gap-[8px]">
             <div class="one-line-text w-full text-[var(--color-text-1)]">{{ nodeData.name }}</div>
             <div class="ms-tree-node-count ml-[4px] text-[var(--color-text-brand)]">{{ nodeData.count || 0 }}</div>
           </div>
diff --git a/frontend/src/views/api-test/scenario/components/scenarioModuleTree.vue b/frontend/src/views/api-test/scenario/components/scenarioModuleTree.vue
index eb2a1e685c..b0d1e92060 100644
--- a/frontend/src/views/api-test/scenario/components/scenarioModuleTree.vue
+++ b/frontend/src/views/api-test/scenario/components/scenarioModuleTree.vue
@@ -77,7 +77,7 @@
         @drop="handleDrop"
       >
         <template #title="nodeData">
-          <div :id="nodeData.id" class="inline-flex w-full">
+          <div :id="nodeData.id" class="inline-flex w-full gap-[8px]">
             <div class="one-line-text w-full text-[var(--color-text-1)]">{{ nodeData.name }}</div>
             <div class="ml-[4px] text-[var(--color-text-brand)]">{{ nodeData.count || 0 }}</div>
           </div>
diff --git a/frontend/src/views/api-test/scenario/components/scenarioTable.vue b/frontend/src/views/api-test/scenario/components/scenarioTable.vue
index c8365e299e..8c32e908eb 100644
--- a/frontend/src/views/api-test/scenario/components/scenarioTable.vue
+++ b/frontend/src/views/api-test/scenario/components/scenarioTable.vue
@@ -1,6 +1,6 @@
 <template>
   <div :class="['p-[8px_16px]', props.class]">
-    <div class="mb-[16px] flex items-center justify-between">
+    <div class="mb-[8px] flex items-center justify-between">
       <div class="flex items-center"> </div>
       <div class="items-right flex gap-[8px]">
         <a-input-search
@@ -987,10 +987,6 @@
   const statusFilters = ref<string[]>([]);
   const tableStore = useTableStore();
 
-  const activeModules = computed(() => {
-    return props.activeModule === 'all' ? [] : [props.activeModule];
-  });
-
   async function loadScenarioList(refreshTreeCount?: boolean) {
     let moduleIds: string[] = [];
     if (props.activeModule && props.activeModule !== 'all') {
diff --git a/frontend/src/views/api-test/scenario/index.vue b/frontend/src/views/api-test/scenario/index.vue
index 137a04265e..37afb64671 100644
--- a/frontend/src/views/api-test/scenario/index.vue
+++ b/frontend/src/views/api-test/scenario/index.vue
@@ -648,7 +648,7 @@
 
 <style scoped lang="less">
   .pageWrap {
-    height: calc(100% - 54px);
+    height: calc(100% - 50px);
     border-radius: var(--border-radius-large);
     @apply bg-white;
     .case {
diff --git a/frontend/src/views/api-test/scenario/recycle/recycleTree.vue b/frontend/src/views/api-test/scenario/recycle/recycleTree.vue
index 7699f5117d..ee7826da7a 100644
--- a/frontend/src/views/api-test/scenario/recycle/recycleTree.vue
+++ b/frontend/src/views/api-test/scenario/recycle/recycleTree.vue
@@ -44,7 +44,7 @@
         @select="folderNodeSelect"
       >
         <template #title="nodeData">
-          <div :id="nodeData.id" class="inline-flex w-full">
+          <div :id="nodeData.id" class="inline-flex w-full gap-[8px]">
             <div class="one-line-text w-full text-[var(--color-text-1)]">{{ nodeData.name }}</div>
             <div class="ms-tree-node-count ml-[4px] text-[var(--color-text-brand)]">{{ nodeData.count || 0 }}</div>
           </div>
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue
index caee2f83ab..ee9edcf8c2 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue
@@ -32,7 +32,7 @@
       @drop="handleDrag"
     >
       <template #title="nodeData">
-        <div class="inline-flex w-full">
+        <div class="inline-flex w-full gap-[8px]">
           <div class="one-line-text w-full text-[var(--color-text-1)]">{{ nodeData.name }}</div>
           <div v-if="!props.isModal" class="ms-tree-node-count ml-[4px] text-[var(--color-text-brand)]">
             {{ nodeData.count || 0 }}
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue
index 7d216ddba2..9eae799fd2 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue
@@ -50,7 +50,7 @@
                 @select="caseNodeSelect"
               >
                 <template #title="nodeData">
-                  <div class="inline-flex w-full" @click="setFocusKey(nodeData)">
+                  <div class="inline-flex w-full gap-[8px]" @click="setFocusKey(nodeData)">
                     <div class="one-line-text w-full text-[var(--color-text-1)]">{{ nodeData.name }}</div>
                     <div class="ms-tree-node-count ml-[4px] text-[var(--color-text-brand)]">
                       {{ nodeData.count || 0 }}
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/preAndPostCaseDrawer.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/preAndPostCaseDrawer.vue
index b51847835b..ac06f40b7c 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/preAndPostCaseDrawer.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/preAndPostCaseDrawer.vue
@@ -44,7 +44,7 @@
             @select="caseNodeSelect"
           >
             <template #title="nodeData">
-              <div class="inline-flex w-full">
+              <div class="inline-flex w-full gap-[8px]">
                 <div class="one-line-text w-full text-[var(--color-text-1)]" @click="setFocusKey(nodeData)">{{
                   nodeData.name
                 }}</div>
diff --git a/frontend/src/views/case-management/caseReview/components/detail/caseTree.vue b/frontend/src/views/case-management/caseReview/components/detail/caseTree.vue
index f3e17b35e7..9eed867c36 100644
--- a/frontend/src/views/case-management/caseReview/components/detail/caseTree.vue
+++ b/frontend/src/views/case-management/caseReview/components/detail/caseTree.vue
@@ -36,7 +36,7 @@
         @select="folderNodeSelect"
       >
         <template #title="nodeData">
-          <div class="inline-flex w-full">
+          <div class="inline-flex w-full gap-[8px]">
             <div class="one-line-text w-full text-[var(--color-text-1)]">{{ nodeData.name }}</div>
             <div class="ms-tree-node-count ml-[4px] text-[var(--color-text-brand)]">{{ nodeData.count || 0 }}</div>
           </div>
@@ -74,7 +74,7 @@
 
   const virtualListProps = computed(() => {
     return {
-      height: 'calc(100vh - 460px)',
+      height: 'calc(100vh - 408px)',
       threshold: 200,
       fixedSize: true,
       buffer: 15, // 缓冲区默认 10 的时候，虚拟滚动的底部 padding 计算有问题
diff --git a/frontend/src/views/case-management/caseReview/components/index/moduleTree.vue b/frontend/src/views/case-management/caseReview/components/index/moduleTree.vue
index 812fed956e..d2f0b49210 100644
--- a/frontend/src/views/case-management/caseReview/components/index/moduleTree.vue
+++ b/frontend/src/views/case-management/caseReview/components/index/moduleTree.vue
@@ -68,7 +68,7 @@
         @drop="handleDrop"
       >
         <template #title="nodeData">
-          <div class="inline-flex w-full">
+          <div class="inline-flex w-full gap-[8px]">
             <div class="one-line-text w-full text-[var(--color-text-1)]">{{ nodeData.name }}</div>
             <div v-if="!props.isModal" class="ms-tree-node-count ml-[4px] text-[var(--color-text-brand)]">
               {{ nodeData.count || 0 }}
@@ -148,7 +148,7 @@
       };
     }
     return {
-      height: 'calc(100vh - 325px)',
+      height: 'calc(100vh - 218px)',
       threshold: 200,
       fixedSize: true,
       buffer: 15, // 缓冲区默认 10 的时候，虚拟滚动的底部 padding 计算有问题
diff --git a/frontend/src/views/project-management/fileManagement/components/folderTree.vue b/frontend/src/views/project-management/fileManagement/components/folderTree.vue
index 80051c214b..b42e354b11 100644
--- a/frontend/src/views/project-management/fileManagement/components/folderTree.vue
+++ b/frontend/src/views/project-management/fileManagement/components/folderTree.vue
@@ -31,7 +31,7 @@
       @drop="handleDrop"
     >
       <template #title="nodeData">
-        <div class="inline-flex w-full">
+        <div class="inline-flex w-full gap-[8px]">
           <div class="one-line-text text-[var(--color-text-1)]">{{ nodeData.name }}</div>
           <div v-if="!props.isModal" class="ms-tree-node-count ml-auto text-[var(--color-text-brand)]">
             {{ nodeData.count || 0 }}
@@ -114,7 +114,7 @@
       };
     }
     return {
-      height: 'calc(100vh - 325px)',
+      height: 'calc(100vh - 292px)',
       threshold: 200,
       fixedSize: true,
       buffer: 15, // 缓冲区默认 10 的时候，虚拟滚动的底部 padding 计算有问题
diff --git a/frontend/src/views/project-management/fileManagement/components/storageList.vue b/frontend/src/views/project-management/fileManagement/components/storageList.vue
index 868c729017..fc40890d79 100644
--- a/frontend/src/views/project-management/fileManagement/components/storageList.vue
+++ b/frontend/src/views/project-management/fileManagement/components/storageList.vue
@@ -10,7 +10,7 @@
     <MsList
       v-model:focus-item-key="focusItemKey"
       :virtual-list-props="{
-        height: 'calc(100vh - 325px)',
+        height: 'calc(100vh - 275px)',
       }"
       :data="storageList"
       :bordered="false"
diff --git a/frontend/src/views/test-plan/testPlan/components/testPlanTree.vue b/frontend/src/views/test-plan/testPlan/components/testPlanTree.vue
index db429917a0..94228eee47 100644
--- a/frontend/src/views/test-plan/testPlan/components/testPlanTree.vue
+++ b/frontend/src/views/test-plan/testPlan/components/testPlanTree.vue
@@ -30,7 +30,7 @@
       @drop="handleDrag"
     >
       <template #title="nodeData">
-        <div class="inline-flex w-full">
+        <div class="inline-flex w-full gap-[8px]">
           <div class="one-line-text w-full text-[var(--color-text-1)]">{{ nodeData.name }}</div>
           <div v-if="!props.isModal" class="ms-tree-node-count ml-[4px] text-[var(--color-text-brand)]">
             {{ nodeData.count || 0 }}