完成留言筛选功能

src/pages/Article/index.tsx

@@ -130,7 +130,7 @@ const ArticlePage = () => {
             startDate: values.createTime ? values.createTime[0].valueOf() + '' : undefined,
             endDate: values.createTime ? values.createTime[1].valueOf() + '' : undefined,
             cateIds: values.cateIds,
-            tagId: values.tagId ? values.tagId + "" : undefined,
+            tagId: values.tagId,
         }
 
         const { data } = await getArticleListAPI({ query });

src/pages/Article/type.d.ts

@@ -6,6 +6,6 @@ export interface FilterForm {
 }
 
 export interface FilterArticle extends FilterData {
-    cateIds?: number[] | null,
+    cateIds?: number[],
-    tagId?: string | null,
+    tagId?: number,
 }

src/pages/Footprint/type.d.ts

@@ -1,5 +1,5 @@
-interface FilterForm {
+export interface FilterForm {
-    title?: string;
     content?: string;
+    cateId?: number;
     createTime?: [moment.Moment, moment.Moment];
 }

src/pages/Wall/index.tsx

@@ -1,10 +1,11 @@
 import { useState, useEffect } from 'react';
 import { Card, message, Table, Popconfirm, Button, Tag, Modal, Form, Input, DatePicker, Select } from 'antd';
-import { getWallListAPI, delWallDataAPI, getWallCateListAPI } from '@/api/Wall';
 import { ColumnsType } from 'antd/es/table';
+import { getWallListAPI, delWallDataAPI, getWallCateListAPI } from '@/api/Wall';
 import { titleSty } from '@/styles/sty';
 import Title from '@/components/Title';
 import { Cate, Wall } from '@/types/app/wall';
+import { FilterForm, FilterWall } from './type';
 import dayjs from 'dayjs';
 
 const WallPage = () => {
@@ -107,15 +108,14 @@ const WallPage = () => {
     const { RangePicker } = DatePicker;
 
     const onSubmit = async (values: FilterForm) => {
-        const query: FilterData = {
+        const query: FilterWall = {
-            key: values.title ? values.title : undefined,
+            key: values.content,
-            content: values.content ? values.content : undefined,
+            cateId: values.cateId,
             startDate: values.createTime ? values.createTime[0].valueOf() + '' : undefined,
             endDate: values.createTime ? values.createTime[1].valueOf() + '' : undefined,
         }
 
         const { data } = await getWallListAPI({ query });
-        console.log(data);
         setList(data)
     }
 

src/pages/Wall/type.d.ts

@@ -0,0 +1,10 @@
+export interface FilterForm {
+    content?: string,
+    cateId?: number,
+    createTime: Date[]
+}
+
+export interface FilterWall extends FilterData {
+    content?: string,
+    cateId?: number
+}