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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lanhu-admin",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "private": true,
   "scripts": {
     "dev": "next dev -H 0.0.0.0 -p 3001 --turbopack",

src/actions/balance.ts

@@ -6,7 +6,7 @@ export async function getPageBalance(params: {
   page: number
   size: number
   user_phone?: string
-  bill_id?: string
+  bill_no?: string
   created_at_start?: Date
   created_at_end?: Date
 }) {
@@ -21,7 +21,7 @@ export async function getBalance(params: {
   size: number
   user_id: number
   user_phone?: string
-  bill_id?: string
+  bill_no?: string
   created_at_start?: Date
   created_at_end?: Date
 }) {

src/app/(root)/admin/page.tsx

@@ -36,7 +36,6 @@ import { UpdateAdmin } from "./update"
 
 export default function AdminPage() {
   const table = useDataTable((page, size) => getPageAdmin({ page, size }))
-  console.log(table, "table")
 
   return (
     <Page>

src/app/(root)/balance/page.tsx

@@ -19,7 +19,7 @@ import type { Balance } from "@/models/balance"
 
 type FilterValues = {
   user_phone?: string
-  bill_id?: string
+  bill_no?: string
   admin_id?: 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(),
@@ -56,7 +56,7 @@ export default function BalancePage() {
     resolver: zodResolver(filterSchema),
     defaultValues: {
       phone: "",
-      bill_id: "",
+      bill_no: "",
       admin_id: "",
       created_at_start: "",
       created_at_end: "",
@@ -70,11 +70,10 @@ export default function BalancePage() {
 
   const table = useDataTable<Balance>(fetchUsers)
 
-  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 +101,7 @@ export default function BalancePage() {
             )}
           />
           <Controller
-            name="bill_id"
+            name="bill_no"
             control={control}
             render={({ field, fieldState }) => (
               <Field

src/app/(root)/batch/page.tsx

@@ -259,7 +259,7 @@ export default function BatchPage() {
             { header: "批次号", accessorKey: "batch_no" },
             { header: "省份", accessorKey: "prov" },
             { header: "城市", accessorKey: "city" },
-            { header: "提取IP", accessorKey: "ip" },
+            { header: "用户IP", accessorKey: "ip" },
             { header: "运营商", accessorKey: "isp" },
             { header: "提取数量", accessorKey: "count" },
             {

src/app/(root)/client/balance/page.tsx

@@ -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

src/app/(root)/client/cust/page.tsx

@@ -176,7 +176,7 @@ export default function UserQueryPage() {
                   2: "代理商注册",
                   3: "代理商添加",
                 }
-                return sourceMap[row.original.source] ?? "未知"
+                return sourceMap[row.original.source] ?? "官网注册"
               },
             },
             {

src/app/(root)/cust/page.tsx

@@ -109,8 +109,8 @@ export default function CustPage() {
 
   const onFilter = handleSubmit(data => {
     const result: FilterValues = {}
-    if (data.account) result.account = data.account
-    if (data.name) result.name = data.name
+    if (data.account?.trim()) result.account = data.account.trim()
+    if (data.name?.trim()) result.name = data.name.trim()
     if (data.identified && data.identified !== "all")
       result.identified = data.identified === "1"
     if (data.enabled && data.enabled !== "all")

src/app/(root)/permissions/page.tsx

@@ -139,7 +139,7 @@ function PermissionTable() {
   }, [data])
 
   return (
-    <div className="flex flex-col gap-3">
+    <div className="flex flex-col gap-3 overflow-auto">
       {process.env.NODE_ENV === "development" && (
         <div>
           <Button variant="outline" size="sm" onClick={handleCopy}>
@@ -150,7 +150,7 @@ function PermissionTable() {
       )}
       <Table>
         <TableHeader>
-          <TableRow className="h-10">
+          <TableRow className="h-10 sticky top-0 bg-background">
             <TableHead>编码</TableHead>
             <TableHead>描述</TableHead>
           </TableRow>

src/app/(root)/product/create.tsx

@@ -43,8 +43,7 @@ const schema = z.object({
     .refine(
       v => !Number.isNaN(Number(v)) && Number(v) > 0,
       "请输入有效的正数单价",
-    )
-    .refine(val => /^\d+(\.\d{1,2})?$/.test(val), "价格最多只能保留两位小数"),
+    ),
   discount_id: z.string().optional(),
   price_min: z
     .string()
@@ -52,8 +51,7 @@ const schema = z.object({
     .refine(
       v => !Number.isNaN(Number(v)) && Number(v) > 0,
       "请输入有效的正数价格",
-    )
-    .refine(val => /^\d+(\.\d{1,2})?$/.test(val), "价格最多只能保留两位小数"),
+    ),
 })
 
 export function CreateProductSku(props: {
@@ -166,19 +164,19 @@ export function CreateProductSku(props: {
                     placeholder="请输入单价"
                     {...field}
                     aria-invalid={fieldState.invalid}
-                    onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                      let value = e.target.value
-                      value = value.replace(/[^\d.]/g, "")
-                      const dotCount = (value.match(/\./g) || []).length
-                      if (dotCount > 1) {
-                        value = value.slice(0, value.lastIndexOf("."))
-                      }
-                      if (value.includes(".")) {
-                        const [int, dec] = value.split(".")
-                        value = `${int}.${dec.slice(0, 2)}`
-                      }
-                      field.onChange(value)
-                    }}
+                    // onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                    //   let value = e.target.value
+                    //   value = value.replace(/[^\d.]/g, "")
+                    //   const dotCount = (value.match(/\./g) || []).length
+                    //   if (dotCount > 1) {
+                    //     value = value.slice(0, value.lastIndexOf("."))
+                    //   }
+                    //   if (value.includes(".")) {
+                    //     const [int, dec] = value.split(".")
+                    //     value = `${int}.${dec.slice(0, 2)}`
+                    //   }
+                    //   field.onChange(value)
+                    // }}
                   />
                   {fieldState.invalid && (
                     <FieldError errors={[fieldState.error]} />
@@ -197,19 +195,19 @@ export function CreateProductSku(props: {
                     placeholder="请输入最低价格"
                     {...field}
                     aria-invalid={fieldState.invalid}
-                    onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                      let value = e.target.value
-                      value = value.replace(/[^\d.]/g, "")
-                      const dotCount = (value.match(/\./g) || []).length
-                      if (dotCount > 1) {
-                        value = value.slice(0, value.lastIndexOf("."))
-                      }
-                      if (value.includes(".")) {
-                        const [int, dec] = value.split(".")
-                        value = `${int}.${dec.slice(0, 2)}`
-                      }
-                      field.onChange(value)
-                    }}
+                    // onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                    //   let value = e.target.value
+                    //   value = value.replace(/[^\d.]/g, "")
+                    //   const dotCount = (value.match(/\./g) || []).length
+                    //   if (dotCount > 1) {
+                    //     value = value.slice(0, value.lastIndexOf("."))
+                    //   }
+                    //   if (value.includes(".")) {
+                    //     const [int, dec] = value.split(".")
+                    //     value = `${int}.${dec.slice(0, 2)}`
+                    //   }
+                    //   field.onChange(value)
+                    // }}
                   />
                   {fieldState.invalid && (
                     <FieldError errors={[fieldState.error]} />

src/app/(root)/product/page.tsx

@@ -99,7 +99,6 @@ function ProductSkus(props: {
   )
 
   const table = useDataTable(action)
-  console.log(table, "table")
 
   return (
     <div className="flex-auto overflow-hidden flex flex-col items-stretch gap-3">
@@ -130,15 +129,15 @@ function ProductSkus(props: {
                 ),
             },
             { header: "套餐名称", accessorKey: "name" },
-            { header: "单价", accessorFn: row => Number(row.price).toFixed(2) },
+            { header: "单价", accessorFn: row => Number(row.price) },
             { header: "折扣", accessorFn: row => row.discount?.name ?? "—" },
             {
-              header: "最终价格",
+              header: "折后价",
               accessorFn: row => {
                 const value = row.discount
                   ? (Number(row.price) * Number(row.discount.discount)) / 100
                   : Number(row.price)
-                return Number(value.toFixed(2))
+                return Number(value)
               },
             },
             { header: "最低价格", accessorKey: "price_min" },

src/app/(root)/product/update.tsx

@@ -43,8 +43,7 @@ const schema = z.object({
     .refine(
       v => !Number.isNaN(Number(v)) && Number(v) > 0,
       "请输入有效的正数单价",
-    )
-    .refine(val => /^\d+(\.\d{1,2})?$/.test(val), "价格最多只能保留两位小数"),
+    ),
   discount_id: z.string().optional(),
   price_min: z
     .string()
@@ -52,8 +51,7 @@ const schema = z.object({
     .refine(
       v => !Number.isNaN(Number(v)) && Number(v) > 0,
       "请输入有效的正数价格",
-    )
-    .refine(val => /^\d+(\.\d{1,2})?$/.test(val), "价格最多只能保留两位小数"),
+    ),
 })
 
 export function UpdateProductSku(props: {
@@ -85,8 +83,6 @@ export function UpdateProductSku(props: {
   }, [open])
 
   const onSubmit = async (data: z.infer<typeof schema>) => {
-    console.log(data, "data")
-
     try {
       const resp = await updateProductSku({
         id: props.sku.id,
@@ -171,19 +167,19 @@ export function UpdateProductSku(props: {
                     placeholder="请输入单价"
                     {...field}
                     aria-invalid={fieldState.invalid}
-                    onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                      let value = e.target.value
-                      value = value.replace(/[^\d.]/g, "")
-                      const dotCount = (value.match(/\./g) || []).length
-                      if (dotCount > 1) {
-                        value = value.slice(0, value.lastIndexOf("."))
-                      }
-                      if (value.includes(".")) {
-                        const [int, dec] = value.split(".")
-                        value = `${int}.${dec.slice(0, 2)}`
-                      }
-                      field.onChange(value)
-                    }}
+                    // onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                    //   let value = e.target.value
+                    //   value = value.replace(/[^\d.]/g, "")
+                    //   const dotCount = (value.match(/\./g) || []).length
+                    //   if (dotCount > 1) {
+                    //     value = value.slice(0, value.lastIndexOf("."))
+                    //   }
+                    //   if (value.includes(".")) {
+                    //     const [int, dec] = value.split(".")
+                    //     value = `${int}.${dec.slice(0, 2)}`
+                    //   }
+                    //   field.onChange(value)
+                    // }}
                   />
                   {fieldState.invalid && (
                     <FieldError errors={[fieldState.error]} />
@@ -202,19 +198,19 @@ export function UpdateProductSku(props: {
                     placeholder="请输入最低价格"
                     {...field}
                     aria-invalid={fieldState.invalid}
-                    onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                      let value = e.target.value
-                      value = value.replace(/[^\d.]/g, "")
-                      const dotCount = (value.match(/\./g) || []).length
-                      if (dotCount > 1) {
-                        value = value.slice(0, value.lastIndexOf("."))
-                      }
-                      if (value.includes(".")) {
-                        const [int, dec] = value.split(".")
-                        value = `${int}.${dec.slice(0, 2)}`
-                      }
-                      field.onChange(value)
-                    }}
+                    // onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                    //   let value = e.target.value
+                    //   value = value.replace(/[^\d.]/g, "")
+                    //   const dotCount = (value.match(/\./g) || []).length
+                    //   if (dotCount > 1) {
+                    //     value = value.slice(0, value.lastIndexOf("."))
+                    //   }
+                    //   if (value.includes(".")) {
+                    //     const [int, dec] = value.split(".")
+                    //     value = `${int}.${dec.slice(0, 2)}`
+                    //   }
+                    //   field.onChange(value)
+                    // }}
                   />
                   {fieldState.invalid && (
                     <FieldError errors={[fieldState.error]} />

src/app/(root)/resources/page.tsx

@@ -171,7 +171,7 @@ function getTodayUsage(lastAt: Date | null | undefined, daily: number) {
 export default function ResourcesPage() {
   return (
     <Page>
-      <Tabs defaultValue="short">
+      <Tabs defaultValue="short" className="overflow-hidden">
         <TabsList className="bg-card">
           <TabsTrigger value="short" className="h-10 px-4 shadow-none">
             短效套餐
@@ -181,7 +181,10 @@ export default function ResourcesPage() {
           </TabsTrigger>
         </TabsList>
 
-        <TabsContent value="short" className="flex flex-col gap-4">
+        <TabsContent
+          value="short"
+          className="flex flex-col gap-4 overflow-hidden"
+        >
           <ResourceList resourceType="short" />
         </TabsContent>
         <TabsContent value="long" className="flex flex-col gap-4">
@@ -222,7 +225,7 @@ function ResourceList({ resourceType }: ResourceListProps) {
   )
 
   const table = useDataTable<Resources>(fetchResources)
-  console.log(table, "我的套餐的table")
+
   const refreshTable = useCallback(() => {
     setFilters(prev => ({ ...prev }))
   }, [])
@@ -417,8 +420,8 @@ function ResourceList({ resourceType }: ResourceListProps) {
   )
 
   return (
-    <div className="space-y-3">
-      <form onSubmit={onFilter} className="bg-card p-4 rounded-lg">
+    <div className="flex flex-col gap-3 overflow-hidden">
+      <form onSubmit={onFilter} className="bg-card p-4 rounded-lg flex-none">
         <div className="flex flex-wrap items-end gap-4">
           <Controller
             name="user_phone"
@@ -554,7 +557,13 @@ function ResourceList({ resourceType }: ResourceListProps) {
       </form>
 
       <Suspense fallback={<div className="text-center p-4">加载中...</div>}>
-        <DataTable<Resources> {...table} columns={columns} />
+        <DataTable<Resources>
+          {...table}
+          columns={columns}
+          classNames={{
+            root: "flex-auto overflow-hidden",
+          }}
+        />
       </Suspense>
     </div>
   )

src/app/(root)/user/page.tsx

@@ -55,7 +55,7 @@ export default function UserPage() {
 
   const onFilter = handleSubmit(data => {
     const result: FilterValues = {}
-    if (data.phone) result.phone = data.phone
+    if (data.phone?.trim()) result.phone = data.phone.trim()
     setFilters(result)
     table.pagination.onPageChange(1)
   })

src/components/products/index.tsx

@@ -45,20 +45,27 @@ function ProductShortCode<T extends { code: string }>(
   const { field, fieldState } = props
 
   const params = new URLSearchParams(field.value)
+  const mode = params.get("mode") || "quota"
+  const live = params.get("live") || "0"
+  const expire = params.get("expire") || "0"
+
   const setParams = (data: {
     mode?: string
     live?: string
     expire?: string
   }) => {
-    if (data.mode) params.set("mode", data.mode)
-    if (data.live) params.set("live", data.live)
-    if (data.expire) params.set("expire", data.expire)
-    field.onChange(params.toString())
+    const newParams = new URLSearchParams()
+    newParams.set("mode", data.mode || mode)
+    newParams.set("live", data.live || live)
+    newParams.set("expire", data.expire || expire)
+    console.log(newParams.toString())
+    field.onChange(newParams.toString())
   }
 
   const onModeChange = (value: string) => {
     setParams({ mode: value })
   }
+
   const onLiveChange = (e: ChangeEvent<HTMLInputElement>) => {
     let value = e.target.value || "0"
     if (value.length > 1 && value[0] === "0") {
@@ -67,6 +74,7 @@ function ProductShortCode<T extends { code: string }>(
     if (!/^([0-9]+)$/.test(value)) return
     setParams({ live: value })
   }
+
   const onExpireChange = (e: ChangeEvent<HTMLInputElement>) => {
     let value = e.target.value || "0"
     if (value.length > 1 && value[0] === "0") {
@@ -82,10 +90,7 @@ function ProductShortCode<T extends { code: string }>(
       <FieldGroup>
         <Field>
           <FieldLabel>套餐类型</FieldLabel>
-          <Select
-            defaultValue={params.get("mode") ?? "quota"}
-            onValueChange={onModeChange}
-          >
+          <Select defaultValue={mode} onValueChange={onModeChange}>
             <SelectTrigger>
               <SelectValue placeholder="请选择套餐类型" />
             </SelectTrigger>
@@ -97,20 +102,12 @@ function ProductShortCode<T extends { code: string }>(
         </Field>
         <Field>
           <FieldLabel>有效期（分钟）</FieldLabel>
-          <Input
-            type="number"
-            value={params.get("live") ?? "0"}
-            onChange={onLiveChange}
-          />
+          <Input type="number" value={live} onChange={onLiveChange} />
         </Field>
         {params.get("mode") === "time" && (
           <Field>
             <FieldLabel>过期时间（天）</FieldLabel>
-            <Input
-              type="number"
-              value={params.get("expire") ?? "0"}
-              onChange={onExpireChange}
-            />
+            <Input type="number" value={expire} onChange={onExpireChange} />
           </Field>
         )}
         {fieldState.error && <FieldError errors={[fieldState.error]} />}
@@ -125,20 +122,31 @@ function ProductLongCode<T extends { code: string }>(
   const { field, fieldState } = props
 
   const params = new URLSearchParams(field.value)
+  const mode = params.get("mode") || "quota"
+  const live = params.get("live") || "0"
+  const expire = params.get("expire") || "0"
+
   const setParams = (data: {
     mode?: string
     live?: string
     expire?: string
   }) => {
-    if (data.mode) params.set("mode", data.mode)
-    if (data.live) params.set("live", data.live)
-    if (data.expire) params.set("expire", data.expire)
-    field.onChange(params.toString())
+    const newParams = new URLSearchParams()
+    newParams.set("mode", data.mode || mode)
+    newParams.set("live", data.live || live)
+    newParams.set("expire", data.expire || expire)
+    console.log(newParams.toString())
+    field.onChange(newParams.toString())
   }
 
   const onModeChange = (value: string) => {
-    setParams({ mode: value })
+    if (value === "quota") {
+      setParams({ mode: value, expire: "0" })
+    } else {
+      setParams({ mode: value })
+    }
   }
+
   const onLiveChange = (e: ChangeEvent<HTMLInputElement>) => {
     let value = e.target.value || "0"
     if (value.length > 1 && value[0] === "0") {
@@ -147,6 +155,7 @@ function ProductLongCode<T extends { code: string }>(
     if (!/^([0-9]+)$/.test(value)) return
     setParams({ live: value })
   }
+
   const onExpireChange = (e: ChangeEvent<HTMLInputElement>) => {
     let value = e.target.value || "0"
     if (value.length > 1 && value[0] === "0") {
@@ -162,10 +171,7 @@ function ProductLongCode<T extends { code: string }>(
       <FieldGroup>
         <Field>
           <FieldLabel>套餐类型</FieldLabel>
-          <Select
-            defaultValue={params.get("mode") ?? "quota"}
-            onValueChange={onModeChange}
-          >
+          <Select defaultValue={mode} onValueChange={onModeChange}>
             <SelectTrigger>
               <SelectValue placeholder="请选择套餐类型" />
             </SelectTrigger>
@@ -177,20 +183,12 @@ function ProductLongCode<T extends { code: string }>(
         </Field>
         <Field>
           <FieldLabel>有效期（分钟）</FieldLabel>
-          <Input
-            type="number"
-            value={params.get("live") ?? "0"}
-            onChange={onLiveChange}
-          />
+          <Input type="number" value={live} onChange={onLiveChange} />
         </Field>
         {params.get("mode") === "time" && (
           <Field>
             <FieldLabel>过期时间（天）</FieldLabel>
-            <Input
-              type="number"
-              value={params.get("expire") ?? "0"}
-              onChange={onExpireChange}
-            />
+            <Input type="number" value={expire} onChange={onExpireChange} />
           </Field>
         )}
         {fieldState.error && <FieldError errors={[fieldState.error]} />}