From af3ef243168a2b4f0831b293c281cb7e5d297d5f Mon Sep 17 00:00:00 2001
From: RubyLiu <liulubingjava@163.com>
Date: Thu, 23 Nov 2023 14:55:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=AD=9B=E9=80=89=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/pure/ms-table/base-table.vue   |  8 +++--
 .../pure/ms-table/comp/defaultFilter.vue      | 29 +++++++++----------
 .../src/components/pure/ms-table/useTable.ts  |  7 +++--
 frontend/src/views/bug-management/index.vue   | 12 +-------
 4 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue
index 44e6b135d5..226640639b 100644
--- a/frontend/src/components/pure/ms-table/base-table.vue
+++ b/frontend/src/components/pure/ms-table/base-table.vue
@@ -54,7 +54,7 @@
           :tooltip="item.tooltip"
         >
           <template #title>
-            <div class="flex flex-row flex-nowrap items-center">
+            <div class="flex w-full flex-row flex-nowrap items-center">
               <slot :name="item.titleSlotName">
                 <div class="text-[var(--color-text-3)]">{{ t(item.title as string) }}</div>
               </slot>
@@ -68,9 +68,10 @@
               />
               <slot v-else-if="item.filterConfig" :name="item.filterConfig.filterSlotName">
                 <DefaultFilter
+                  class="ml-[4px]"
                   :options="item.filterConfig.options"
                   :multiple="(item.filterConfig.multiple as boolean)"
-                  @handle-confirm="(v: (string | number)[]) => handleFilterConfirm(v, item.dataIndex as string)"
+                  @handle-confirm="(v) => handleFilterConfirm(v, item.dataIndex as string)"
                 />
               </slot>
             </div>
@@ -498,6 +499,9 @@
         }
       }
     }
+    :deep(.arco-table-th-title) {
+      width: 100%;
+    }
     .setting-icon {
       margin-left: 16px;
       color: var(--color-text-4);
diff --git a/frontend/src/components/pure/ms-table/comp/defaultFilter.vue b/frontend/src/components/pure/ms-table/comp/defaultFilter.vue
index 854cdeddfe..cc6d1dcef3 100644
--- a/frontend/src/components/pure/ms-table/comp/defaultFilter.vue
+++ b/frontend/src/components/pure/ms-table/comp/defaultFilter.vue
@@ -2,7 +2,7 @@
   <a-trigger v-model:popup-visible="visible" trigger="click">
     <a-button type="text" @click="visible = true">
       <template #icon>
-        <icon-filter />
+        <icon-filter class="text-[var(--color-text-4)]" />
       </template>
     </a-button>
     <template #content>
@@ -23,7 +23,7 @@
           <a-button size="mini" type="secondary" @click="handleFilterReset">
             {{ t('common.reset') }}
           </a-button>
-          <a-button size="mini" type="primary" @click="handleFilterSubmit(false)">
+          <a-button size="mini" type="primary" @click="handleFilterSubmit()">
             {{ t('common.confirm') }}
           </a-button>
         </div>
@@ -49,25 +49,22 @@
   const checkedList = ref<(string | number)[]>([]);
   const checkedValue = ref<string | number>('');
 
-  const handleFilterSubmit = (isReset = false) => {
-    if (props.multiple) {
-      emit('handleConfirm', checkedList.value);
-    } else {
-      emit('handleConfirm', [checkedValue.value]);
-    }
-    if (!isReset) {
-      checkedList.value = [];
-      checkedValue.value = '';
-    }
-    visible.value = false;
-  };
-
   const handleFilterReset = () => {
     if (props.multiple) {
       checkedList.value = [];
     } else {
       checkedValue.value = '';
     }
-    handleFilterSubmit(true);
+    emit('handleConfirm', []);
+    visible.value = false;
+  };
+
+  const handleFilterSubmit = () => {
+    if (props.multiple) {
+      emit('handleConfirm', checkedList.value);
+    } else {
+      emit('handleConfirm', checkedValue.value ? [checkedValue.value] : []);
+    }
+    visible.value = false;
   };
 </script>
diff --git a/frontend/src/components/pure/ms-table/useTable.ts b/frontend/src/components/pure/ms-table/useTable.ts
index 58ccf05801..47a39954c3 100644
--- a/frontend/src/components/pure/ms-table/useTable.ts
+++ b/frontend/src/components/pure/ms-table/useTable.ts
@@ -302,8 +302,11 @@ export default function useTableProps<T>(
 
     // 筛选触发
     filterChange: (dataIndex: string, filteredValues: (string | number)[]) => {
-      console.log('filterChange', dataIndex, filteredValues);
-      filterItem.value = { [dataIndex]: filteredValues };
+      if (filteredValues.length > 0) {
+        filterItem.value = { [dataIndex]: filteredValues };
+      } else {
+        filterItem.value = {};
+      }
       loadList();
     },
     // 分页触发
diff --git a/frontend/src/views/bug-management/index.vue b/frontend/src/views/bug-management/index.vue
index db8e61ecc7..da55e9e70a 100644
--- a/frontend/src/views/bug-management/index.vue
+++ b/frontend/src/views/bug-management/index.vue
@@ -32,7 +32,7 @@
   import { Message } from '@arco-design/web-vue';
 
   import { MsAdvanceFilter } from '@/components/pure/ms-advance-filter';
-  import { FilterFormItem, FilterResult, FilterType } from '@/components/pure/ms-advance-filter/type';
+  import { FilterFormItem, FilterType } from '@/components/pure/ms-advance-filter/type';
   import MsButton from '@/components/pure/ms-button/index.vue';
   import MsCard from '@/components/pure/ms-card/index.vue';
   import MsBaseTable from '@/components/pure/ms-table/base-table.vue';
@@ -222,16 +222,6 @@
     console.log('create', record);
   };
 
-  const handleFilter = (filter: FilterResult) => {
-    // eslint-disable-next-line no-console
-    console.log('filter', filter);
-  };
-
-  const dataIndexChange = (dataIndex: string) => {
-    // eslint-disable-next-line no-console
-    console.log('dataIndexChange', dataIndex);
-  };
-
   const jumpToTestPlan = (record: BugListItem) => {
     router.push({
       name: 'testPlan',