From cac00f15b44f24d409e64ae1d1aa2b7021a81acc Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Mon, 24 Jun 2024 10:45:03 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5Fmap=5Freduce):=20=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E9=A1=B9=E5=88=97=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/typings/api.d.ts                          |  4 ++-
 .../job/batch/modules/job-task-list-table.vue | 28 +++++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index cc43d74..bab966e 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -1029,6 +1029,8 @@ declare namespace Api {
       jobId: string;
       /** 组名称 */
       groupName: string;
+      /** 任务名称 */
+      taskName: string;
       /** 地址 */
       clientInfo: string;
       /** 参数 */
@@ -1065,7 +1067,7 @@ declare namespace Api {
     /** jobTask list */
     type JobTaskList = Common.PaginatingQueryRecord<JobTask>;
     /** jobTask tree list */
-    type JobTaskTreeList = Common.PaginatingQueryRecord<JobTaskTree>;
+    type JobTaskTreeList = JobTask[];
   }
 
   /**
diff --git a/src/views/job/batch/modules/job-task-list-table.vue b/src/views/job/batch/modules/job-task-list-table.vue
index 74d177b..1a0f8f5 100644
--- a/src/views/job/batch/modules/job-task-list-table.vue
+++ b/src/views/job/batch/modules/job-task-list-table.vue
@@ -1,7 +1,9 @@
 <script setup lang="tsx">
+import type { DataTableRowKey } from 'naive-ui';
 import { NButton, NCode, NPopover, NTag } from 'naive-ui';
 import hljs from 'highlight.js/lib/core';
 import json from 'highlight.js/lib/languages/json';
+import { ref } from 'vue';
 import { taskStatusRecord } from '@/constants/business';
 import { $t } from '@/locales';
 import { parseArgsJson } from '@/utils/common';
@@ -27,6 +29,8 @@ interface Emits {
 
 const emit = defineEmits<Emits>();
 
+const expandedRowKeys = ref<DataTableRowKey[]>([]);
+
 const { columns, data, loading, mobilePagination } = useTable({
   apiFn: fetchGetJobTaskList,
   apiParams: {
@@ -44,7 +48,10 @@ const { columns, data, loading, mobilePagination } = useTable({
       key: 'id',
       title: $t('page.jobBatch.jobTask.id'),
       align: 'left',
-      minWidth: 120
+      minWidth: 100,
+      ellipsis: {
+        tooltip: true
+      }
     },
     {
       key: 'index',
@@ -63,6 +70,12 @@ const { columns, data, loading, mobilePagination } = useTable({
       align: 'left',
       minWidth: 180
     },
+    {
+      key: 'taskName',
+      title: $t('page.jobBatch.jobName'),
+      align: 'left',
+      minWidth: 180
+    },
     {
       key: 'taskStatus',
       title: $t('page.jobBatch.jobTask.taskStatus'),
@@ -158,7 +171,7 @@ const onLoad = (row: Record<string, any>) => {
       parentId: row.id
     })
       .then(res => {
-        row.children = res.data?.data || [];
+        row.children = res.data || [];
         resolve();
       })
       .catch(e => {
@@ -166,6 +179,14 @@ const onLoad = (row: Record<string, any>) => {
       });
   });
 };
+
+const onExpandedRowKeys = (keys: DataTableRowKey[]) => {
+  expandedRowKeys.value = keys;
+};
+
+const onUpdatePage = (_: number) => {
+  expandedRowKeys.value = [];
+};
 </script>
 
 <template>
@@ -180,7 +201,10 @@ const onLoad = (row: Record<string, any>) => {
     :indent="16"
     :cascade="false"
     allow-checking-not-loaded
+    :expanded-row-keys="expandedRowKeys"
     class="sm:h-full"
+    @update:expanded-row-keys="onExpandedRowKeys"
+    @update:page="onUpdatePage"
     @load="onLoad"
   />
 </template>