From 79e57a1ef75f44c896b280f74ef3a2aea69a4fd8 Mon Sep 17 00:00:00 2001
From: Kataick <24969684+Kataick@users.noreply.github.com>
Date: Mon, 12 Aug 2024 10:22:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(webui):=20=E4=BF=AE=E5=A4=8D=E7=9B=B4?=
 =?UTF-8?q?=E6=92=AD=E5=8E=86=E5=8F=B2=E4=B8=8E=E5=8E=86=E5=8F=B2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98=20(#1025)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(webui): 修复直播历史与历史记录排序问题

* 删除与本地缩进不一样的问题

* 删除与本地缩进不一样的问题

* 一些格式化

* 修复遗漏项
---
 app/history/page.tsx | 11 ++++-------
 app/job/page.tsx     | 13 +++----------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/app/history/page.tsx b/app/history/page.tsx
index a2a5f8d..d26cbd7 100644
--- a/app/history/page.tsx
+++ b/app/history/page.tsx
@@ -40,11 +40,14 @@ export default function Home() {
         {
             title: '大小',
             dataIndex: 'size',
+            render: (size: number) => `${(size / 1024 / 1024).toFixed(2)} MB`,
         },
         {
             title: '更新日期',
             dataIndex: 'updateTime',
+            defaultSortOrder: 'descend',
             sorter: (a: any, b: any) => (a.updateTime - b.updateTime > 0 ? 1 : -1),
+            render: (time: number) => humDate(time),
         },
         {
             title: '',
@@ -96,13 +99,7 @@ export default function Home() {
             }}
         >
             <main>
-                <Table size="small" columns={columns} dataSource={data?.map(res => {
-                    return {
-                        ...res,
-                        size: (res.size / 1024 / 1024).toFixed(2) + ' MB',
-                        updateTime: humDate(res.updateTime)
-                    }
-                })} />
+                <Table size="small" columns={columns} dataSource={data} />
             </main>
             <Modal
                 visible={visible}
diff --git a/app/job/page.tsx b/app/job/page.tsx
index e381bf1..dde6a5c 100644
--- a/app/job/page.tsx
+++ b/app/job/page.tsx
@@ -19,8 +19,6 @@ export default function Home() {
         return (<Spin size="large" />);
     }
     const { Text } = Typography;
-    const ascendSort: SortOrder = "ascend";
-    const descendSort: SortOrder = "descend";
     const columns = [
         {
             title: '名称',
@@ -50,14 +48,9 @@ export default function Home() {
         {
             title: '更新日期',
             dataIndex: 'date',
-            render: (text: any, record: any, index: any) => {
-                return (<>{humDate(text)}</>);
-            },
-            defaultSortOrder: descendSort,
-            sorter: (a: any, b: any, order: any) => {
-                // 后端发来的似乎是时间戳，正常比较大小就好
-                return a.date - b.date
-            },
+            defaultSortOrder: 'descend',
+            sorter: (a: any, b: any) => ( a.date - b.date > 0 ? 1 : -1),
+            render: (time: number) => humDate(time),
         },
     ];
     const expandRowRender = (record: any, index: number | undefined) => {