Skip to content

Commit 7adf523

Browse files
authored
[Improve][seatunnel-engine-ui] improve sorting of Running Jobs and Finished Jobs (#9107)
1 parent 02254b9 commit 7adf523

File tree

2 files changed

+42
-36
lines changed

2 files changed

+42
-36
lines changed

seatunnel-engine/seatunnel-engine-ui/src/views/jobs/finished-jobs.tsx

+21-18
Original file line numberDiff line numberDiff line change
@@ -53,24 +53,27 @@ export default defineComponent({
5353
},
5454
{
5555
title: 'Id',
56-
key: 'jobId'
56+
key: 'jobId',
57+
sorter: 'default'
5758
},
5859
{
5960
title: 'Name',
60-
key: 'jobName'
61+
key: 'jobName',
62+
sorter: 'default'
6163
},
6264
{
6365
title: 'Create Time',
64-
key: 'createTime'
66+
key: 'createTime',
67+
sorter: 'default'
6568
},
6669
{
6770
title: 'Status',
6871
key: 'jobStatus',
6972
render(row) {
7073
return (
71-
<NTag bordered={false} color={getColorFromStatus(row.jobStatus)}>
72-
{row.jobStatus}
73-
</NTag>
74+
<NTag bordered={false} color={getColorFromStatus(row.jobStatus)}>
75+
{row.jobStatus}
76+
</NTag>
7477
)
7578
}
7679
},
@@ -79,14 +82,14 @@ export default defineComponent({
7982
key: 'actions',
8083
render(row) {
8184
return h(
82-
NButton,
83-
{
84-
strong: true,
85-
tertiary: true,
86-
size: 'small',
87-
onClick: () => view(row)
88-
},
89-
{ default: () => 'View' }
85+
NButton,
86+
{
87+
strong: true,
88+
tertiary: true,
89+
size: 'small',
90+
onClick: () => view(row)
91+
},
92+
{ default: () => 'View' }
9093
)
9194
}
9295
}
@@ -95,10 +98,10 @@ export default defineComponent({
9598

9699
const columns = createColumns()
97100
return () => (
98-
<div class="w-full bg-white p-6 border border-gray-100 rounded-xl">
99-
<h2 class="font-bold text-2xl pb-6">{t('jobs.finishedJobs')}</h2>
100-
<NDataTable columns={columns} data={jobs.value} pagination={false} bordered={false} />
101-
</div>
101+
<div class="w-full bg-white p-6 border border-gray-100 rounded-xl">
102+
<h2 class="font-bold text-2xl pb-6">{t('jobs.finishedJobs')}</h2>
103+
<NDataTable columns={columns} data={jobs.value} pagination={false} bordered={false} />
104+
</div>
102105
)
103106
}
104107
})

seatunnel-engine/seatunnel-engine-ui/src/views/jobs/running-jobs.tsx

+21-18
Original file line numberDiff line numberDiff line change
@@ -54,24 +54,27 @@ export default defineComponent({
5454
},
5555
{
5656
title: 'Id',
57-
key: 'jobId'
57+
key: 'jobId',
58+
sorter: 'default'
5859
},
5960
{
6061
title: 'Name',
61-
key: 'jobName'
62+
key: 'jobName',
63+
sorter: 'default'
6264
},
6365
{
6466
title: 'Create Time',
65-
key: 'createTime'
67+
key: 'createTime',
68+
sorter: 'default'
6669
},
6770
{
6871
title: 'Status',
6972
key: 'jobStatus',
7073
render(row) {
7174
return (
72-
<NTag bordered={false} color={getColorFromStatus(row.jobStatus)}>
73-
{row.jobStatus}
74-
</NTag>
75+
<NTag bordered={false} color={getColorFromStatus(row.jobStatus)}>
76+
{row.jobStatus}
77+
</NTag>
7578
)
7679
}
7780
},
@@ -80,14 +83,14 @@ export default defineComponent({
8083
key: 'actions',
8184
render(row) {
8285
return h(
83-
NButton,
84-
{
85-
strong: true,
86-
tertiary: true,
87-
size: 'small',
88-
onClick: () => view(row)
89-
},
90-
{ default: () => 'View' }
86+
NButton,
87+
{
88+
strong: true,
89+
tertiary: true,
90+
size: 'small',
91+
onClick: () => view(row)
92+
},
93+
{ default: () => 'View' }
9194
)
9295
}
9396
}
@@ -96,10 +99,10 @@ export default defineComponent({
9699

97100
const columns = createColumns()
98101
return () => (
99-
<div class="w-full bg-white p-6 border border-gray-100 rounded-xl">
100-
<h2 class="font-bold text-2xl pb-6">{t('jobs.runningJobs')}</h2>
101-
<NDataTable columns={columns} data={jobs.value} pagination={false} bordered={false} />
102-
</div>
102+
<div class="w-full bg-white p-6 border border-gray-100 rounded-xl">
103+
<h2 class="font-bold text-2xl pb-6">{t('jobs.runningJobs')}</h2>
104+
<NDataTable columns={columns} data={jobs.value} pagination={false} bordered={false} />
105+
</div>
103106
)
104107
}
105108
})

0 commit comments

Comments
 (0)