Skip to content

Commit

Permalink
fix: fix invalid paging
Browse files Browse the repository at this point in the history
  • Loading branch information
kailong502431556 committed Mar 29, 2022
1 parent 0c7276f commit ad184ee
Showing 1 changed file with 9 additions and 11 deletions.
20 changes: 9 additions & 11 deletions src/hooks/web/useTable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Table, TableExpose } from '@/components/Table'
import { ElTable, ElMessageBox, ElMessage } from 'element-plus'
import { ref, reactive, watch, computed, unref, nextTick } from 'vue'
import { AxiosPromise } from 'axios'
import { get, assign } from 'lodash-es'
import { get } from 'lodash-es'
import type { TableProps } from '@/components/Table/src/types'
import { useI18n } from '@/hooks/web/useI18n'

Expand Down Expand Up @@ -50,15 +50,13 @@ export const useTable = <T, K, L extends AxiosConfig = AxiosConfig>(
})

const parmasObj = computed(() => {
return assign(
{
params: {
pageSize: tableObject.pageSize,
pageIndex: tableObject.currentPage
}
},
tableObject.parmasObj
)
return {
params: {
...tableObject.parmasObj.params,
pageSize: tableObject.pageSize,
pageIndex: tableObject.currentPage
}
}
})

watch(
Expand Down Expand Up @@ -125,7 +123,7 @@ export const useTable = <T, K, L extends AxiosConfig = AxiosConfig>(
getList: async () => {
tableObject.loading = true
const res = await config
?.getListApi(unref(parmasObj) as L)
?.getListApi(unref(parmasObj) as unknown as L)
.catch(() => {})
.finally(() => {
tableObject.loading = false
Expand Down

0 comments on commit ad184ee

Please sign in to comment.