From d35b7173079c30e462dcc3f270577ae6d51595e4 Mon Sep 17 00:00:00 2001 From: cp3hnu Date: Thu, 27 Mar 2025 11:39:05 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=97=B6=E9=95=BF=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- react-ui/src/utils/date.ts | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/react-ui/src/utils/date.ts b/react-ui/src/utils/date.ts index 97e7f32d..33c8dda8 100644 --- a/react-ui/src/utils/date.ts +++ b/react-ui/src/utils/date.ts @@ -29,22 +29,30 @@ export const elapsedTime = (begin?: string | null, end?: string | null): string const hours = duration.hours(); const minutes = duration.minutes(); const seconds = duration.seconds(); + const elspsedArray = []; if (years !== 0) { - return `${years}年${months}个月`; + elspsedArray.push(`${years}年`); } if (months !== 0) { - return `${months}个月${days}天`; + elspsedArray.push(`${months}个月`); } if (days !== 0) { - return `${days}天${hours}小时`; + elspsedArray.push(`${days}天`); } if (hours !== 0) { - return `${hours}小时${minutes}分`; + elspsedArray.push(`${hours}小时`); } if (minutes !== 0) { - return `${minutes}分${seconds}秒`; + elspsedArray.push(`${minutes}分`); } - return `${seconds}秒`; + if (seconds !== 0) { + elspsedArray.push(`${seconds}秒`); + } + + if (elspsedArray.length === 0) { + return '0秒'; + } + return elspsedArray.slice(0, 2).join(''); }; /**