mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-06-05 12:44:22 +00:00
feat(sub): usage summary card + remark-email on QR popover labels
SubPage now opens with a clear quota panel directly under the info table: large `used / total` numbers, gradient progress bar (green ≤ 75%, orange to 90%, red above), `remained` and `%` on the foot, plus a Tag chip for unlimited subscriptions and a coloured chip for days left until expiry (blue >3d, orange ≤3d, red on expiry). Driven entirely off existing subData fields — no backend changes. While the row title in the link list stays email-stripped (default remark model omits email now), the QR popover label folds it back in so the rendered QR card identifies the client unambiguously. Tag content becomes `<rowTitle>-<email>` in both SubPage and ClientInfoModal — the encoded link itself is unchanged. SubPage section order is now: info table → usage summary → SUB / JSON / CLASH endpoints → per-protocol Copy URL rows → apps row, so the most-glanceable status sits above the fold.
This commit is contained in:
parent
d9ec23c442
commit
e70f0e5e5c
4 changed files with 266 additions and 67 deletions
|
|
@ -393,9 +393,11 @@ export default function ClientInfoModal({
|
||||||
<Divider>{t('pages.inbounds.copyLink')}</Divider>
|
<Divider>{t('pages.inbounds.copyLink')}</Divider>
|
||||||
{links.map((link, idx) => {
|
{links.map((link, idx) => {
|
||||||
const meta = parseLinkMeta(link);
|
const meta = parseLinkMeta(link);
|
||||||
const qrRemark = meta.remark || `${t('pages.clients.link')} ${idx + 1}`;
|
|
||||||
const rowTitle = trimEmail(meta.remark, client.email)
|
const rowTitle = trimEmail(meta.remark, client.email)
|
||||||
|| `${t('pages.clients.link')} ${idx + 1}`;
|
|| `${t('pages.clients.link')} ${idx + 1}`;
|
||||||
|
const qrRemark = client.email
|
||||||
|
? `${rowTitle}-${client.email}`
|
||||||
|
: (meta.remark || `${t('pages.clients.link')} ${idx + 1}`);
|
||||||
const canQr = !isPostQuantumLink(link);
|
const canQr = !isPostQuantumLink(link);
|
||||||
return (
|
return (
|
||||||
<div key={idx} className="link-row">
|
<div key={idx} className="link-row">
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@ import {
|
||||||
import { ClipboardManager, IntlUtil, LanguageManager } from '@/utils';
|
import { ClipboardManager, IntlUtil, LanguageManager } from '@/utils';
|
||||||
import { setMessageInstance } from '@/utils/messageBus';
|
import { setMessageInstance } from '@/utils/messageBus';
|
||||||
import { pauseAnimationsUntilLeave, useTheme } from '@/hooks/useTheme';
|
import { pauseAnimationsUntilLeave, useTheme } from '@/hooks/useTheme';
|
||||||
|
import SubUsageSummary from './SubUsageSummary';
|
||||||
import './SubPage.css';
|
import './SubPage.css';
|
||||||
|
|
||||||
const QR_SIZE = 240;
|
const QR_SIZE = 240;
|
||||||
|
|
@ -354,72 +355,16 @@ export default function SubPage() {
|
||||||
items={descriptionsItems}
|
items={descriptionsItems}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{links.length > 0 && (
|
<SubUsageSummary
|
||||||
<>
|
usedByte={Number(subData.usedByte || 0)
|
||||||
<Divider>{t('pages.inbounds.copyLink')}</Divider>
|
|| (Number(subData.downloadByte || 0) + Number(subData.uploadByte || 0))}
|
||||||
<div className="links-section">
|
totalByte={totalByte}
|
||||||
{links.map((link, idx) => {
|
usedLabel={used}
|
||||||
const meta = parseLinkMeta(link, idx);
|
totalLabel={total}
|
||||||
const rowTitle = trimEmail(meta.remark, linkEmails[idx] || '') || meta.remark;
|
remainedLabel={remained}
|
||||||
const canQr = !isPostQuantumLink(link);
|
expireMs={expireMs}
|
||||||
return (
|
isActive={isActive}
|
||||||
<div key={link} className="sub-link-row">
|
|
||||||
<Tag
|
|
||||||
color={PROTOCOL_COLORS[meta.protocol] ?? 'default'}
|
|
||||||
className="sub-link-tag"
|
|
||||||
>
|
|
||||||
{meta.protocol}
|
|
||||||
</Tag>
|
|
||||||
<span className="sub-link-title" title={meta.remark}>
|
|
||||||
{rowTitle}
|
|
||||||
</span>
|
|
||||||
<div className="sub-link-actions">
|
|
||||||
<Button
|
|
||||||
size="small"
|
|
||||||
icon={<CopyOutlined />}
|
|
||||||
onClick={() => copy(link)}
|
|
||||||
aria-label={t('copy')}
|
|
||||||
title={t('copy')}
|
|
||||||
/>
|
/>
|
||||||
{canQr && (
|
|
||||||
<Popover
|
|
||||||
trigger="click"
|
|
||||||
placement="left"
|
|
||||||
destroyOnHidden
|
|
||||||
content={
|
|
||||||
<div className="sub-link-qr-popover">
|
|
||||||
<Tag
|
|
||||||
color={PROTOCOL_COLORS[meta.protocol] ?? 'default'}
|
|
||||||
className="qr-tag"
|
|
||||||
>
|
|
||||||
{meta.remark}
|
|
||||||
</Tag>
|
|
||||||
<QRCode
|
|
||||||
value={link}
|
|
||||||
size={220}
|
|
||||||
type="svg"
|
|
||||||
bordered={false}
|
|
||||||
color="#000000"
|
|
||||||
bgColor="#ffffff"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<Button
|
|
||||||
size="small"
|
|
||||||
icon={<QrcodeOutlined />}
|
|
||||||
aria-label="QR"
|
|
||||||
title="QR"
|
|
||||||
/>
|
|
||||||
</Popover>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{(subUrl || subJsonUrl || subClashUrl) && (
|
{(subUrl || subJsonUrl || subClashUrl) && (
|
||||||
<>
|
<>
|
||||||
|
|
@ -521,6 +466,75 @@ export default function SubPage() {
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{links.length > 0 && (
|
||||||
|
<>
|
||||||
|
<Divider>{t('pages.inbounds.copyLink')}</Divider>
|
||||||
|
<div className="links-section">
|
||||||
|
{links.map((link, idx) => {
|
||||||
|
const meta = parseLinkMeta(link, idx);
|
||||||
|
const rowEmail = linkEmails[idx] || '';
|
||||||
|
const rowTitle = trimEmail(meta.remark, rowEmail) || meta.remark;
|
||||||
|
const qrLabel = rowEmail ? `${rowTitle}-${rowEmail}` : meta.remark;
|
||||||
|
const canQr = !isPostQuantumLink(link);
|
||||||
|
return (
|
||||||
|
<div key={link} className="sub-link-row">
|
||||||
|
<Tag
|
||||||
|
color={PROTOCOL_COLORS[meta.protocol] ?? 'default'}
|
||||||
|
className="sub-link-tag"
|
||||||
|
>
|
||||||
|
{meta.protocol}
|
||||||
|
</Tag>
|
||||||
|
<span className="sub-link-title" title={meta.remark}>
|
||||||
|
{rowTitle}
|
||||||
|
</span>
|
||||||
|
<div className="sub-link-actions">
|
||||||
|
<Button
|
||||||
|
size="small"
|
||||||
|
icon={<CopyOutlined />}
|
||||||
|
onClick={() => copy(link)}
|
||||||
|
aria-label={t('copy')}
|
||||||
|
title={t('copy')}
|
||||||
|
/>
|
||||||
|
{canQr && (
|
||||||
|
<Popover
|
||||||
|
trigger="click"
|
||||||
|
placement="left"
|
||||||
|
destroyOnHidden
|
||||||
|
content={
|
||||||
|
<div className="sub-link-qr-popover">
|
||||||
|
<Tag
|
||||||
|
color={PROTOCOL_COLORS[meta.protocol] ?? 'default'}
|
||||||
|
className="qr-tag"
|
||||||
|
>
|
||||||
|
{qrLabel}
|
||||||
|
</Tag>
|
||||||
|
<QRCode
|
||||||
|
value={link}
|
||||||
|
size={220}
|
||||||
|
type="svg"
|
||||||
|
bordered={false}
|
||||||
|
color="#000000"
|
||||||
|
bgColor="#ffffff"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<Button
|
||||||
|
size="small"
|
||||||
|
icon={<QrcodeOutlined />}
|
||||||
|
aria-label="QR"
|
||||||
|
title="QR"
|
||||||
|
/>
|
||||||
|
</Popover>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
|
||||||
<Row gutter={[8, 8]} justify="center" className="apps-row">
|
<Row gutter={[8, 8]} justify="center" className="apps-row">
|
||||||
<Col xs={24} sm={12} className="app-col">
|
<Col xs={24} sm={12} className="app-col">
|
||||||
<Dropdown trigger={['click']} menu={{ items: androidMenuItems }}>
|
<Dropdown trigger={['click']} menu={{ items: androidMenuItems }}>
|
||||||
|
|
|
||||||
87
frontend/src/pages/sub/SubUsageSummary.css
Normal file
87
frontend/src/pages/sub/SubUsageSummary.css
Normal file
|
|
@ -0,0 +1,87 @@
|
||||||
|
.usage-summary {
|
||||||
|
margin-top: 12px;
|
||||||
|
padding: 14px 16px;
|
||||||
|
background: var(--ant-color-fill-alter);
|
||||||
|
border: 1px solid var(--ant-color-border-secondary);
|
||||||
|
border-radius: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.usage-summary.is-inactive {
|
||||||
|
opacity: 0.7;
|
||||||
|
border-color: var(--ant-color-error-border);
|
||||||
|
}
|
||||||
|
|
||||||
|
.usage-summary-head {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 12px;
|
||||||
|
margin-bottom: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.usage-summary-labels {
|
||||||
|
display: flex;
|
||||||
|
align-items: baseline;
|
||||||
|
gap: 6px;
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.usage-summary-used {
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: 700;
|
||||||
|
color: var(--ant-color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.usage-summary-sep {
|
||||||
|
color: var(--ant-color-text-quaternary);
|
||||||
|
font-size: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.usage-summary-total {
|
||||||
|
font-size: 14px;
|
||||||
|
color: var(--ant-color-text-secondary);
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
.usage-summary-chips {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.usage-summary-chips .ant-tag {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.usage-summary-bar.ant-progress {
|
||||||
|
margin-bottom: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.usage-summary-bar .ant-progress-outer {
|
||||||
|
padding-inline-end: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.usage-summary-bar .ant-progress-inner {
|
||||||
|
background: var(--ant-color-fill-secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.usage-summary-foot {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--ant-color-text-tertiary);
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
min-height: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.usage-summary-remained::before {
|
||||||
|
content: '';
|
||||||
|
}
|
||||||
|
|
||||||
|
.usage-summary-pct {
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--ant-color-text-secondary);
|
||||||
|
}
|
||||||
96
frontend/src/pages/sub/SubUsageSummary.tsx
Normal file
96
frontend/src/pages/sub/SubUsageSummary.tsx
Normal file
|
|
@ -0,0 +1,96 @@
|
||||||
|
import { useMemo } from 'react';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { Progress, Tag } from 'antd';
|
||||||
|
import { ClockCircleOutlined, ThunderboltOutlined } from '@ant-design/icons';
|
||||||
|
|
||||||
|
import './SubUsageSummary.css';
|
||||||
|
|
||||||
|
interface SubUsageSummaryProps {
|
||||||
|
usedByte: number;
|
||||||
|
totalByte: number;
|
||||||
|
usedLabel: string;
|
||||||
|
totalLabel: string;
|
||||||
|
remainedLabel: string;
|
||||||
|
expireMs: number;
|
||||||
|
isActive: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
function pickStrokeColor(pct: number): { from: string; to: string } {
|
||||||
|
if (pct >= 90) return { from: '#ff7875', to: '#ff4d4f' };
|
||||||
|
if (pct >= 75) return { from: '#ffc53d', to: '#fa8c16' };
|
||||||
|
return { from: '#5fc983', to: '#36b37e' };
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatExpiryChip(expireMs: number): { label: string; color: string } | null {
|
||||||
|
if (expireMs <= 0) return null;
|
||||||
|
const diff = expireMs - Date.now();
|
||||||
|
if (diff <= 0) return { label: 'Expired', color: 'red' };
|
||||||
|
const days = Math.floor(diff / 86400000);
|
||||||
|
if (days >= 1) return { label: `${days}d`, color: days <= 3 ? 'orange' : 'blue' };
|
||||||
|
const hours = Math.max(1, Math.floor(diff / 3600000));
|
||||||
|
return { label: `${hours}h`, color: 'orange' };
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function SubUsageSummary({
|
||||||
|
usedByte,
|
||||||
|
totalByte,
|
||||||
|
usedLabel,
|
||||||
|
totalLabel,
|
||||||
|
remainedLabel,
|
||||||
|
expireMs,
|
||||||
|
isActive,
|
||||||
|
}: SubUsageSummaryProps) {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const pct = useMemo(() => {
|
||||||
|
if (totalByte <= 0) return 0;
|
||||||
|
const v = (usedByte / totalByte) * 100;
|
||||||
|
if (!Number.isFinite(v)) return 0;
|
||||||
|
return Math.max(0, Math.min(100, v));
|
||||||
|
}, [usedByte, totalByte]);
|
||||||
|
|
||||||
|
const expiry = formatExpiryChip(expireMs);
|
||||||
|
const isUnlimited = totalByte <= 0;
|
||||||
|
const stroke = pickStrokeColor(pct);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={`usage-summary ${!isActive ? 'is-inactive' : ''}`}>
|
||||||
|
<div className="usage-summary-head">
|
||||||
|
<div className="usage-summary-labels">
|
||||||
|
<span className="usage-summary-used">{usedLabel}</span>
|
||||||
|
<span className="usage-summary-sep">/</span>
|
||||||
|
<span className="usage-summary-total">{isUnlimited ? '∞' : totalLabel}</span>
|
||||||
|
</div>
|
||||||
|
<div className="usage-summary-chips">
|
||||||
|
{isUnlimited && (
|
||||||
|
<Tag color="purple" icon={<ThunderboltOutlined />}>
|
||||||
|
{t('subscription.unlimited')}
|
||||||
|
</Tag>
|
||||||
|
)}
|
||||||
|
{expiry && (
|
||||||
|
<Tag color={expiry.color} icon={<ClockCircleOutlined />}>
|
||||||
|
{expiry.label}
|
||||||
|
</Tag>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{!isUnlimited && (
|
||||||
|
<Progress
|
||||||
|
percent={pct}
|
||||||
|
showInfo={false}
|
||||||
|
strokeColor={{ '0%': stroke.from, '100%': stroke.to }}
|
||||||
|
trailColor="var(--ant-color-fill-secondary)"
|
||||||
|
strokeWidth={10}
|
||||||
|
className="usage-summary-bar"
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
<div className="usage-summary-foot">
|
||||||
|
{!isUnlimited && (
|
||||||
|
<>
|
||||||
|
<span className="usage-summary-remained">{remainedLabel}</span>
|
||||||
|
<span className="usage-summary-pct">{pct.toFixed(1)}%</span>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue