Compare commits

..

3 Commits

Author SHA1 Message Date
shanshanzhong147 9172107ea9 修复(#120): 补齐用户订阅限速配置前端实现 2026-05-28 22:00:53 -07:00
shanshanzhong147 100b641552 修复(#97): 区分邀请管理加载失败状态
PR Check / Lint, Check, Test and Build (push) Has been cancelled
Build and Release / Build (push) Has been cancelled
2026-05-27 20:24:22 -07:00
shanshanzhong147 aeca20ad1e 新功能(#93): 新增管理后台邀请管理页面
PR Check / Lint, Check, Test and Build (push) Has been cancelled
Build and Release / Build (push) Has been cancelled
新增 /dashboard/invite-management 页面,调用 GET /v1/admin/invite/list 接口展示全局邀请关系列表。
包含邀请人/被邀请人信息、状态、佣金、赠送天数等列,支持关键词和 ID 筛选、分页。
附带修复提现页收款码图片缺少 width/height 的 lint 问题。
2026-05-27 11:11:15 -07:00
17 changed files with 966 additions and 70 deletions
@@ -0,0 +1,23 @@
{
"commission": "Commission",
"days": "{{count}} days",
"disabled": "Disabled",
"empty": "No invite records",
"enabled": "Enabled",
"hasPurchased": "Purchased",
"invitee": "Invitee",
"inviteeGiftDays": "Invitee Gift Days",
"inviteeId": "Invitee ID",
"invitedAt": "Invited At",
"inviter": "Inviter",
"inviterGiftDays": "Inviter Gift Days",
"inviterId": "Inviter ID",
"loadErrorDescription": "Refresh the table or try again later.",
"loadErrorTitle": "Failed to load invites",
"no": "No",
"orderCount": "Orders",
"searchPlaceholder": "Email or phone",
"status": "Status",
"title": "Invite Management",
"yes": "Yes"
}
@@ -11,6 +11,7 @@
"Email": "Email",
"Gift": "Gift",
"Group Management": "Group Management",
"Invite Management": "Invite Management",
"Login": "Login",
"Logs & Analytics": "Logs & Analytics",
"Maintenance": "Maintenance",
@@ -0,0 +1,23 @@
{
"commission": "佣金",
"days": "{{count}} 天",
"disabled": "禁用",
"empty": "暂无邀请记录",
"enabled": "启用",
"hasPurchased": "已购买",
"invitee": "被邀请人",
"inviteeGiftDays": "被邀请人赠送天数",
"inviteeId": "被邀请人 ID",
"invitedAt": "邀请时间",
"inviter": "邀请人",
"inviterGiftDays": "邀请人赠送天数",
"inviterId": "邀请人 ID",
"loadErrorDescription": "刷新表格或稍后重试。",
"loadErrorTitle": "邀请记录加载失败",
"no": "否",
"orderCount": "订单数",
"searchPlaceholder": "邮箱/手机号关键词",
"status": "状态",
"title": "邀请管理",
"yes": "是"
}
@@ -11,6 +11,7 @@
"Email": "邮件",
"Gift": "赠送",
"Group Management": "分组管理",
"Invite Management": "邀请管理",
"Login": "登录",
"Logs & Analytics": "日志与分析",
"Maintenance": "维护",
+5
View File
@@ -98,6 +98,11 @@ export function useNavs() {
url: "/dashboard/withdrawal",
icon: "flat-color-icons:money-transfer",
},
{
title: t("Invite Management", "Invite Management"),
url: "/dashboard/invite-management",
icon: "flat-color-icons:add-user",
},
{
title: t("Device Group", "Device Group"),
url: "/dashboard/family",
+1
View File
@@ -35,6 +35,7 @@ initializeI18n({
"coupon",
"dashboard",
"document",
"invite",
"log",
"marketing",
"menu",
+29
View File
@@ -45,6 +45,9 @@ const DashboardOrderIndexLazyRouteImport =
const DashboardMarketingIndexLazyRouteImport = createFileRoute(
'/dashboard/marketing/',
)()
const DashboardInviteManagementIndexLazyRouteImport = createFileRoute(
'/dashboard/invite-management/',
)()
const DashboardGroupIndexLazyRouteImport =
createFileRoute('/dashboard/group/')()
const DashboardFamilyIndexLazyRouteImport =
@@ -214,6 +217,16 @@ const DashboardMarketingIndexLazyRoute =
} as any).lazy(() =>
import('./routes/dashboard/marketing/index.lazy').then((d) => d.Route),
)
const DashboardInviteManagementIndexLazyRoute =
DashboardInviteManagementIndexLazyRouteImport.update({
id: '/invite-management/',
path: '/invite-management/',
getParentRoute: () => DashboardRouteLazyRoute,
} as any).lazy(() =>
import('./routes/dashboard/invite-management/index.lazy').then(
(d) => d.Route,
),
)
const DashboardGroupIndexLazyRoute = DashboardGroupIndexLazyRouteImport.update({
id: '/group/',
path: '/group/',
@@ -388,6 +401,7 @@ export interface FileRoutesByFullPath {
'/dashboard/document': typeof DashboardDocumentIndexLazyRoute
'/dashboard/family': typeof DashboardFamilyIndexLazyRoute
'/dashboard/group': typeof DashboardGroupIndexLazyRoute
'/dashboard/invite-management': typeof DashboardInviteManagementIndexLazyRoute
'/dashboard/marketing': typeof DashboardMarketingIndexLazyRoute
'/dashboard/order': typeof DashboardOrderIndexLazyRoute
'/dashboard/payment': typeof DashboardPaymentIndexLazyRoute
@@ -423,6 +437,7 @@ export interface FileRoutesByTo {
'/dashboard/document': typeof DashboardDocumentIndexLazyRoute
'/dashboard/family': typeof DashboardFamilyIndexLazyRoute
'/dashboard/group': typeof DashboardGroupIndexLazyRoute
'/dashboard/invite-management': typeof DashboardInviteManagementIndexLazyRoute
'/dashboard/marketing': typeof DashboardMarketingIndexLazyRoute
'/dashboard/order': typeof DashboardOrderIndexLazyRoute
'/dashboard/payment': typeof DashboardPaymentIndexLazyRoute
@@ -461,6 +476,7 @@ export interface FileRoutesById {
'/dashboard/document/': typeof DashboardDocumentIndexLazyRoute
'/dashboard/family/': typeof DashboardFamilyIndexLazyRoute
'/dashboard/group/': typeof DashboardGroupIndexLazyRoute
'/dashboard/invite-management/': typeof DashboardInviteManagementIndexLazyRoute
'/dashboard/marketing/': typeof DashboardMarketingIndexLazyRoute
'/dashboard/order/': typeof DashboardOrderIndexLazyRoute
'/dashboard/payment/': typeof DashboardPaymentIndexLazyRoute
@@ -500,6 +516,7 @@ export interface FileRouteTypes {
| '/dashboard/document'
| '/dashboard/family'
| '/dashboard/group'
| '/dashboard/invite-management'
| '/dashboard/marketing'
| '/dashboard/order'
| '/dashboard/payment'
@@ -535,6 +552,7 @@ export interface FileRouteTypes {
| '/dashboard/document'
| '/dashboard/family'
| '/dashboard/group'
| '/dashboard/invite-management'
| '/dashboard/marketing'
| '/dashboard/order'
| '/dashboard/payment'
@@ -572,6 +590,7 @@ export interface FileRouteTypes {
| '/dashboard/document/'
| '/dashboard/family/'
| '/dashboard/group/'
| '/dashboard/invite-management/'
| '/dashboard/marketing/'
| '/dashboard/order/'
| '/dashboard/payment/'
@@ -703,6 +722,13 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof DashboardMarketingIndexLazyRouteImport
parentRoute: typeof DashboardRouteLazyRoute
}
'/dashboard/invite-management/': {
id: '/dashboard/invite-management/'
path: '/invite-management'
fullPath: '/dashboard/invite-management'
preLoaderRoute: typeof DashboardInviteManagementIndexLazyRouteImport
parentRoute: typeof DashboardRouteLazyRoute
}
'/dashboard/group/': {
id: '/dashboard/group/'
path: '/group'
@@ -877,6 +903,7 @@ interface DashboardRouteLazyRouteChildren {
DashboardDocumentIndexLazyRoute: typeof DashboardDocumentIndexLazyRoute
DashboardFamilyIndexLazyRoute: typeof DashboardFamilyIndexLazyRoute
DashboardGroupIndexLazyRoute: typeof DashboardGroupIndexLazyRoute
DashboardInviteManagementIndexLazyRoute: typeof DashboardInviteManagementIndexLazyRoute
DashboardMarketingIndexLazyRoute: typeof DashboardMarketingIndexLazyRoute
DashboardOrderIndexLazyRoute: typeof DashboardOrderIndexLazyRoute
DashboardPaymentIndexLazyRoute: typeof DashboardPaymentIndexLazyRoute
@@ -912,6 +939,8 @@ const DashboardRouteLazyRouteChildren: DashboardRouteLazyRouteChildren = {
DashboardDocumentIndexLazyRoute: DashboardDocumentIndexLazyRoute,
DashboardFamilyIndexLazyRoute: DashboardFamilyIndexLazyRoute,
DashboardGroupIndexLazyRoute: DashboardGroupIndexLazyRoute,
DashboardInviteManagementIndexLazyRoute:
DashboardInviteManagementIndexLazyRoute,
DashboardMarketingIndexLazyRoute: DashboardMarketingIndexLazyRoute,
DashboardOrderIndexLazyRoute: DashboardOrderIndexLazyRoute,
DashboardPaymentIndexLazyRoute: DashboardPaymentIndexLazyRoute,
@@ -0,0 +1,6 @@
import { createLazyFileRoute } from "@tanstack/react-router";
import InviteManagement from "@/sections/invite";
export const Route = createLazyFileRoute("/dashboard/invite-management/")({
component: InviteManagement,
});
@@ -0,0 +1,159 @@
/**
* @vitest-environment jsdom
*/
import { cleanup, render, screen, waitFor } from "@testing-library/react";
import { getAdminInviteList } from "@workspace/ui/services/admin/invite";
import type { AxiosResponse } from "axios";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import InviteManagement from ".";
vi.mock("react-i18next", () => ({
useTranslation: () => ({
t: (
_key: string,
fallback: string,
options?: { count?: number }
): string => {
if (typeof options?.count === "number") {
return `${options.count} days`;
}
return fallback;
},
}),
}));
vi.mock("@/stores/global", () => ({
useGlobalStore: () => ({
common: {
currency: {
currency_symbol: "$",
},
},
}),
}));
vi.mock("@/utils/common", () => ({
formatDate: (timestamp: number) => `date-${timestamp}`,
}));
vi.mock("@workspace/ui/services/admin/invite", () => ({
getAdminInviteList: vi.fn(),
}));
const mockedGetAdminInviteList = vi.mocked(getAdminInviteList);
function createInviteListResponse(
data: API.GetAdminInviteListResponse
): AxiosResponse<API.Response & { data?: API.GetAdminInviteListResponse }> {
return {
data: {
code: 200,
data,
},
status: 200,
statusText: "OK",
headers: {},
config: {
headers: {} as AxiosResponse["config"]["headers"],
},
};
}
afterEach(() => {
cleanup();
vi.clearAllMocks();
});
beforeEach(() => {
localStorage.setItem("timezone", "UTC");
});
describe("InviteManagement", () => {
it("renders invite rows with status, purchase state, commission, and gift days", async () => {
mockedGetAdminInviteList.mockResolvedValue(
createInviteListResponse({
total: 1,
list: [
{
inviter_id: 10,
inviter_identifier: "agent@example.com",
invitee_id: 123,
invitee_identifier: "user@example.com",
invitee_avatar: "",
invitee_enable: true,
invited_at: 1_716_800_000,
order_count: 3,
has_purchased: true,
inviter_commission: 1500,
inviter_gift_days: 30,
invitee_gift_days: 7,
},
],
})
);
render(<InviteManagement />);
await waitFor(() =>
expect(mockedGetAdminInviteList).toHaveBeenCalledWith({
page: 1,
size: 200,
search: undefined,
inviter_id: undefined,
invitee_id: undefined,
})
);
expect(await screen.findByText("agent@example.com")).not.toBeNull();
expect(screen.getByText("user@example.com")).not.toBeNull();
expect(screen.getByText("Enabled")).not.toBeNull();
expect(screen.getByText("Yes")).not.toBeNull();
expect(screen.getByText("$15.00")).not.toBeNull();
expect(screen.getByText("30 days")).not.toBeNull();
expect(screen.getByText("7 days")).not.toBeNull();
expect(screen.getByText("date-1716800000")).not.toBeNull();
});
it("shows the empty state when the API returns no rows", async () => {
mockedGetAdminInviteList.mockResolvedValue(
createInviteListResponse({
total: 0,
list: [],
})
);
render(<InviteManagement />);
expect(await screen.findByText("No invite records")).not.toBeNull();
});
it("shows a loading state while invites are being fetched", () => {
let resolveRequest:
| ((
value: AxiosResponse<
API.Response & { data?: API.GetAdminInviteListResponse }
>
) => void)
| undefined;
mockedGetAdminInviteList.mockReturnValue(
new Promise((resolve) => {
resolveRequest = resolve;
})
);
render(<InviteManagement />);
expect(screen.getByRole("status", { name: "Loading data" })).not.toBeNull();
expect(resolveRequest).toBeTypeOf("function");
});
it("shows an error state when the request fails", async () => {
mockedGetAdminInviteList.mockRejectedValue(new Error("network failed"));
render(<InviteManagement />);
await waitFor(() => expect(mockedGetAdminInviteList).toHaveBeenCalled());
expect(await screen.findByText("Failed to load invites")).not.toBeNull();
expect(screen.queryByText("No invite records")).toBeNull();
});
});
+213
View File
@@ -0,0 +1,213 @@
"use client";
import {
Alert,
AlertDescription,
AlertTitle,
} from "@workspace/ui/components/alert";
import {
Avatar,
AvatarFallback,
AvatarImage,
} from "@workspace/ui/components/avatar";
import { Badge } from "@workspace/ui/components/badge";
import Empty from "@workspace/ui/composed/empty";
import {
ProTable,
type ProTableActions,
} from "@workspace/ui/composed/pro-table/pro-table";
import { getAdminInviteList } from "@workspace/ui/services/admin/invite";
import { CircleAlert } from "lucide-react";
import { useRef } from "react";
import { useTranslation } from "react-i18next";
import { Display } from "@/components/display";
import { formatDate } from "@/utils/common";
type InviteFilters = {
search?: string;
inviter_id?: string;
invitee_id?: string;
};
function toOptionalNumber(value?: string) {
if (!value) return;
const parsed = Number(value);
return Number.isFinite(parsed) ? parsed : undefined;
}
function InviteUserCell({
id,
identifier,
avatar,
}: {
id: number;
identifier: string;
avatar?: string;
}) {
const fallback = identifier?.charAt(0)?.toUpperCase() || "U";
return (
<div className="flex min-w-48 items-center gap-2">
<Avatar className="h-8 w-8">
<AvatarImage alt={identifier || `#${id}`} src={avatar} />
<AvatarFallback className="text-xs">{fallback}</AvatarFallback>
</Avatar>
<div className="min-w-0">
<div className="font-medium text-sm">#{id}</div>
<div className="max-w-52 truncate text-muted-foreground text-xs">
{identifier || "--"}
</div>
</div>
</div>
);
}
function InviteIdentifierCell({
id,
identifier,
}: {
id: number;
identifier: string;
}) {
return (
<div className="min-w-44">
<div className="font-medium text-sm">#{id}</div>
<div className="max-w-52 truncate text-muted-foreground text-xs">
{identifier || "--"}
</div>
</div>
);
}
export default function InviteManagement() {
const { t } = useTranslation("invite");
const ref = useRef<ProTableActions>(null);
return (
<ProTable<API.AdminInviteRelation, InviteFilters>
action={ref}
columns={[
{
accessorKey: "inviter_id",
header: t("inviter", "Inviter"),
cell: ({ row }) => (
<InviteIdentifierCell
id={row.original.inviter_id}
identifier={row.original.inviter_identifier}
/>
),
},
{
accessorKey: "invitee_id",
header: t("invitee", "Invitee"),
cell: ({ row }) => (
<InviteUserCell
avatar={row.original.invitee_avatar}
id={row.original.invitee_id}
identifier={row.original.invitee_identifier}
/>
),
},
{
accessorKey: "invitee_enable",
header: t("status", "Status"),
cell: ({ row }) => (
<Badge
variant={row.original.invitee_enable ? "default" : "secondary"}
>
{row.original.invitee_enable
? t("enabled", "Enabled")
: t("disabled", "Disabled")}
</Badge>
),
},
{
accessorKey: "invited_at",
header: t("invitedAt", "Invited At"),
cell: ({ row }) => formatDate(row.original.invited_at),
},
{
accessorKey: "order_count",
header: t("orderCount", "Orders"),
},
{
accessorKey: "has_purchased",
header: t("hasPurchased", "Purchased"),
cell: ({ row }) => (
<Badge variant={row.original.has_purchased ? "default" : "outline"}>
{row.original.has_purchased ? t("yes", "Yes") : t("no", "No")}
</Badge>
),
},
{
accessorKey: "inviter_commission",
header: t("commission", "Commission"),
cell: ({ row }) => (
<Display type="currency" value={row.original.inviter_commission} />
),
},
{
accessorKey: "inviter_gift_days",
header: t("inviterGiftDays", "Inviter Gift Days"),
cell: ({ row }) =>
t("days", "{{count}} days", {
count: row.original.inviter_gift_days,
}),
},
{
accessorKey: "invitee_gift_days",
header: t("inviteeGiftDays", "Invitee Gift Days"),
cell: ({ row }) =>
t("days", "{{count}} days", {
count: row.original.invitee_gift_days,
}),
},
]}
empty={<Empty description={t("empty", "No invite records")} />}
error={
<Alert className="mx-auto max-w-md" variant="destructive">
<CircleAlert aria-hidden="true" />
<AlertTitle>
{t("loadErrorTitle", "Failed to load invites")}
</AlertTitle>
<AlertDescription>
{t("loadErrorDescription", "Refresh the table or try again later.")}
</AlertDescription>
</Alert>
}
header={{ title: t("title", "Invite Management") }}
params={[
{
key: "search",
placeholder: t("searchPlaceholder", "Email or phone"),
},
{
key: "inviter_id",
placeholder: t("inviterId", "Inviter ID"),
},
{
key: "invitee_id",
placeholder: t("inviteeId", "Invitee ID"),
},
]}
request={async (pagination, filters) => {
const { data } = await getAdminInviteList({
page: pagination.page,
size: pagination.size,
search: filters.search?.trim() || undefined,
inviter_id: toOptionalNumber(filters.inviter_id),
invitee_id: toOptionalNumber(filters.invitee_id),
});
return {
list:
data.data?.list.map((item) => ({
...item,
id: `${item.inviter_id}-${item.invitee_id}-${item.invited_at}`,
})) || [],
total: data.data?.total || 0,
};
}}
/>
);
}
@@ -32,11 +32,27 @@ import { formatDate } from "@/utils/common";
import { SubscriptionDetail } from "./subscription-detail";
import { SubscriptionForm } from "./subscription-form";
type SubscriptionFormPayload = Parameters<
React.ComponentProps<typeof SubscriptionForm>["onSubmit"]
>[0];
interface SharedInfo {
ownerUserId: number;
familyId: number;
}
function toUserSubscribePayload(values: SubscriptionFormPayload) {
return {
subscribe_id: values.subscribe_id ?? 0,
traffic: values.traffic ?? 0,
expired_at: values.expired_at ?? 0,
upload: values.upload ?? 0,
download: values.download ?? 0,
speed_limit: values.speed_limit ?? 0,
traffic_limit: values.traffic_limit ?? [],
};
}
export default function UserSubscription({ userId }: { userId: number }) {
const { t } = useTranslation("user");
const [loading, setLoading] = useState(false);
@@ -164,9 +180,8 @@ export default function UserSubscription({ userId }: { userId: number }) {
onSubmit={async (values) => {
setLoading(true);
await updateUserSubscribe({
user_id: Number(userId),
user_subscribe_id: row.id,
...values,
...toUserSubscribePayload(values),
});
toast.success(t("updateSuccess", "Updated successfully"));
ref.current?.refresh();
@@ -352,7 +367,7 @@ export default function UserSubscription({ userId }: { userId: number }) {
setLoading(true);
await createUserSubscribe({
user_id: Number(userId),
...values,
...toUserSubscribePayload(values),
});
toast.success(t("createSuccess", "Created successfully"));
ref.current?.refresh();
@@ -20,66 +20,96 @@ import { AlertTriangle, Gauge } from "lucide-react";
import { type ReactNode, useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { toast } from "sonner";
import { Display } from "@/components/display";
import { IpLink } from "@/components/ip-link";
import { formatDate } from "@/utils/common";
function formatRules(rules?: API.TrafficLimitRule[]) {
return rules && rules.length > 0 ? rules : [];
}
function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
const { t } = useTranslation("user");
const [detail, setDetail] = useState<API.UserSubscribeDetail | null>(null);
const [loading, setLoading] = useState(false);
const [error, setError] = useState(false);
useEffect(() => {
getUserSubscribeById({ id: subscriptionId }).then(({ data }) => {
if (data.data) setDetail(data.data);
setLoading(true);
setError(false);
getUserSubscribeById({ id: subscriptionId })
.then(({ data }) => {
setDetail(data.data || null);
})
.catch(() => {
setError(true);
setDetail(null);
})
.finally(() => {
setLoading(false);
});
}, [subscriptionId]);
if (!detail || detail.status !== 1) return null;
if (loading) {
return (
<div className="mb-4 rounded-lg border bg-muted/30 p-3 text-muted-foreground text-sm">
{t("loading", "Loading")}...
</div>
);
}
if (error) {
return (
<div className="mb-4 rounded-lg border border-destructive/40 bg-destructive/5 p-3 text-destructive text-sm">
{t("loadFailed", "Failed to load data")}
</div>
);
}
if (!detail) {
return (
<div className="mb-4 rounded-lg border bg-muted/30 p-3 text-muted-foreground text-sm">
{t("noSubscriptionDetail", "No subscription detail")}
</div>
);
}
const baseSpeed = detail.subscribe?.speed_limit ?? 0;
const userSpeed = detail.speed_limit ?? 0;
const effectiveSpeed = detail.effective_speed ?? 0;
const isThrottled = detail.is_throttled;
if (baseSpeed === 0 && !isThrottled) return null;
const packageRules = formatRules(detail.subscribe?.traffic_limit);
const userRules = formatRules(detail.traffic_limit);
return (
<div
className={`mb-4 flex items-start gap-3 rounded-lg border p-3 text-sm ${
className={`mb-4 space-y-4 rounded-lg border p-3 text-sm ${
isThrottled
? "border-destructive/40 bg-destructive/5 text-destructive"
: "border-border bg-muted/40 text-foreground"
}`}
>
<div className="flex items-start gap-3">
{isThrottled ? (
<AlertTriangle className="mt-0.5 h-4 w-4 shrink-0" />
) : (
<Gauge className="mt-0.5 h-4 w-4 shrink-0 text-muted-foreground" />
)}
<div className="space-y-1">
<div className="min-w-0 space-y-1">
<div className="flex flex-wrap items-center gap-2 font-medium">
{isThrottled ? (
<>
<span>{t("throttled", "Speed Throttled")}</span>
<Badge className="text-xs" variant="destructive">
{effectiveSpeed} Mbps
</Badge>
{baseSpeed > 0 && (
<span className="text-muted-foreground text-xs line-through">
{baseSpeed} Mbps
<span>
{isThrottled
? t("throttled", "Speed Throttled")
: t("speedLimitOverview", "Speed Limit Overview")}
</span>
)}
</>
) : (
<>
<span className="text-muted-foreground">
{t("speedLimit", "Speed Limit")}
</span>
<Badge className="text-xs" variant="secondary">
<Badge
className="text-xs"
variant={isThrottled ? "destructive" : "secondary"}
>
{effectiveSpeed > 0
? `${effectiveSpeed} Mbps`
: t("unlimited", "Unlimited")}
</Badge>
</>
)}
</div>
{isThrottled && detail.throttle_rule && (
<p className="text-muted-foreground text-xs">
@@ -94,9 +124,85 @@ function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
)}
</div>
</div>
<div className="grid gap-2 md:grid-cols-3">
{[
{
label: t("packageSpeedLimit", "Package Speed Limit"),
value: <Display type="trafficSpeed" unlimited value={baseSpeed} />,
},
{
label: t("userSpeedOverride", "User Speed Override"),
value: <Display type="trafficSpeed" unlimited value={userSpeed} />,
},
{
label: t("effectiveSpeedLimit", "Effective Speed Limit"),
value: (
<Display type="trafficSpeed" unlimited value={effectiveSpeed} />
),
},
].map((item) => (
<div
className="rounded-md border bg-background/70 p-2"
key={item.label}
>
<div className="text-muted-foreground text-xs">{item.label}</div>
<div className="mt-1 font-medium">{item.value}</div>
</div>
))}
</div>
<div className="grid gap-3 md:grid-cols-2">
<TrafficRulesBlock
emptyText={t("noPackageTrafficRules", "No package traffic rules")}
rules={packageRules}
title={t("packageTrafficRules", "Package Traffic Rules")}
/>
<TrafficRulesBlock
emptyText={t("noUserTrafficRules", "No user traffic rules")}
rules={userRules}
title={t("userTrafficRules", "User Traffic Rules")}
/>
</div>
</div>
);
}
function TrafficRulesBlock({
title,
rules,
emptyText,
}: {
title: string;
rules: API.TrafficLimitRule[];
emptyText: string;
}) {
return (
<div className="rounded-md border bg-background/70 p-2">
<div className="font-medium text-muted-foreground text-xs">{title}</div>
{rules.length === 0 ? (
<div className="mt-2 text-muted-foreground text-xs">{emptyText}</div>
) : (
<div className="mt-2 space-y-2">
{rules.map((rule, index) => (
<div
className="rounded border bg-muted/30 px-2 py-1.5 text-xs"
key={`${rule.stat_type}-${rule.stat_value}-${index}`}
>
<div className="flex flex-wrap gap-x-2 gap-y-1">
<span>
{rule.stat_value} {rule.stat_type}
</span>
<span>{rule.traffic_usage} GB</span>
<span>{rule.speed_limit} Mbps</span>
</div>
</div>
))}
</div>
)}
</div>
);
}
export function SubscriptionDetail({
trigger,
userId,
@@ -157,9 +263,8 @@ export function SubscriptionDetail({
cell: ({ row }) => (
<Switch
checked={row.getValue("enabled")}
onChange={(checked) => {
console.log("Switch:", checked);
}}
disabled
title={t("readOnly", "Read only")}
/>
),
},
@@ -3,6 +3,7 @@ import { Button } from "@workspace/ui/components/button";
import {
Form,
FormControl,
FormDescription,
FormField,
FormItem,
FormLabel,
@@ -17,8 +18,10 @@ import {
SheetTitle,
SheetTrigger,
} from "@workspace/ui/components/sheet";
import { Textarea } from "@workspace/ui/components/textarea";
import { Combobox } from "@workspace/ui/composed/combobox";
import { DatePicker } from "@workspace/ui/composed/date-picker";
import { ArrayInput } from "@workspace/ui/composed/dynamic-inputs";
import { EnhancedInput } from "@workspace/ui/composed/enhanced-input";
import { Icon } from "@workspace/ui/composed/icon";
import { unitConversion } from "@workspace/ui/utils/unit-conversions";
@@ -33,20 +36,67 @@ interface Props {
title: string;
loading?: boolean;
initialData?: API.UserSubscribe;
onSubmit: (values: any) => Promise<boolean>;
onSubmit: (values: SubscriptionFormValues) => Promise<boolean>;
}
const trafficLimitRuleSchema = z.object({
stat_type: z.enum(["hour", "day"]),
stat_value: z.number().int().min(1),
traffic_usage: z.number().int().min(0),
speed_limit: z.number().int().min(0),
});
const formSchema = z.object({
subscribe_id: z.number().optional(),
traffic: z.number().optional(),
speed_limit: z.number().optional(),
device_limit: z.number().optional(),
traffic_limit: z.array(trafficLimitRuleSchema).optional(),
traffic_limit_json: z.string().superRefine((value, ctx) => {
if (!value.trim()) return;
try {
const parsed: unknown = JSON.parse(value);
const result = z.array(trafficLimitRuleSchema).safeParse(parsed);
if (!result.success) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: "Invalid traffic limit JSON",
});
}
} catch {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: "Invalid JSON",
});
}
}),
expired_at: z.number().nullish().optional(),
upload: z.number().optional(),
download: z.number().optional(),
id: z.number().optional(),
});
type SubscriptionFormValues = z.infer<typeof formSchema>;
type TrafficLimitFormRule = z.infer<typeof trafficLimitRuleSchema>;
function parseTrafficLimitJson(value: string): API.TrafficLimitRule[] {
if (!value.trim()) return [];
const parsed: unknown = JSON.parse(value);
const result = z.array(trafficLimitRuleSchema).safeParse(parsed);
return result.success ? normalizeTrafficLimitRules(result.data) : [];
}
function normalizeTrafficLimitRules(
rules?: TrafficLimitFormRule[]
): API.TrafficLimitRule[] {
return (rules || []).map((item) => ({
stat_type: item.stat_type === "hour" ? "hour" : "day",
stat_value: Number(item.stat_value) || 1,
traffic_usage: Number(item.traffic_usage) || 0,
speed_limit: Number(item.speed_limit) || 0,
}));
}
export function SubscriptionForm({
trigger,
title,
@@ -57,11 +107,18 @@ export function SubscriptionForm({
const { t } = useTranslation("user");
const [open, setOpen] = useState(false);
const form = useForm({
const form = useForm<SubscriptionFormValues>({
resolver: zodResolver(formSchema),
defaultValues: {
subscribe_id: initialData?.subscribe_id || 0,
traffic: initialData?.traffic || 0,
speed_limit: initialData?.speed_limit || 0,
traffic_limit: normalizeTrafficLimitRules(initialData?.traffic_limit),
traffic_limit_json: JSON.stringify(
normalizeTrafficLimitRules(initialData?.traffic_limit),
null,
2
),
upload: initialData?.upload || 0,
download: initialData?.download || 0,
expired_at: initialData?.expire_time || 0,
@@ -69,8 +126,18 @@ export function SubscriptionForm({
},
});
const handleSubmit = async (values: any) => {
const success = await onSubmit(values);
const handleSubmit = async (values: SubscriptionFormValues) => {
const trafficLimitFromJson = parseTrafficLimitJson(
values.traffic_limit_json
);
const success = await onSubmit({
...values,
traffic_limit: normalizeTrafficLimitRules(
trafficLimitFromJson.length > 0
? trafficLimitFromJson
: values.traffic_limit
),
});
if (success) {
setOpen(false);
form.reset();
@@ -154,6 +221,33 @@ export function SubscriptionForm({
</FormItem>
)}
/>
<FormField
control={form.control}
name="speed_limit"
render={({ field }) => (
<FormItem>
<FormLabel>{t("speedLimit", "Speed Limit")}</FormLabel>
<FormControl>
<EnhancedInput
placeholder={t("unlimited", "Unlimited")}
type="number"
{...field}
onValueChange={(value) => {
form.setValue(field.name, value as number);
}}
suffix="Mbps"
/>
</FormControl>
<FormDescription>
{t(
"userSpeedLimitDescription",
"Set a user-level speed override. Use 0 to inherit the subscription limit."
)}
</FormDescription>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="upload"
@@ -183,6 +277,114 @@ export function SubscriptionForm({
</FormItem>
)}
/>
<FormField
control={form.control}
name="traffic_limit"
render={({ field }) => (
<FormItem>
<FormLabel>
{t("trafficLimitRules", "Traffic Limit Rules")}
</FormLabel>
<FormControl>
<ArrayInput<API.TrafficLimitRule>
className="grid grid-cols-1 gap-3 md:grid-cols-4"
fields={[
{
name: "stat_type",
type: "select",
placeholder: t("statType", "Statistics Type"),
options: [
{ label: t("hour", "Hour"), value: "hour" },
{ label: t("day", "Day"), value: "day" },
],
},
{
name: "stat_value",
type: "number",
placeholder: t("statValue", "Time Value"),
min: 1,
},
{
name: "traffic_usage",
type: "number",
placeholder: t(
"trafficUsageGb",
"Traffic Usage (GB)"
),
min: 0,
},
{
name: "speed_limit",
type: "number",
placeholder: t(
"speedLimitMbps",
"Speed Limit (Mbps)"
),
min: 0,
},
]}
onChange={(items) => {
const normalized =
normalizeTrafficLimitRules(items);
field.onChange(normalized);
form.setValue(
"traffic_limit_json",
JSON.stringify(normalized, null, 2),
{ shouldValidate: true }
);
}}
value={field.value}
/>
</FormControl>
<FormDescription>
{t(
"userTrafficLimitDescription",
"Optional user-level traffic throttle rules. Traffic usage is stored in GB for each rule."
)}
</FormDescription>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="traffic_limit_json"
render={({ field }) => (
<FormItem>
<FormLabel>
{t("trafficLimitJson", "Traffic Limit JSON")}
</FormLabel>
<FormControl>
<Textarea
className="min-h-32 font-mono text-xs"
placeholder='[{"stat_type":"day","stat_value":1,"traffic_usage":10,"speed_limit":5}]'
{...field}
onChange={(event) => {
field.onChange(event.target.value);
try {
const parsed = JSON.parse(event.target.value);
const result = z
.array(trafficLimitRuleSchema)
.safeParse(parsed);
if (result.success) {
form.setValue("traffic_limit", result.data);
}
} catch {
// Validation message is handled by zod.
}
}}
/>
</FormControl>
<FormDescription>
{t(
"trafficLimitJsonDescription",
"Use JSON when pasting existing rules or clearing all rules with []."
)}
</FormDescription>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="download"
+10 -4
View File
@@ -68,13 +68,21 @@ function QrCodeCell({ url }: { url?: string }) {
<img
alt="收款码"
className="h-12 w-12 cursor-zoom-in object-cover"
height={48}
src={url}
width={48}
/>
</button>
{zoomOpen && (
<Dialog onOpenChange={setZoomOpen} open={zoomOpen}>
<DialogContent className="max-w-sm">
<img alt="收款码" className="w-full" src={url} />
<img
alt="收款码"
className="w-full"
height={320}
src={url}
width={320}
/>
</DialogContent>
</Dialog>
)}
@@ -238,9 +246,7 @@ export default function WithdrawalPage() {
{
accessorKey: "qr_code_url",
header: "收款码",
cell: ({ row }) => (
<QrCodeCell url={row.original.qr_code_url} />
),
cell: ({ row }) => <QrCodeCell url={row.original.qr_code_url} />,
},
{
accessorKey: "content",
@@ -39,7 +39,13 @@ import { SortableRow } from "@workspace/ui/composed/pro-table/sortable-row";
import { ProTableWrapper } from "@workspace/ui/composed/pro-table/wrapper";
import { cn } from "@workspace/ui/lib/utils";
import { useSize } from "ahooks";
import { GripVertical, ListRestart, Loader, RefreshCcw } from "lucide-react";
import {
CircleAlert,
GripVertical,
ListRestart,
Loader,
RefreshCcw,
} from "lucide-react";
import type React from "react";
import {
Fragment,
@@ -79,6 +85,7 @@ export interface ProTableProps<TData, TValue> {
selectedRowsText: (total: number) => string;
}>;
empty?: React.ReactNode;
error?: React.ReactNode;
onSort?: (
sourceId: string | number,
targetId: string | number | null,
@@ -104,6 +111,7 @@ export function ProTable<
action,
texts,
empty,
error,
onSort,
initialFilters,
}: ProTableProps<TData, TValue>) {
@@ -121,6 +129,8 @@ export function ProTable<
const [rowSelection, setRowSelection] = useState({});
const [data, setData] = useState<TData[]>([]);
const [rowCount, setRowCount] = useState<number>(0);
const [isLoading, setIsLoading] = useState(false);
const [requestError, setRequestError] = useState(false);
const [pagination, setPagination] = useState({
pageIndex: 0,
pageSize: 200,
@@ -193,6 +203,8 @@ export function ProTable<
const fetchData = async () => {
if (loading.current) return;
loading.current = true;
setIsLoading(true);
setRequestError(false);
try {
const response = await request(
{
@@ -205,10 +217,13 @@ export function ProTable<
);
setData(response.list);
setRowCount(response.total);
} catch (error) {
console.log("Fetch data error:", error);
} catch (_error) {
setData([]);
setRowCount(0);
setRequestError(true);
} finally {
loading.current = false;
setIsLoading(false);
}
};
const reset = async () => {
@@ -316,7 +331,16 @@ export function ProTable<
))}
</TableHeader>
<TableBody>
{table.getRowModel()?.rows?.length ? (
{requestError ? (
<TableRow>
<TableCell
className="py-12"
colSpan={table.getAllLeafColumns().length}
>
{error || <ProTableErrorState />}
</TableCell>
</TableRow>
) : table.getRowModel()?.rows?.length ? (
onSort ? (
table.getRowModel().rows.map((row) => (
<SortableRow
@@ -371,7 +395,10 @@ export function ProTable<
)
) : (
<TableRow>
<TableCell className="py-24" colSpan={columns.length + 2}>
<TableCell
className="py-24"
colSpan={table.getAllLeafColumns().length}
>
{empty || <Empty />}
</TableCell>
</TableRow>
@@ -380,8 +407,12 @@ export function ProTable<
</Table>
</ProTableWrapper>
{loading.current && (
<div className="absolute top-0 z-20 flex h-full w-full items-center justify-center bg-muted/80">
{isLoading && (
<div
aria-label="Loading data"
className="absolute top-0 z-20 flex h-full w-full items-center justify-center bg-muted/80"
role="status"
>
<Loader className="h-4 w-4 animate-spin" />
</div>
)}
@@ -391,6 +422,16 @@ export function ProTable<
);
}
function ProTableErrorState() {
return (
<Alert className="mx-auto max-w-md" variant="destructive">
<CircleAlert aria-hidden="true" />
<AlertTitle>Failed to load data</AlertTitle>
<AlertDescription>Refresh the table or try again later.</AlertDescription>
</Alert>
);
}
function createSelectColumn<TData, TValue>(): ColumnDef<TData, TValue> {
return {
id: "selected",
+19
View File
@@ -0,0 +1,19 @@
/* eslint-disable */
import request from "@workspace/ui/lib/request";
/** Get global invite list GET /v1/admin/invite/list */
export async function getAdminInviteList(
params: API.GetAdminInviteListParams,
options?: Record<string, unknown>
) {
return request<API.Response & { data?: API.GetAdminInviteListResponse }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/invite/list`,
{
method: "GET",
params: {
...params,
},
...(options || {}),
}
);
}
+47
View File
@@ -398,6 +398,8 @@ declare namespace API {
expired_at: number;
traffic: number;
subscribe_id: number;
speed_limit?: number;
traffic_limit?: TrafficLimitRule[];
};
type CurrencyConfig = {
@@ -2051,6 +2053,7 @@ declare namespace API {
replacement: number;
inventory: number;
traffic: number;
traffic_limit?: TrafficLimitRule[];
speed_limit: number;
device_limit: number;
quota: number;
@@ -2434,6 +2437,8 @@ declare namespace API {
expired_at: number;
upload: number;
download: number;
speed_limit?: number;
traffic_limit?: TrafficLimitRule[];
};
type User = {
@@ -2522,6 +2527,8 @@ declare namespace API {
finished_at: number;
reset_time: number;
traffic: number;
traffic_limit?: TrafficLimitRule[];
speed_limit?: number;
download: number;
upload: number;
token: string;
@@ -2544,6 +2551,8 @@ declare namespace API {
expire_time: number;
reset_time: number;
traffic: number;
traffic_limit?: TrafficLimitRule[];
speed_limit?: number;
download: number;
upload: number;
token: string;
@@ -2559,6 +2568,13 @@ declare namespace API {
updated_at: number;
};
type TrafficLimitRule = {
stat_type: "hour" | "day";
stat_value: number;
traffic_usage: number;
speed_limit: number;
};
type UserSubscribeLog = {
id: number;
user_id: number;
@@ -2742,6 +2758,35 @@ declare namespace API {
list: AdminInvitedUser[];
};
type GetAdminInviteListParams = {
page: number;
size: number;
search?: string;
inviter_id?: number;
invitee_id?: number;
};
type AdminInviteRelation = {
id?: string;
inviter_id: number;
inviter_identifier: string;
invitee_id: number;
invitee_identifier: string;
invitee_avatar: string;
invitee_enable: boolean;
invited_at: number;
order_count: number;
has_purchased: boolean;
inviter_commission: number;
inviter_gift_days: number;
invitee_gift_days: number;
};
type GetAdminInviteListResponse = {
total: number;
list: AdminInviteRelation[];
};
type ActivateOrderRequest = {
order_no: string;
};
@@ -3107,4 +3152,6 @@ declare namespace API {
created_at: number;
updated_at: number;
};
type AdminWithdrawalLog = WithdrawalLog;
}