fankes/komari-theme-purcarte
2
0
Fork 0
mirror of https://github.com/fankes/komari-theme-purcarte.git synced 2025-10-18 19:39:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: 优化到期信息显示

Browse Source
This commit is contained in:
Montia37
2025-08-13 18:32:16 +08:00
parent f9209b9ecf
commit 874418ac47
3 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/sections/NodeCard.tsx
View File

@@ -35,7 +35,7 @@ export const NodeCard = ({ node }: NodeCardProps) => {
swapUsage,
diskUsage,
load,
daysLeft,
expired_at,
} = useNodeCommons(node);
const getProgressBarClass = (percentage: number) => {
@@ -166,13 +166,7 @@ export const NodeCard = ({ node }: NodeCardProps) => {
<div className="flex justify-between text-xs">
<div className="flex justify-between w-full">
<span className="text-secondary-foreground">到期</span>
<div className="flex items-center gap-1">
{daysLeft !== null && daysLeft > 36500
? "长期"
: node.expired_at
? new Date(node.expired_at).toLocaleDateString()
: "N/A"}
</div>
<div className="flex items-center gap-1">{expired_at}</div>
</div>
<div className="border-l border-border/60 mx-2"></div>
<div className="flex justify-between w-full">

10
src/components/sections/NodeListItem.tsx
View File

@@ -20,7 +20,7 @@ export const NodeListItem = ({ node }: NodeListItemProps) => {
swapUsage,
diskUsage,
load,
daysLeft,
expired_at,
} = useNodeCommons(node);
return (
@@ -40,13 +40,7 @@ export const NodeListItem = ({ node }: NodeListItemProps) => {
<div className="flex text-xs">
<div className="flex">
<span className="text-secondary-foreground">到期：</span>
<div className="flex items-center gap-1">
{daysLeft !== null && daysLeft > 36500
? "长期"
: node.expired_at
? new Date(node.expired_at).toLocaleDateString()
: "N/A"}
</div>
<div className="flex items-center gap-1">{expired_at}</div>
</div>
<div className="border-l border-border/60 mx-2"></div>
<div className="flex">

26
src/hooks/useNodeCommons.ts
View File

@@ -39,13 +39,27 @@ export const useNodeCommons = (node: NodeWithStatus) => {
)
: null;
let daysLeftTag = null;
if (daysLeft !== null) {
if (daysLeft < 0) {
daysLeftTag = "已过期";
} else if (daysLeft < 36500) {
daysLeftTag = `余 ${daysLeft} 天`;
} else {
daysLeftTag = "长期";
}
}
const expired_at =
daysLeft !== null && daysLeft > 36500
? "长期"
: node.expired_at
? new Date(node.expired_at).toLocaleDateString()
: "N/A";
const tagList = [
price,
`${daysLeft && daysLeft < 0 ? "已过期" : ""}${
daysLeft && daysLeft >= 0 && daysLeft < 36500
? "余 " + daysLeft + " 天"
: ""
}`,
...(daysLeftTag ? [daysLeftTag] : []),
...(typeof node.tags === "string"
? node.tags
.split(";")
@@ -63,6 +77,6 @@ export const useNodeCommons = (node: NodeWithStatus) => {
swapUsage,
diskUsage,
load,
daysLeft,
expired_at,
};
};