From 0a902b578129d86028d01f780c959fb199b1164e Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Mon, 11 Mar 2024 18:38:04 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=BC=BA=E9=99=B7=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7=E7=AE=A1=E7=90=86=E5=9B=9E=E6=94=B6=E7=AB=99?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86=E7=AD=9B=E9=80=89=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=92=8C=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1036456 --user=宋天阳 【缺陷管理】回收站列表，部分字段表头需支持筛选和排序 https://www.tapd.cn/55049933/s/1472938
---
 .../metersphere/bug/mapper/ExtBugMapper.xml   |  10 +
 frontend/src/views/bug-management/index.vue   |  12 +-
 frontend/src/views/bug-management/recycle.vue | 295 ++++++++++++++++--
 .../components/tableFilter.vue                |   2 +-
 4 files changed, 292 insertions(+), 27 deletions(-)

diff --git a/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugMapper.xml b/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugMapper.xml
index 61893fc3a2..6b4dc4c97e 100644
--- a/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugMapper.xml
+++ b/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugMapper.xml
@@ -169,6 +169,16 @@
                             and b.handle_user in
                             <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
                         </when>
+                        <!-- 删除人 -->
+                        <when test="key == 'deleteUser'">
+                            and b.delete_user in
+                            <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
+                        </when>
+                        <!-- 更新人 -->
+                        <when test="key == 'updateUser'">
+                            and b.update_user in
+                            <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
+                        </when>
                         <!-- 创建人 -->
                         <when test="key == 'createUser'">
                             and b.create_user in
diff --git a/frontend/src/views/bug-management/index.vue b/frontend/src/views/bug-management/index.vue
index e9bd32b9f3..586b178821 100644
--- a/frontend/src/views/bug-management/index.vue
+++ b/frontend/src/views/bug-management/index.vue
@@ -758,12 +758,6 @@
     sort.value = sortObj;
   }
 
-  async function searchData() {
-    // eslint-disable-next-line no-use-before-define
-    setLoadListParams(initTableParams());
-    await loadList();
-  }
-
   function initTableParams() {
     const filterParams = {
       status: statusFilterValue.value,
@@ -782,6 +776,12 @@
       },
     };
   }
+
+  function searchData() {
+    setLoadListParams(initTableParams());
+    loadList();
+  }
+
   watchEffect(() => {
     setProps({ heightUsed: heightUsed.value });
   });
diff --git a/frontend/src/views/bug-management/recycle.vue b/frontend/src/views/bug-management/recycle.vue
index fc620ffa85..36686c4f63 100644
--- a/frontend/src/views/bug-management/recycle.vue
+++ b/frontend/src/views/bug-management/recycle.vue
@@ -28,26 +28,120 @@
           }}</MsButton>
         </div>
       </template>
+
+      <template #createUserFilter="{ columnConfig }">
+        <TableFilter
+          v-model:visible="createUserFilterVisible"
+          v-model:status-filters="createUserFilterValue"
+          :title="(columnConfig.title as string)"
+          :list="createUserFilterOptions"
+          value-key="value"
+          @search="searchData()"
+        >
+          <template #item="{ item }">
+            {{ item.text }}
+          </template>
+        </TableFilter>
+      </template>
+
+      <template #updateUserFilter="{ columnConfig }">
+        <TableFilter
+          v-model:visible="updateUserFilterVisible"
+          v-model:status-filters="updateUserFilterValue"
+          :title="(columnConfig.title as string)"
+          :list="updateUserFilterOptions"
+          value-key="value"
+          @search="searchData()"
+        >
+          <template #item="{ item }">
+            {{ item.text }}
+          </template>
+        </TableFilter>
+      </template>
+
+      <template #deleteUserFilter="{ columnConfig }">
+        <TableFilter
+          v-model:visible="deleteUserFilterVisible"
+          v-model:status-filters="deleteUserFilterValue"
+          :title="(columnConfig.title as string)"
+          :list="deleteUserFilterOptions"
+          value-key="value"
+          @search="searchData()"
+        >
+          <template #item="{ item }">
+            {{ item.text }}
+          </template>
+        </TableFilter>
+      </template>
+
+      <template #handleUserFilter="{ columnConfig }">
+        <TableFilter
+          v-model:visible="handleUserFilterVisible"
+          v-model:status-filters="handleUserFilterValue"
+          :title="(columnConfig.title as string)"
+          :list="handleUserFilterOptions"
+          value-key="value"
+          @search="searchData()"
+        >
+          <template #item="{ item }">
+            {{ item.text }}
+          </template>
+        </TableFilter>
+      </template>
+
+      <template #statusFilter="{ columnConfig }">
+        <TableFilter
+          v-model:visible="statusFilterVisible"
+          v-model:status-filters="statusFilterValue"
+          :title="(columnConfig.title as string)"
+          :list="statusFilterOptions"
+          value-key="value"
+          @search="searchData()"
+        >
+          <template #item="{ item }">
+            {{ item.text }}
+          </template>
+        </TableFilter>
+      </template>
+
+      <template #severityFilter="{ columnConfig }">
+        <TableFilter
+          v-model:visible="severityFilterVisible"
+          v-model:status-filters="severityFilterValue"
+          :title="(columnConfig.title as string)"
+          :list="severityFilterOptions"
+          value-key="value"
+          @search="searchData()"
+        >
+          <template #item="{ item }">
+            {{ item.text }}
+          </template>
+        </TableFilter>
+      </template>
+
       <template #empty> </template>
     </MsBaseTable>
   </MsCard>
 </template>
 
 <script lang="ts" async setup>
-  import { Message } from '@arco-design/web-vue';
-  import dayjs from 'dayjs';
+  import { ref } from 'vue';
+  import { Message, TableData } from '@arco-design/web-vue';
 
   import { MsAdvanceFilter } from '@/components/pure/ms-advance-filter';
-  import { FilterFormItem, FilterType } from '@/components/pure/ms-advance-filter/type';
+  import { BackEndEnum, 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';
   import { BatchActionParams, BatchActionQueryParams, MsTableColumn } from '@/components/pure/ms-table/type';
   import useTable from '@/components/pure/ms-table/useTable';
+  import TableFilter from '@/views/case-management/caseManagementFeature/components/tableFilter.vue';
 
   import {
     deleteBatchByRecycle,
     deleteSingleByRecycle,
+    getCustomFieldHeader,
+    getCustomOptionHeader,
     getRecycleList,
     recoverBatchByRecycle,
     recoverSingleByRecycle,
@@ -55,9 +149,14 @@
   import { useI18n } from '@/hooks/useI18n';
   import useModal from '@/hooks/useModal';
   import { useAppStore, useTableStore } from '@/store';
-  import { characterLimit, tableParamsToRequestParams } from '@/utils';
+  import {
+    characterLimit,
+    customFieldDataToTableData,
+    customFieldToColumns,
+    tableParamsToRequestParams,
+  } from '@/utils';
 
-  import { BugListItem } from '@/models/bug-management';
+  import { BugEditCustomField, BugListItem, BugOptionItem } from '@/models/bug-management';
   import { TableKeyEnum } from '@/enums/tableEnum';
 
   const { t } = useI18n();
@@ -68,6 +167,8 @@
   const filterVisible = ref(false);
   const filterRowCount = ref(0);
   const keyword = ref('');
+  // 自定义字段
+  const customFields = ref<BugEditCustomField[]>([]);
   const filterConfigList = reactive<FilterFormItem[]>([
     {
       title: 'bugManagement.ID',
@@ -76,11 +177,9 @@
     },
     {
       title: 'bugManagement.bugName',
-      dataIndex: 'name',
-      type: FilterType.SELECT,
-      selectProps: {
-        mode: 'static',
-      },
+      dataIndex: 'title',
+      type: FilterType.INPUT,
+      backendType: BackEndEnum.STRING,
     },
     {
       title: 'bugManagement.createTime',
@@ -89,6 +188,27 @@
     },
   ]);
 
+  // 表头筛选
+  const createUserFilterOptions = ref<BugOptionItem[]>([]);
+  const createUserFilterVisible = ref(false);
+  const createUserFilterValue = ref<string[]>([]);
+  const updateUserFilterOptions = ref<BugOptionItem[]>([]);
+  const updateUserFilterVisible = ref(false);
+  const updateUserFilterValue = ref<string[]>([]);
+  const handleUserFilterOptions = ref<BugOptionItem[]>([]);
+  const handleUserFilterVisible = ref(false);
+  const handleUserFilterValue = ref<string[]>([]);
+  const deleteUserFilterOptions = ref<BugOptionItem[]>([]);
+  const deleteUserFilterVisible = ref(false);
+  const deleteUserFilterValue = ref<string[]>([]);
+  const statusFilterOptions = ref<BugOptionItem[]>([]);
+  const statusFilterVisible = ref(false);
+  const statusFilterValue = ref<string[]>([]);
+  const severityFilterOptions = ref<BugOptionItem[]>([]);
+  const severityFilterVisible = ref(false);
+  const severityFilterValue = ref<string[]>([]);
+  const severityColumnId = ref('');
+
   const heightUsed = computed(() => 286 + (filterVisible.value ? 160 + (filterRowCount.value - 1) * 60 : 0));
 
   const columns: MsTableColumn = [
@@ -96,12 +216,22 @@
       title: 'bugManagement.recycle.deleteTime',
       dataIndex: 'deleteTime',
       showDrag: true,
-      width: 180,
+      width: 199,
+      sortable: {
+        sortDirections: ['ascend', 'descend'],
+        sorter: true,
+      },
+      showInTable: true,
     },
     {
       title: 'bugManagement.recycle.deleteMan',
       dataIndex: 'deleteUserName',
+      width: 112,
       showDrag: true,
+      slotName: 'deleteUser',
+      showTooltip: true,
+      titleSlotName: 'deleteUserFilter',
+      showInTable: true,
     },
     {
       title: 'bugManagement.ID',
@@ -128,21 +258,72 @@
       columnSelectorDisabled: true,
     },
     {
-      title: 'bugManagement.creator',
-      dataIndex: 'createUserName',
-      showDrag: true,
+      title: 'bugManagement.handleMan',
+      dataIndex: 'handleUser',
+      slotName: 'handleUser',
       showTooltip: true,
+      titleSlotName: 'handleUserFilter',
+      width: 112,
+      showDrag: true,
+      showInTable: true,
+    },
+    {
+      title: 'bugManagement.creator',
+      dataIndex: 'createUser',
+      slotName: 'createUser',
+      width: 112,
+      showTooltip: true,
+      showDrag: true,
+      titleSlotName: 'createUserFilter',
+      sortable: {
+        sortDirections: ['ascend', 'descend'],
+        sorter: true,
+      },
+      showInTable: true,
     },
     {
       title: 'bugManagement.createTime',
       dataIndex: 'createTime',
       showDrag: true,
-      width: 180,
+      width: 199,
+      sortable: {
+        sortDirections: ['ascend', 'descend'],
+        sorter: true,
+      },
+      showInTable: true,
+    },
+    {
+      title: 'bugManagement.updateUser',
+      dataIndex: 'updateUser',
+      width: 112,
+      showTooltip: true,
+      showDrag: true,
+      titleSlotName: 'updateUserFilter',
+      sortable: {
+        sortDirections: ['ascend', 'descend'],
+        sorter: true,
+      },
+      showInTable: true,
+    },
+    {
+      title: 'bugManagement.updateTime',
+      dataIndex: 'updateTime',
+      showDrag: true,
+      width: 199,
+      sortable: {
+        sortDirections: ['ascend', 'descend'],
+        sorter: true,
+      },
+      showInTable: true,
     },
     {
       title: 'bugManagement.status',
       dataIndex: 'statusName',
+      width: 84,
+      slotName: 'status',
+      titleSlotName: 'statusFilter',
       showDrag: true,
+      showInTable: true,
     },
     {
       title: 'bugManagement.handleMan',
@@ -153,6 +334,7 @@
     {
       title: 'bugManagement.tag',
       showDrag: true,
+      width: 456,
       isStringTag: true,
       dataIndex: 'tags',
     },
@@ -164,7 +346,42 @@
       width: 150,
     },
   ];
-  await tableStore.initColumn(TableKeyEnum.BUG_MANAGEMENT_RECYCLE, columns, 'drawer');
+
+  // 获取自定义字段
+  const getCustomFieldColumns = async () => {
+    const res = await getCustomFieldHeader(projectId.value);
+    customFields.value = res;
+
+    //  实例化自定义字段的filters
+    customFields.value.forEach((item) => {
+      if ((item.fieldName === '严重程度' || item.fieldName === 'Bug Degree') && item.options) {
+        severityFilterOptions.value = [];
+        severityColumnId.value = `custom_single_${item.fieldId}`;
+        item.options.forEach((option) => {
+          severityFilterOptions.value.push({
+            value: option.value,
+            text: option.text,
+          });
+        });
+      }
+    });
+
+    return customFieldToColumns(res);
+  };
+
+  const customColumns = await getCustomFieldColumns();
+
+  customColumns.forEach((item) => {
+    if (item.title === '严重程度' || item.title === 'Bug Degree') {
+      item.showInTable = true;
+      item.titleSlotName = 'severityFilter';
+      item.slotName = 'severity';
+    } else {
+      item.showInTable = false;
+    }
+  });
+
+  await tableStore.initColumn(TableKeyEnum.BUG_MANAGEMENT_RECYCLE, columns.concat(customColumns), 'drawer');
 
   const { propsRes, propsEvent, loadList, setKeyword, setLoadListParams, setProps } = useTable(
     getRecycleList,
@@ -175,10 +392,13 @@
       showSetting: true,
       scroll: { x: '1900px' },
     },
-    (record) => {
-      record.deleteTime = dayjs(record.deleteTime).format('YYYY-MM-DD HH:mm:ss');
-      return record;
-    }
+    (record: TableData) => ({
+      ...record,
+      handleUser: record.handleUserName,
+      createUser: record.createUserName,
+      updateUser: record.updateUserName,
+      ...customFieldDataToTableData(record.customFields, customFields.value),
+    })
   );
 
   const tableAction = {
@@ -280,8 +500,43 @@
     }
   }
 
+  function initTableParams() {
+    const filterParams = {
+      status: statusFilterValue.value,
+      handleUser: handleUserFilterValue.value,
+      updateUser: updateUserFilterValue.value,
+      createUser: createUserFilterValue.value,
+      deleteUser: deleteUserFilterValue.value,
+    };
+    filterParams[severityColumnId.value] = severityFilterValue.value;
+    return {
+      keyword: keyword.value,
+      projectId: projectId.value,
+      filter: { ...filterParams },
+      condition: {
+        keyword: keyword.value,
+        filter: propsRes.value.filter,
+      },
+    };
+  }
+
+  function searchData() {
+    setLoadListParams(initTableParams());
+    loadList();
+  }
+
+  async function initFilterOptions() {
+    const res = await getCustomOptionHeader(appStore.currentProjectId);
+    createUserFilterOptions.value = res.userOption;
+    updateUserFilterOptions.value = res.userOption;
+    deleteUserFilterOptions.value = res.userOption;
+    handleUserFilterOptions.value = res.handleUserOption;
+    statusFilterOptions.value = res.statusOption;
+  }
+
   onMounted(() => {
     setLoadListParams({ projectId: projectId.value });
+    initFilterOptions();
     fetchData();
   });
 </script>
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tableFilter.vue b/frontend/src/views/case-management/caseManagementFeature/components/tableFilter.vue
index fcaa2ab59f..a5c4627a2f 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/tableFilter.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tableFilter.vue
@@ -1,6 +1,6 @@
 <template>
   <a-trigger v-model:popup-visible="innerVisible" trigger="click" @popup-visible-change="handleFilterHidden">
-    <a-button type="text" class="arco-btn-text--secondary p-[8px_4px]" @click="innerVisible = true">
+    <a-button type="text" class="arco-btn-text--secondary p-[8px_4px]" @click.stop="innerVisible = true">
       <div class="font-medium">
         {{ t(props.title) }}
       </div>