优化筛选

Author: SpringHgui

ui/vite-opentask/src/pages/taskInfos/components/tool-bar.tsx

@@ -19,6 +19,8 @@ export function DataTableToolbar<TData>({
     event.preventDefault();
 
     queryClient.invalidateQueries({ queryKey: ["listTaskInfos"] });
+    table.setPageIndex(0);
+
     const formData = new FormData(event.currentTarget);
     table.getColumn("name")?.setFilterValue(formData.get("name"));
   };

ui/vite-opentask/src/pages/taskInfos/index.tsx

@@ -33,7 +33,7 @@ export function TaskInfos() {
           "Loading..."
         ) : error instanceof Error ? (
           error.message
-        ) : (
+        ) : (!data!.success ? data?.message :
           <DataTable
             toolbar={DataTableToolbar}
             columnFilters={columnFilters}

ui/vite-opentask/src/pages/taskLogs/components/tool-bar.tsx

@@ -20,9 +20,9 @@ import { queryClient } from "@/apis";
 export function DataTableToolbar<TData>({
   table,
 }: DataTableToolbarProps<TData>) {
-  const isFiltered = table.getState().columnFilters.length > 0;
+  const isFiltered = table.getState().globalFilter?.taskId;
   const [taskID, setTaskId] = useState(
-    (table.getColumn("taskId")?.getFilterValue() as string) ?? ""
+    (table.getState().globalFilter?.taskId as string) ?? ""
   );
 
   const [date, setDate] = useState<DateRange | undefined>({
@@ -34,17 +34,19 @@ export function DataTableToolbar<TData>({
     event.preventDefault();
 
     queryClient.invalidateQueries({ queryKey: ["listLogs"] });
+    table.setPageIndex(0);
 
     const filters: ListLogsRequest = {
       taskId: taskID,
       startTime: date?.from,
       endTime: date?.to,
     };
+
     table.setGlobalFilter(filters);
   };
 
   const reset = () => {
-    table.resetColumnFilters();
+    table.resetGlobalFilter();
     setTaskId("");
   };
   return (

ui/vite-opentask/src/pages/taskLogs/index.tsx

@@ -28,9 +28,9 @@ export function TaskLogs() {
       return new TaskLogApi(config).listLogs({
         pageNumber: pagination.pageIndex + 1,
         pageSize: pagination.pageSize,
-        taskId: globalFilters.taskId,
-        startTime: globalFilters.startTime,
-        endTime: globalFilters.endTime,
+        taskId: globalFilters?.taskId,
+        startTime: globalFilters?.startTime,
+        endTime: globalFilters?.endTime,
       });
     },
     placeholderData: keepPreviousData,
@@ -42,8 +42,8 @@ export function TaskLogs() {
         {status === "pending"
           ? "Loading..."
           : error instanceof Error
-          ? error.message
-          : data!.result!.rows! && (
+            ? error.message
+            : (!data!.success ? data?.message : (
               <DataTable
                 globalFilters={globalFilters}
                 setGlobalFilters={setGlobalFilters}
@@ -56,7 +56,7 @@ export function TaskLogs() {
                 total={parseInt(data!.result!.count!)}
                 columns={columns}
               />
-            )}
+            ))}
       </div>
     </>
   );