paperclip-bot/labelmain-demo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(task): time+download bug

Browse Source
This commit is contained in:
zhangheng
2026-06-02 10:43:54 +08:00
parent a384897386
commit f3a348e036
5 changed files with 55 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/person/dashboard/components/PersonalProjectTable.tsx
View File

@@ -2,6 +2,7 @@
import { getPersonProjectDashBoard } from "@/components/label/api/project"
import { Project } from "@/components/label/api/project/typing"
import { formatWorkTimeHoursMinutes } from "@/components/label/utils/time"
import {
SettingDataTable,
SettingListHeader,
@@ -18,24 +19,10 @@ import { DatePickerInput, type DatesRangeValue } from "@mantine/dates"
import { IconRefresh, IconSearch } from "@tabler/icons-react"
import dayjs from "dayjs"
import "dayjs/locale/zh-cn"
import duration from "dayjs/plugin/duration"
import { DataTableColumn } from "mantine-datatable"
import { useCallback, useEffect, useMemo, useState } from "react"
import classes from "../page.module.css"
dayjs.extend(duration)
function formatDurationSeconds(seconds?: number | null) {
const value = seconds ?? 0
if (!value) return "-"
const durationObj = dayjs.duration(value, "seconds")
const hours = durationObj.hours()
const minutes = durationObj.minutes()
if (hours) return `${hours}小时${minutes}分钟`
if (minutes) return `${minutes}分钟`
return "-"
}
interface FilterFormRecord {
query_date: DatesRangeValue
}
@@ -201,7 +188,7 @@ export default function PersonalProjectTable() {
render: (record: Project.PersonProjectDashboardResponseItem) => {
return (
<Text className={classes.tableCellText}>
{formatDurationSeconds(record.work_time)}
{formatWorkTimeHoursMinutes(record.work_time)}
</Text>
)
},

21
app/person/dashboard/page.tsx
View File

@@ -1,6 +1,7 @@
"use client"
import { getCurrentPersonData } from "@/components/label/api/project"
import { formatWorkTimeHoursMinutes } from "@/components/label/utils/time"
import {
SettingContentPanel,
SettingPage,
@@ -8,14 +9,11 @@ import {
} from "@/components/setting/PageSurface"
import { Stack, Text } from "@mantine/core"
import dayjs from "dayjs"
import duration from "dayjs/plugin/duration"
import { useEffect, useMemo, useState } from "react"
import PersonalProjectTable from "./components/PersonalProjectTable"
import PersonalTaskTable from "./components/PersonalTaskTable"
import classes from "./page.module.css"
dayjs.extend(duration)
function monthText(month: string) {
const list = [
"一月",
@@ -35,17 +33,6 @@ function monthText(month: string) {
return list[idx] ?? ""
}
function formatDurationSeconds(seconds?: number | null) {
const value = seconds ?? 0
if (!value) return "-"
const durationObj = dayjs.duration(value, "seconds")
const hours = durationObj.hours()
const minutes = durationObj.minutes()
if (hours) return `${hours}小时${minutes}分钟`
if (minutes) return `${minutes}分钟`
return "-"
}
export default function PersonDashboardPage() {
const [data, setData] = useState<{
label_data_size: number
@@ -68,9 +55,9 @@ export default function PersonDashboardPage() {
const dataText = useMemo(() => {
return {
label: formatDurationSeconds(data?.label_work_time ?? 0),
review1: formatDurationSeconds(data?.review1_work_time ?? 0),
review2: formatDurationSeconds(data?.review2_work_time ?? 0),
label: formatWorkTimeHoursMinutes(data?.label_work_time ?? 0),
review1: formatWorkTimeHoursMinutes(data?.review1_work_time ?? 0),
review2: formatWorkTimeHoursMinutes(data?.review2_work_time ?? 0),
}
}, [data])