diff --git a/src/pages/events/banner/model/useBannerModel.ts b/src/pages/events/banner/model/useBannerModel.ts index 3954215..bc3c47f 100644 --- a/src/pages/events/banner/model/useBannerModel.ts +++ b/src/pages/events/banner/model/useBannerModel.ts @@ -139,7 +139,7 @@ export function useBannerModel() { filterForm.title = ''; filterForm.status = ''; pagination.reset(); - setTimeout(fetchList, 350); + await fetchList(); }, 500); const handlePageChange = (page: number, pageSize: number) => { diff --git a/src/pages/events/list/model/useEventListModel.ts b/src/pages/events/list/model/useEventListModel.ts index 1e0ceb6..3c07833 100644 --- a/src/pages/events/list/model/useEventListModel.ts +++ b/src/pages/events/list/model/useEventListModel.ts @@ -99,10 +99,10 @@ export function useEventListModel() { const handleSearch = () => fetchList(); - const handleReset = () => { + const handleReset = async () => { Object.assign(filterForm, FILTER_DEFAULTS); pagination.reset(); - setTimeout(fetchList, 350); + await fetchList(); }; const handlePageChange = (page: number, pageSize: number) => { diff --git a/src/pages/events/logs/model/useLogModel.ts b/src/pages/events/logs/model/useLogModel.ts index 8cc73a5..b71f0c2 100644 --- a/src/pages/events/logs/model/useLogModel.ts +++ b/src/pages/events/logs/model/useLogModel.ts @@ -119,7 +119,7 @@ export function useLogModel() { const handleSearch = () => fetchList(); - const handleReset = () => { + const handleReset = async () => { filterForm.dateRange = null; filterForm.type = ''; filterForm.source = ''; @@ -127,7 +127,7 @@ export function useLogModel() { filterForm.sourcePhone = ''; filterForm.tournamentName = ''; pagination.reset(); - setTimeout(() => fetchList(), 0); + await fetchList(); }; const handlePageChange = (page: number, pageSize: number) => { diff --git a/src/pages/events/orders/model/useOrderModel.ts b/src/pages/events/orders/model/useOrderModel.ts index 99c3ecc..0f78f08 100644 --- a/src/pages/events/orders/model/useOrderModel.ts +++ b/src/pages/events/orders/model/useOrderModel.ts @@ -213,10 +213,10 @@ export function useOrderModel() { const handleSearch = () => fetchList(); - const handleReset = () => { + const handleReset = async () => { Object.assign(filterForm, FILTER_DEFAULTS); pagination.reset(); - setTimeout(fetchList, 350); + await fetchList(); }; const handlePageChange = (page: number, pageSize: number) => { diff --git a/src/pages/events/users/model/useUserModel.ts b/src/pages/events/users/model/useUserModel.ts index f14fd45..883a746 100644 --- a/src/pages/events/users/model/useUserModel.ts +++ b/src/pages/events/users/model/useUserModel.ts @@ -107,12 +107,12 @@ export function useUserModel() { // ===== 事件处理 ===== const handleSearch = () => fetchList(); - const handleReset = () => { + const handleReset = async () => { filterForm.text = ''; filterForm.roleId = ''; filterForm.status = ''; pagination.reset(); - setTimeout(() => fetchList(), 0); + await fetchList(); }; const handlePageChange = (page: number, pageSize: number) => { diff --git a/src/pages/finance/payments/model/usePaymentsModel.ts b/src/pages/finance/payments/model/usePaymentsModel.ts index a84e3c9..7e47d99 100644 --- a/src/pages/finance/payments/model/usePaymentsModel.ts +++ b/src/pages/finance/payments/model/usePaymentsModel.ts @@ -122,13 +122,13 @@ export function usePaymentsModel() { const handleSearch = () => fetchList(); - const handleReset = useThrottleFn(() => { + const handleReset = useThrottleFn(async () => { filterForm.timeRange = null; filterForm.nickname = ''; filterForm.phone = ''; filterForm.type = ''; pagination.reset(); - setTimeout(fetchList, 350); + await fetchList(); }, 500); const handlePageChange = (page: number, pageSize: number) => { diff --git a/src/pages/finance/wallet/model/useWalletModel.ts b/src/pages/finance/wallet/model/useWalletModel.ts index 9a63da1..a309560 100644 --- a/src/pages/finance/wallet/model/useWalletModel.ts +++ b/src/pages/finance/wallet/model/useWalletModel.ts @@ -161,13 +161,13 @@ export function useWalletModel() { const handleSearch = () => fetchList(); - const handleReset = useThrottleFn(() => { + const handleReset = useThrottleFn(async () => { filterForm.nickname = ''; filterForm.phone = ''; filterForm.minBalance = ''; filterForm.maxBalance = ''; pagination.reset(); - setTimeout(fetchList, 350); + await fetchList(); }, 500); const handlePageChange = (page: number, pageSize: number) => { diff --git a/src/pages/finance/withdraw/model/useWithdrawModel.ts b/src/pages/finance/withdraw/model/useWithdrawModel.ts index 7239a2f..badb5c1 100644 --- a/src/pages/finance/withdraw/model/useWithdrawModel.ts +++ b/src/pages/finance/withdraw/model/useWithdrawModel.ts @@ -182,14 +182,14 @@ export function useWithdrawModel() { const handleSearch = () => fetchList(); /** 重置(重置后自动查询) */ - const handleReset = useThrottleFn(() => { + const handleReset = useThrottleFn(async () => { filterForm.nickname = ''; filterForm.phone = ''; filterForm.realName = ''; filterForm.auditStatus = ''; filterForm.payStatus = ''; pagination.reset(); - setTimeout(fetchList, 350); + await fetchList(); }, 500); const handlePageChange = (page: number, pageSize: number) => { diff --git a/src/pages/system/logs/model/useLogModel.ts b/src/pages/system/logs/model/useLogModel.ts index 48c64f4..a8df446 100644 --- a/src/pages/system/logs/model/useLogModel.ts +++ b/src/pages/system/logs/model/useLogModel.ts @@ -126,12 +126,12 @@ export function useLogModel() { const handleSearch = () => fetchList(); /** 重置(重置后自动查询) */ - const handleReset = useThrottleFn(() => { + const handleReset = useThrottleFn(async () => { filterForm.actionTimeRange = null; filterForm.actionType = ''; filterForm.searchOperator = ''; pagination.reset(); - setTimeout(fetchList, 350); + await fetchList(); }, 500); const handlePageChange = (page: number, pageSize: number) => { diff --git a/src/pages/system/roles/model/useRoleModel.ts b/src/pages/system/roles/model/useRoleModel.ts index 015db08..706cbf3 100644 --- a/src/pages/system/roles/model/useRoleModel.ts +++ b/src/pages/system/roles/model/useRoleModel.ts @@ -97,10 +97,10 @@ export function useRoleModel() { const handleSearch = () => fetchList(); /** 重置(重置后自动查询) */ - const handleReset = useThrottleFn(() => { + const handleReset = useThrottleFn(async () => { filterForm.name = ''; pagination.reset(); - setTimeout(fetchList, 350); + await fetchList(); }, 500); const handlePageChange = (page: number, pageSize: number) => { diff --git a/src/pages/system/users/model/useUserModel.ts b/src/pages/system/users/model/useUserModel.ts index 1e7bf6e..558abe9 100644 --- a/src/pages/system/users/model/useUserModel.ts +++ b/src/pages/system/users/model/useUserModel.ts @@ -137,13 +137,12 @@ export function useUserModel() { const handleSearch = () => fetchList(); /** 重置(节流 500ms,重置后自动查询) */ - const handleReset = useThrottleFn(() => { + const handleReset = useThrottleFn(async () => { filterForm.text = ''; filterForm.roleId = ''; filterForm.status = ''; pagination.reset(); - // 等待 debounce(300ms) 生效后自动查询 - setTimeout(fetchList, 350); + await fetchList(); }, 500); /** 分页变更 */