新增余额明细页面,修复页面useId不更新的问题
This commit is contained in:
@@ -60,7 +60,6 @@ const filterSchema = z
|
||||
type FormValues = z.infer<typeof filterSchema>
|
||||
|
||||
interface FilterParams {
|
||||
user_id: number
|
||||
user_phone?: string
|
||||
resource_no?: string
|
||||
active?: boolean
|
||||
@@ -205,9 +204,7 @@ interface ResourceListProps {
|
||||
function ResourceList({ resourceType }: ResourceListProps) {
|
||||
const searchParams = useSearchParams()
|
||||
const userId = searchParams.get("userId")
|
||||
const [filters, setFilters] = useState<FilterParams>({
|
||||
user_id: Number(userId),
|
||||
})
|
||||
const [filters, setFilters] = useState<FilterParams>({})
|
||||
const isLong = resourceType === "long"
|
||||
const listFn = isLong ? ResourceLong : ResourceShort
|
||||
const [updatingId, setUpdatingId] = useState<number | null>(null)
|
||||
@@ -226,9 +223,9 @@ function ResourceList({ resourceType }: ResourceListProps) {
|
||||
|
||||
const fetchResources = useCallback(
|
||||
(page: number, size: number) => {
|
||||
return listFn({ page, size, ...filters })
|
||||
return listFn({ page, size, user_id: Number(userId), ...filters })
|
||||
},
|
||||
[listFn, filters],
|
||||
[listFn, filters, userId],
|
||||
)
|
||||
|
||||
const table = useDataTable<Resources>(fetchResources)
|
||||
@@ -263,9 +260,7 @@ function ResourceList({ resourceType }: ResourceListProps) {
|
||||
)
|
||||
|
||||
const onFilter = handleSubmit(data => {
|
||||
const result: FilterParams = {
|
||||
user_id: Number(userId),
|
||||
}
|
||||
const result: FilterParams = {}
|
||||
if (data.user_phone?.trim()) result.user_phone = data.user_phone.trim()
|
||||
if (data.resource_no?.trim()) result.resource_no = data.resource_no.trim()
|
||||
if (data.status && data.status !== "all") {
|
||||
@@ -555,7 +550,7 @@ function ResourceList({ resourceType }: ResourceListProps) {
|
||||
variant="outline"
|
||||
onClick={() => {
|
||||
reset()
|
||||
setFilters({ user_id: Number(userId) })
|
||||
setFilters({})
|
||||
table.pagination.onPageChange(1)
|
||||
}}
|
||||
>
|
||||
|
||||
Reference in New Issue
Block a user