添加网关列表页面 & 添加单价不能低于最低价格校验
This commit is contained in:
Eamon
26
src/actions/gateway.ts
Normal file
26
src/actions/gateway.ts
Normal file
@@ -0,0 +1,26 @@
|
||||
"use server"
|
||||
|
||||
import type { PageRecord } from "@/lib/api"
|
||||
import type { Gateway } from "@/models/gateway"
|
||||
import { callByUser } from "./base"
|
||||
|
||||
export async function getGatewayPage(params: { page: number; size: number }) {
|
||||
return callByUser<PageRecord<Gateway>>("/api/admin/proxy/page", params)
|
||||
}
|
||||
|
||||
|
||||
export async function createGateway(data: {
|
||||
mac: string
|
||||
ip: string
|
||||
host?: string
|
||||
type: number
|
||||
status: number
|
||||
}) {
|
||||
return callByUser<Gateway>("/api/admin/proxy/create", data)
|
||||
}
|
||||
|
||||
export async function deletegateway(id: number) {
|
||||
return callByUser<Gateway>("/api/admin/proxy/remove", {
|
||||
id,
|
||||
})
|
||||
}
|
||||
@@ -88,6 +88,7 @@ export default function Appbar(props: { admin: Admin }) {
|
||||
discount: "折扣管理",
|
||||
statistics: "数据统计",
|
||||
balance: "余额明细",
|
||||
gateway: "网关列表",
|
||||
}
|
||||
|
||||
return labels[path] || path
|
||||
|
||||
245
src/app/(root)/gateway/create.tsx
Normal file
245
src/app/(root)/gateway/create.tsx
Normal file
@@ -0,0 +1,245 @@
|
||||
"use client"
|
||||
|
||||
import { zodResolver } from "@hookform/resolvers/zod"
|
||||
import { useState } from "react"
|
||||
import { Controller, useForm } from "react-hook-form"
|
||||
import z from "zod"
|
||||
import { Button } from "@/components/ui/button"
|
||||
import {
|
||||
Dialog,
|
||||
DialogContent,
|
||||
DialogFooter,
|
||||
DialogHeader,
|
||||
DialogTitle,
|
||||
DialogTrigger,
|
||||
} from "@/components/ui/dialog"
|
||||
import {
|
||||
Field,
|
||||
FieldError,
|
||||
FieldGroup,
|
||||
FieldLabel,
|
||||
} from "@/components/ui/field"
|
||||
import { Input } from "@/components/ui/input"
|
||||
import {
|
||||
Select,
|
||||
SelectContent,
|
||||
SelectItem,
|
||||
SelectTrigger,
|
||||
SelectValue,
|
||||
} from "@/components/ui/select"
|
||||
import { toast } from "sonner"
|
||||
import { createGateway } from "@/actions/gateway"
|
||||
|
||||
const schema = z.object({
|
||||
mac: z.string().regex(/^([0-9A-Fa-f]{2}[:-]){5}[0-9A-Fa-f]{2}$/, {
|
||||
message: "MAC地址格式不正确，请使用如 00:11:22:AA:BB:CC 或 00-11-22-AA-BB-CC 的格式"
|
||||
}),
|
||||
ip: z.string().regex(/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/, {
|
||||
message: "IP地址格式不正确，请使用如 192.168.1.1 的格式"
|
||||
}),
|
||||
host: z.string().regex(/^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/, {
|
||||
message: "域名格式不正确，请使用如 example.com 的格式"
|
||||
}).or(z.literal("")),
|
||||
type: z.string().optional(),
|
||||
status: z.string().optional(),
|
||||
})
|
||||
|
||||
export default function CreatePage(props: { onSuccess?: () => void }) {
|
||||
const [open, setOpen] = useState(false)
|
||||
const [isLoading, setIsLoading] = useState(false)
|
||||
const form = useForm({
|
||||
resolver: zodResolver(schema),
|
||||
defaultValues: {
|
||||
mac: "",
|
||||
ip: "",
|
||||
host: "",
|
||||
type: "1",
|
||||
status: "0",
|
||||
},
|
||||
})
|
||||
|
||||
const onSubmit = async (data: z.infer<typeof schema>) => {
|
||||
setIsLoading(true)
|
||||
try {
|
||||
const payload = {
|
||||
mac: data.mac.trim(),
|
||||
ip: data.ip.trim(),
|
||||
host: data?.host.trim(),
|
||||
type: data.type ? Number(data.type) : 0,
|
||||
status: data.status ? Number(data.status) : 0,
|
||||
}
|
||||
|
||||
const res = await createGateway(payload)
|
||||
|
||||
if (res.success) {
|
||||
toast.success("添加网关成功")
|
||||
setOpen(false)
|
||||
props.onSuccess?.()
|
||||
form.reset()
|
||||
}else {
|
||||
toast.error(res.message || "添加失败")
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("添加网关失败:", error)
|
||||
const message = error instanceof Error ? error.message : error
|
||||
toast.error(`添加失败: ${message}`)
|
||||
} finally {
|
||||
setIsLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
const handleCancel = () => {
|
||||
setOpen(false)
|
||||
form.reset()
|
||||
}
|
||||
|
||||
const statusOptions = [
|
||||
{ value: "0", label: "离线" },
|
||||
{ value: "1", label: "在线" },
|
||||
]
|
||||
|
||||
const typeOptions = [
|
||||
{ value: "1", label: "自有" },
|
||||
{ value: "2", label: "白银" },
|
||||
]
|
||||
|
||||
return (
|
||||
<Dialog
|
||||
open={open}
|
||||
onOpenChange={newOpen => {
|
||||
setOpen(newOpen)
|
||||
if (!newOpen) {
|
||||
form.reset()
|
||||
}
|
||||
}}
|
||||
>
|
||||
<DialogTrigger asChild>
|
||||
<Button>添加网关</Button>
|
||||
</DialogTrigger>
|
||||
<DialogContent>
|
||||
<DialogHeader>
|
||||
<DialogTitle>添加网关</DialogTitle>
|
||||
</DialogHeader>
|
||||
|
||||
<form
|
||||
id="gateway-create"
|
||||
onSubmit={form.handleSubmit(onSubmit)}
|
||||
>
|
||||
<FieldGroup>
|
||||
<Controller
|
||||
control={form.control}
|
||||
name="mac"
|
||||
render={({ field, fieldState }) => (
|
||||
<Field>
|
||||
<FieldLabel htmlFor="gateway-create-mac">MAC地址:</FieldLabel>
|
||||
<Input
|
||||
id="gateway-create-mac"
|
||||
placeholder="请输入MAC地址，如：00:11:22:33:44:55"
|
||||
{...field}
|
||||
aria-invalid={fieldState.invalid}
|
||||
/>
|
||||
{fieldState.invalid && fieldState.error && (
|
||||
<FieldError errors={[fieldState.error]} />
|
||||
)}
|
||||
</Field>
|
||||
)}
|
||||
/>
|
||||
<Controller
|
||||
control={form.control}
|
||||
name="ip"
|
||||
render={({ field, fieldState }) => (
|
||||
<Field>
|
||||
<FieldLabel htmlFor="gateway-create-ip">IP地址:</FieldLabel>
|
||||
<Input
|
||||
id="gateway-create-ip"
|
||||
placeholder="请输入IP地址，如：192.168.1.1"
|
||||
{...field}
|
||||
aria-invalid={fieldState.invalid}
|
||||
/>
|
||||
{fieldState.invalid && fieldState.error && (
|
||||
<FieldError errors={[fieldState.error]} />
|
||||
)}
|
||||
</Field>
|
||||
)}
|
||||
/>
|
||||
<Controller
|
||||
control={form.control}
|
||||
name="host"
|
||||
render={({ field, fieldState }) => (
|
||||
<Field>
|
||||
<FieldLabel htmlFor="gateway-create-host">域名:</FieldLabel>
|
||||
<Input
|
||||
id="gateway-create-host"
|
||||
placeholder="请输入域名，如：example.com"
|
||||
{...field}
|
||||
aria-invalid={fieldState.invalid}
|
||||
/>
|
||||
{fieldState.invalid && fieldState.error && (
|
||||
<FieldError errors={[fieldState.error]} />
|
||||
)}
|
||||
</Field>
|
||||
)}
|
||||
/>
|
||||
<Controller
|
||||
control={form.control}
|
||||
name="type"
|
||||
render={({ field, fieldState }) => (
|
||||
<Field data-invalid={fieldState.invalid}>
|
||||
<FieldLabel>类型</FieldLabel>
|
||||
<Select value={field.value} onValueChange={field.onChange}>
|
||||
<SelectTrigger className="w-full h-9">
|
||||
<SelectValue placeholder="请选择网关类型" />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
{typeOptions.map(option => (
|
||||
<SelectItem key={option.value} value={option.value}>
|
||||
{option.label}
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
{fieldState.invalid && fieldState.error && (
|
||||
<FieldError>{fieldState.error?.message}</FieldError>
|
||||
)}
|
||||
</Field>
|
||||
)}
|
||||
/>
|
||||
<Controller
|
||||
control={form.control}
|
||||
name="status"
|
||||
render={({ field, fieldState }) => (
|
||||
<Field data-invalid={fieldState.invalid}>
|
||||
<FieldLabel>状态</FieldLabel>
|
||||
<Select value={field.value} onValueChange={field.onChange}>
|
||||
<SelectTrigger className="w-full h-9">
|
||||
<SelectValue placeholder="请选择网关状态" />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
{statusOptions.map(option => (
|
||||
<SelectItem key={option.value} value={option.value}>
|
||||
{option.label}
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
{fieldState.invalid && fieldState.error && (
|
||||
<FieldError>{fieldState.error?.message}</FieldError>
|
||||
)}
|
||||
</Field>
|
||||
)}
|
||||
/>
|
||||
</FieldGroup>
|
||||
</form>
|
||||
|
||||
<DialogFooter className="gap-2">
|
||||
<Button variant="ghost" onClick={handleCancel} disabled={isLoading}>
|
||||
取消
|
||||
</Button>
|
||||
<Button type="submit" form="gateway-create" disabled={isLoading}>
|
||||
{isLoading ? "添加中..." : "添加"}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
)
|
||||
}
|
||||
132
src/app/(root)/gateway/page.tsx
Normal file
132
src/app/(root)/gateway/page.tsx
Normal file
@@ -0,0 +1,132 @@
|
||||
"use client"
|
||||
|
||||
import { Suspense, useState } from "react"
|
||||
import { toast } from "sonner"
|
||||
import { deletegateway, getGatewayPage } from "@/actions/gateway"
|
||||
import { DataTable, useDataTable } from "@/components/data-table"
|
||||
import { Page } from "@/components/page"
|
||||
import {
|
||||
AlertDialog,
|
||||
AlertDialogAction,
|
||||
AlertDialogCancel,
|
||||
AlertDialogContent,
|
||||
AlertDialogDescription,
|
||||
AlertDialogFooter,
|
||||
AlertDialogHeader,
|
||||
AlertDialogTitle,
|
||||
AlertDialogTrigger,
|
||||
} from "@/components/ui/alert-dialog"
|
||||
import { Button } from "@/components/ui/button"
|
||||
import type { Gateway } from "@/models/gateway"
|
||||
import CreatePage from "./create"
|
||||
import { format } from "date-fns"
|
||||
|
||||
export default function GatewayPage() {
|
||||
const [loading, setLoading] = useState(false)
|
||||
|
||||
const table = useDataTable((page, size) => getGatewayPage({ page, size }))
|
||||
|
||||
return (
|
||||
<Page>
|
||||
<div className="flex justify-between items-stretch">
|
||||
<div className="flex gap-3">
|
||||
<CreatePage onSuccess={table.refresh} />
|
||||
</div>
|
||||
</div>
|
||||
<Suspense>
|
||||
<DataTable<Gateway>
|
||||
{...table}
|
||||
status={loading ? "load" : "done"}
|
||||
columns={[
|
||||
// { header: "id", accessorKey: "id" },
|
||||
{
|
||||
header: "域名",
|
||||
accessorKey: "host",
|
||||
},
|
||||
{ header: "IP地址", accessorKey: "ip" },
|
||||
{
|
||||
header: "MAC地址",
|
||||
accessorKey: "mac",
|
||||
},
|
||||
{
|
||||
header: "类型",
|
||||
accessorKey: "type",
|
||||
cell: ({ row }) => (row.original.type === 1 ? "自有" : "白银"),
|
||||
},
|
||||
{
|
||||
header: "状态",
|
||||
accessorKey: "status",
|
||||
cell: ({ row }) => (row.original.status === 0 ? "离线" : "在线"),
|
||||
},
|
||||
{
|
||||
header: "创建时间",
|
||||
accessorKey: "created_at",
|
||||
cell: ({ row }) =>
|
||||
format(new Date(row.original.created_at), "yyyy-MM-dd HH:mm"),
|
||||
},
|
||||
{
|
||||
id: "action",
|
||||
meta: { pin: "right" },
|
||||
header: "操作",
|
||||
cell: ({ row }) => (
|
||||
<div className="flex gap-2">
|
||||
<Delete gateway={row.original} onSuccess={table.refresh} />
|
||||
</div>
|
||||
),
|
||||
},
|
||||
]}
|
||||
/>
|
||||
</Suspense>
|
||||
</Page>
|
||||
)
|
||||
}
|
||||
|
||||
function Delete({
|
||||
gateway,
|
||||
onSuccess,
|
||||
}: {
|
||||
gateway: Gateway
|
||||
onSuccess?: () => void
|
||||
}) {
|
||||
const [loading, setLoading] = useState(false)
|
||||
const handleConfirm = async () => {
|
||||
setLoading(true)
|
||||
try {
|
||||
const resp = await deletegateway(gateway.id)
|
||||
if (resp.success) {
|
||||
toast.success("删除成功")
|
||||
onSuccess?.()
|
||||
} else {
|
||||
toast.error(resp.message ?? "删除失败")
|
||||
}
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : error
|
||||
toast.error(`接口请求错误: ${message}`)
|
||||
} finally {
|
||||
setLoading(false)
|
||||
}
|
||||
}
|
||||
return (
|
||||
<AlertDialog>
|
||||
<AlertDialogTrigger asChild>
|
||||
<Button size="sm" variant="destructive" disabled={loading}>
|
||||
删除
|
||||
</Button>
|
||||
</AlertDialogTrigger>
|
||||
<AlertDialogContent size="sm">
|
||||
<AlertDialogHeader>
|
||||
<AlertDialogTitle>确认删除</AlertDialogTitle>
|
||||
<AlertDialogDescription>
|
||||
确定要删除「{gateway.host || gateway.ip}」吗？此操作不可撤销。
|
||||
</AlertDialogDescription>
|
||||
</AlertDialogHeader>
|
||||
<AlertDialogFooter>
|
||||
<AlertDialogCancel>取消</AlertDialogCancel>
|
||||
<AlertDialogAction variant="destructive" onClick={handleConfirm}>
|
||||
删除
|
||||
</AlertDialogAction>
|
||||
</AlertDialogFooter>
|
||||
</AlertDialogContent>
|
||||
</AlertDialog>
|
||||
)
|
||||
}
|
||||
@@ -9,6 +9,7 @@ import {
|
||||
ComputerIcon,
|
||||
ContactRound,
|
||||
DollarSign,
|
||||
DoorClosedIcon,
|
||||
FolderCode,
|
||||
Home,
|
||||
KeyRound,
|
||||
@@ -249,6 +250,11 @@ const menuSections: { title: string; items: NavItemProps[] }[] = [
|
||||
{
|
||||
title: "系统",
|
||||
items: [
|
||||
{
|
||||
href: "/gateway",
|
||||
icon: DoorClosedIcon,
|
||||
label: "网关列表",
|
||||
},
|
||||
{
|
||||
href: "/admin",
|
||||
icon: Shield,
|
||||
|
||||
@@ -34,25 +34,38 @@ import {
|
||||
import type { ProductDiscount } from "@/models/product_discount"
|
||||
import type { SelectedProduct } from "./type"
|
||||
|
||||
const schema = z.object({
|
||||
code: z.string().min(1, "请输入套餐编码"),
|
||||
name: z.string().min(1, "请输入套餐名称"),
|
||||
price: z
|
||||
.string()
|
||||
.min(1, "请输入单价")
|
||||
.refine(
|
||||
v => !Number.isNaN(Number(v)) && Number(v) > 0,
|
||||
"请输入有效的正数单价",
|
||||
),
|
||||
discount_id: z.string().optional(),
|
||||
price_min: z
|
||||
.string()
|
||||
.min(1, "请输入最低价格")
|
||||
.refine(
|
||||
v => !Number.isNaN(Number(v)) && Number(v) > 0,
|
||||
"请输入有效的正数价格",
|
||||
),
|
||||
})
|
||||
const schema = z
|
||||
.object({
|
||||
code: z.string().min(1, "请输入套餐编码"),
|
||||
name: z.string().min(1, "请输入套餐名称"),
|
||||
price: z
|
||||
.string()
|
||||
.min(1, "请输入单价")
|
||||
.refine(
|
||||
v => !Number.isNaN(Number(v)) && Number(v) > 0,
|
||||
"请输入有效的正数单价",
|
||||
),
|
||||
discount_id: z.string().optional(),
|
||||
price_min: z
|
||||
.string()
|
||||
.min(1, "请输入最低价格")
|
||||
.refine(
|
||||
v => !Number.isNaN(Number(v)) && Number(v) > 0,
|
||||
"请输入有效的正数价格",
|
||||
),
|
||||
})
|
||||
.refine(
|
||||
data => {
|
||||
const price = Number(data.price)
|
||||
const priceMin = Number(data.price_min)
|
||||
if (isNaN(price) || isNaN(priceMin)) return true
|
||||
return price >= priceMin
|
||||
},
|
||||
{
|
||||
message: "单价不能低于最低价格",
|
||||
path: ["price"],
|
||||
},
|
||||
)
|
||||
|
||||
export function CreateProductSku(props: {
|
||||
product?: SelectedProduct
|
||||
|
||||
@@ -34,25 +34,38 @@ import {
|
||||
import type { ProductDiscount } from "@/models/product_discount"
|
||||
import type { ProductSku } from "@/models/product_sku"
|
||||
|
||||
const schema = z.object({
|
||||
code: z.string().min(1, "请输入套餐编码"),
|
||||
name: z.string().min(1, "请输入套餐名称"),
|
||||
price: z
|
||||
.string()
|
||||
.min(1, "请输入单价")
|
||||
.refine(
|
||||
v => !Number.isNaN(Number(v)) && Number(v) > 0,
|
||||
"请输入有效的正数单价",
|
||||
),
|
||||
discount_id: z.string().optional(),
|
||||
price_min: z
|
||||
.string()
|
||||
.min(1, "请输入最低价格")
|
||||
.refine(
|
||||
v => !Number.isNaN(Number(v)) && Number(v) > 0,
|
||||
"请输入有效的正数价格",
|
||||
),
|
||||
})
|
||||
const schema = z
|
||||
.object({
|
||||
code: z.string().min(1, "请输入套餐编码"),
|
||||
name: z.string().min(1, "请输入套餐名称"),
|
||||
price: z
|
||||
.string()
|
||||
.min(1, "请输入单价")
|
||||
.refine(
|
||||
v => !Number.isNaN(Number(v)) && Number(v) > 0,
|
||||
"请输入有效的正数单价",
|
||||
),
|
||||
discount_id: z.string().optional(),
|
||||
price_min: z
|
||||
.string()
|
||||
.min(1, "请输入最低价格")
|
||||
.refine(
|
||||
v => !Number.isNaN(Number(v)) && Number(v) > 0,
|
||||
"请输入有效的正数价格",
|
||||
),
|
||||
})
|
||||
.refine(
|
||||
data => {
|
||||
const price = Number(data.price)
|
||||
const priceMin = Number(data.price_min)
|
||||
if (isNaN(price) || isNaN(priceMin)) return true
|
||||
return price >= priceMin
|
||||
},
|
||||
{
|
||||
message: "单价不能低于最低价格",
|
||||
path: ["price"],
|
||||
},
|
||||
)
|
||||
|
||||
export function UpdateProductSku(props: {
|
||||
sku: ProductSku
|
||||
|
||||
11
src/models/gateway.ts
Normal file
11
src/models/gateway.ts
Normal file
@@ -0,0 +1,11 @@
|
||||
export type Gateway = {
|
||||
id: number
|
||||
version: string
|
||||
mac: string
|
||||
ip: string
|
||||
host: string
|
||||
type: number
|
||||
status: number
|
||||
meta: string
|
||||
created_at: Date
|
||||
}
|
||||
Reference in New Issue
Block a user