修复(#117): 补齐用户订阅限速配置 UI

This commit is contained in:
2026-05-29 00:17:56 -07:00
parent 100b641552
commit 5b9bd273f9
4 changed files with 407 additions and 28 deletions
@@ -3,6 +3,7 @@ import { Button } from "@workspace/ui/components/button";
import {
Form,
FormControl,
FormDescription,
FormField,
FormItem,
FormLabel,
@@ -19,10 +20,11 @@ import {
} from "@workspace/ui/components/sheet";
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";
import { type ReactNode, useState } from "react";
import { type KeyboardEvent, type ReactNode, useState } from "react";
import { useForm } from "react-hook-form";
import { useTranslation } from "react-i18next";
import { z } from "zod";
@@ -33,18 +35,50 @@ interface Props {
title: string;
loading?: boolean;
initialData?: API.UserSubscribe;
onSubmit: (values: any) => Promise<boolean>;
onSubmit: (values: SubscriptionFormValues) => Promise<boolean>;
}
type SubscriptionTrafficLimitRule = API.UserSubscribeTrafficLimitRule;
const defaultLimitRule: SubscriptionTrafficLimitRule = {
stat_type: "day",
stat_value: 1,
traffic_usage: 0,
speed_limit: 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: z.number().min(0).optional(),
speed_limit: z.number().min(0).optional(),
device_limit: z.number().min(0).optional(),
expired_at: z.number().nullish().optional(),
upload: z.number().optional(),
download: z.number().optional(),
upload: z.number().min(0).optional(),
download: z.number().min(0).optional(),
id: z.number().optional(),
traffic_limit: z
.array(
z.object({
stat_type: z.string(),
stat_value: z.number().int().min(1),
traffic_usage: z.number().min(0),
speed_limit: z.number().min(0),
})
)
.optional(),
});
type SubscriptionFormValues = z.infer<typeof formSchema>;
export type { SubscriptionFormValues };
const normalizeLimitRule = (
item: SubscriptionTrafficLimitRule
): SubscriptionTrafficLimitRule => ({
stat_type: item.stat_type || "day",
stat_value: Math.max(1, Math.floor(Number(item.stat_value) || 1)),
traffic_usage: Math.max(0, Number(item.traffic_usage) || 0),
speed_limit: Math.max(0, Number(item.speed_limit) || 0),
});
export function SubscriptionForm({
@@ -57,11 +91,14 @@ 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,
device_limit: initialData?.device_limit || 0,
traffic_limit: initialData?.traffic_limit || [],
upload: initialData?.upload || 0,
download: initialData?.download || 0,
expired_at: initialData?.expire_time || 0,
@@ -69,7 +106,7 @@ export function SubscriptionForm({
},
});
const handleSubmit = async (values: any) => {
const handleSubmit = async (values: SubscriptionFormValues) => {
const success = await onSubmit(values);
if (success) {
setOpen(false);
@@ -135,6 +172,7 @@ export function SubscriptionForm({
</FormLabel>
<FormControl>
<EnhancedInput
min={0}
placeholder={t("unlimited", "Unlimited")}
type="number"
{...field}
@@ -154,6 +192,56 @@ export function SubscriptionForm({
</FormItem>
)}
/>
<FormField
control={form.control}
name="speed_limit"
render={({ field }) => (
<FormItem>
<FormLabel>{t("speedLimit", "Speed Limit")}</FormLabel>
<FormControl>
<EnhancedInput
min={0}
placeholder={t("unlimited", "Unlimited")}
type="number"
{...field}
onValueChange={(value) => {
form.setValue(field.name, value as number);
}}
suffix="Mbps"
/>
</FormControl>
<FormDescription>
{t(
"userSpeedLimitDescription",
"Set to 0 to use the subscription default speed limit."
)}
</FormDescription>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="device_limit"
render={({ field }) => (
<FormItem>
<FormLabel>{t("deviceLimit", "Device Limit")}</FormLabel>
<FormControl>
<EnhancedInput
min={0}
placeholder={t("unlimited", "Unlimited")}
step={1}
type="number"
{...field}
onValueChange={(value) => {
form.setValue(field.name, value as number);
}}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="upload"
@@ -164,6 +252,7 @@ export function SubscriptionForm({
</FormLabel>
<FormControl>
<EnhancedInput
min={0}
placeholder="0"
type="number"
{...field}
@@ -193,6 +282,7 @@ export function SubscriptionForm({
</FormLabel>
<FormControl>
<EnhancedInput
min={0}
placeholder="0"
type="number"
{...field}
@@ -212,6 +302,119 @@ export function SubscriptionForm({
</FormItem>
)}
/>
<FormField
control={form.control}
name="traffic_limit"
render={({ field }) => (
<FormItem>
<FormLabel>
{t("trafficLimitRules", "Traffic Limit Rules")}
</FormLabel>
<FormControl>
<ArrayInput<SubscriptionTrafficLimitRule>
className="grid grid-cols-2 gap-3 lg:grid-cols-4"
fields={[
{
name: "stat_type",
type: "select",
placeholder: t("statType", "Statistics Type"),
value: "day",
options: [
{
label: t("statTypeHour", "Hour"),
value: "hour",
},
{
label: t("statTypeDay", "Day"),
value: "day",
},
],
},
{
name: "stat_value",
type: "number",
placeholder: t("statValue", "Time Value"),
min: 1,
step: 1,
onKeyDown: (
e: KeyboardEvent<HTMLInputElement>
) => {
if (e.key === "." || e.key === ",") {
e.preventDefault();
}
},
formatOutput: (value: string | number) => {
const num = Number(value);
return String(
Number.isNaN(num) ? 1 : Math.floor(num)
);
},
},
{
name: "traffic_usage",
type: "number",
placeholder: t(
"trafficUsage",
"Traffic Usage (GB)"
),
min: 0,
onKeyDown: (
e: KeyboardEvent<HTMLInputElement>
) => {
if (e.key === "." || e.key === ",") {
e.preventDefault();
}
},
formatOutput: (value: string | number) => {
const num = Number(value);
return String(
Number.isNaN(num) ? 0 : Math.floor(num)
);
},
},
{
name: "speed_limit",
type: "number",
placeholder: t(
"speedLimitMbps",
"Speed Limit (Mbps)"
),
min: 0,
onKeyDown: (
e: KeyboardEvent<HTMLInputElement>
) => {
if (e.key === "." || e.key === ",") {
e.preventDefault();
}
},
formatOutput: (value: string | number) => {
const num = Number(value);
return String(
Number.isNaN(num) ? 0 : Math.floor(num)
);
},
},
]}
onChange={(items) => {
field.onChange(items.map(normalizeLimitRule));
}}
value={
field.value && field.value.length > 0
? field.value
: [defaultLimitRule]
}
/>
</FormControl>
<FormDescription>
{t(
"trafficLimitDescription",
"Limit speed when usage reaches the configured amount in the selected time window."
)}
</FormDescription>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="expired_at"