搜索框加空格校验 & 发布v1.3.0版本

This commit is contained in:
Eamon
2026-04-16 14:28:03 +08:00
parent c850831915
commit 13be8f3270
13 changed files with 80 additions and 91 deletions

View File

@@ -20,7 +20,7 @@ import type { Balance } from "@/models/balance"
type FilterValues = {
user_phone?: string
bill_id?: string
bill_no?: string
created_at_start?: Date
created_at_end?: Date
}
@@ -28,7 +28,7 @@ type FilterValues = {
const filterSchema = z
.object({
phone: z.string().optional(),
bill_id: z.string().optional(),
bill_no: z.string().optional(),
admin_id: z.string().optional(),
created_at_start: z.string().optional(),
created_at_end: z.string().optional(),
@@ -55,14 +55,13 @@ export default function BalancePage() {
const router = useRouter()
const userId = searchParams.get("userId")
const userPhone = searchParams.get("phone")
console.log(userPhone, "userPhone")
const [filters, setFilters] = useState<FilterValues>({})
const { control, handleSubmit, reset } = useForm<FormValues>({
resolver: zodResolver(filterSchema),
defaultValues: {
phone: "",
bill_id: "",
bill_no: "",
admin_id: "",
created_at_start: "",
created_at_end: "",
@@ -72,12 +71,11 @@ export default function BalancePage() {
const table = useDataTable<Balance>((page, size) =>
getBalance({ page, size, user_id: Number(userId), ...filters }),
)
console.log(table, "仅用户的table")
const onFilter = handleSubmit(data => {
const result: FilterValues = {}
if (data.phone) result.user_phone = data.phone
if (data.bill_id) result.bill_id = data.bill_id
if (data.phone?.trim()) result.user_phone = data.phone.trim()
if (data.bill_no?.trim()) result.bill_no = data.bill_no.trim()
if (data.created_at_start)
result.created_at_start = new Date(data.created_at_start)
if (data.created_at_end)
@@ -102,7 +100,7 @@ export default function BalancePage() {
<form onSubmit={onFilter} className="bg-card p-4 rounded-lg">
<div className="flex flex-wrap items-end gap-4">
<Controller
name="bill_id"
name="bill_no"
control={control}
render={({ field, fieldState }) => (
<Field