feat: 新增任务列表-批量功能

Author: EmbraceAn

.env.development

@@ -1,4 +1,8 @@
-VITE_BASE_URL = "http://192.168.3.3:8082/"
+# 高鹏 本地
+# VITE_BASE_URL = "http://192.168.3.3:8082/"
 
-#  "http://legion-4g.yaklang.com:8080/pre/"
-# "http://192.168.3.3/"
+# 秦晨凯 本地
+VITE_BASE_URL = "http://192.168.3.179:8082/"
+
+# 线上 地址
+#  "http://legion-4g.yaklang.com:8080/pre/"

src/apis/task/index.ts

@@ -180,6 +180,15 @@ const postStorageTaskScript = (
         data,
     );
 
+// 批量删除任务 /api
+const deleteScriptTask = (data: {
+    ids: number[];
+}): Promise<ResponseData<boolean>> =>
+    axios.post<never, ResponseData<boolean>>(
+        '/task/start/batch-invoking-script-task/delete',
+        data,
+    );
+
 export {
     getScriptTaskGroup,
     postTaskGrounp,
@@ -198,4 +207,5 @@ export {
     postEditScriptTask,
     getRunScriptTask,
     postStorageTaskScript,
+    deleteScriptTask,
 };

src/compoments/WizardTable/index.tsx

@@ -44,6 +44,7 @@ const WizardTable = <T extends AnyObject = AnyObject>(
     const { runAsync } = useRequest(
         async (requests, reset?: boolean, arg?: any) => {
             dispatch({ loading: true });
+            console.log(dataSource, page, 'data');
             try {
                 if (!state.loading) {
                     const data = await requests(
@@ -276,18 +277,21 @@ const WizardTable = <T extends AnyObject = AnyObject>(
             // 删除
             .with({ operate: 'delete' }, ({ oldObj }) => {
                 if (args.operate === 'delete' && oldObj) {
-                    // 查找满足部分匹配条件的对象索引
-                    const index = dataSource?.findIndex((item) =>
-                        Object.entries(oldObj).every(
-                            ([key, value]) => item[key] === value,
-                        ),
+                    // 过滤掉满足 oldObj 条件的对象
+                    const tragetDataSource = dataSource?.filter((item) =>
+                        Object.entries(oldObj).some(([key, value]) => {
+                            if (Array.isArray(value)) {
+                                // 如果值是数组，检查 item[key] 是否包含在数组中
+                                return !value.includes(item[key]);
+                            } else {
+                                // 如果是其他类型，直接检查是否不匹配
+                                return item[key] !== value;
+                            }
+                        }),
                     );
 
-                    // 如果找到符合条件的对象，删除它
-                    if (index !== -1) {
-                        const tragetDataSource = dataSource?.filter(
-                            (_, idx) => idx !== index,
-                        );
+                    if (tragetDataSource?.length !== dataSource?.length) {
+                        // 更新数据源
                         dispatch({
                             dataSource: tragetDataSource,
                         });

src/pages/TaskPageList/TaskPageList.tsx

@@ -1,12 +1,13 @@
 import { useRef, type FC } from 'react';
-import { Button, Radio, Spin } from 'antd';
+import { Button, message, Radio, Spin } from 'antd';
 
 import { WizardTable } from '@/compoments';
-import { useRequest, useSafeState } from 'ahooks';
+import { useRequest, useSafeState, useUpdateEffect } from 'ahooks';
 import {
     getTaskList,
     getScriptTaskGroup,
     getAnalysisScript,
+    deleteScriptTask,
 } from '@/apis/task';
 import { PlusOutlined } from '@ant-design/icons';
 
@@ -40,6 +41,24 @@ const TaskPageList: FC = () => {
         {},
     );
 
+    const { loading, run } = useRequest(
+        async () => {
+            await deleteScriptTask({
+                ids: deleteValues?.task_name ?? [],
+            });
+        },
+        {
+            manual: true,
+            onSuccess: async () => {
+                page.localRefrech({
+                    operate: 'delete',
+                    oldObj: { id: deleteValues?.task_name },
+                });
+                message.success('删除成功');
+            },
+        },
+    );
+
     // 获取项目组请求
     const { loading: taskGrounpLoading, refreshAsync } = useRequest(
         getScriptTaskGroup,
@@ -149,6 +168,10 @@ const TaskPageList: FC = () => {
         await scriptRun();
     };
 
+    useUpdateEffect(() => {
+        page.onLoad({ task_groups: taskGroupKey });
+    }, [taskGroupKey]);
+
     return (
         <div className="flex align-start h-full">
             <div
@@ -178,7 +201,6 @@ const TaskPageList: FC = () => {
                         siderContextList={siderContextList}
                         setSiderContextList={setSiderContextList}
                         refreshAsync={refreshAsync}
-                        onload={page.onLoad}
                         taskGroupKey={taskGroupKey}
                         setTaskGroupKey={setTaskGroupKey}
                     />
@@ -220,12 +242,10 @@ const TaskPageList: FC = () => {
                                             ? false
                                             : true
                                     }
-                                    onClick={() =>
-                                        alert(
-                                            'id: ' +
-                                                deleteValues?.task_name?.join(),
-                                        )
-                                    }
+                                    onClick={async () => {
+                                        run();
+                                    }}
+                                    loading={loading}
                                 >
                                     批量删除
                                 </Button>

src/pages/TaskPageList/compoment/ListSiderContext.tsx

@@ -22,7 +22,6 @@ interface TListSiderContext {
         React.SetStateAction<TListSiderContext['siderContextList']>
     >;
     refreshAsync: () => Promise<any>;
-    onload: (agrs: any) => void;
     taskGroupKey: string;
     setTaskGroupKey: Dispatch<React.SetStateAction<string>>;
 }
@@ -33,7 +32,6 @@ const ListSiderContext: FC<TListSiderContext> = ({
     siderContextList,
     setSiderContextList,
     refreshAsync,
-    onload,
     taskGroupKey,
     setTaskGroupKey,
 }) => {
@@ -202,7 +200,6 @@ const ListSiderContext: FC<TListSiderContext> = ({
                         className={`${styles['tools-list-item']} ${taskGroupKey === item.name ? styles['tools-list-click'] : null}`}
                         key={item.name + key}
                         onClick={() => {
-                            onload({ task_groups: [item.name] });
                             setTaskGroupKey(item.name);
                         }}
                     >