Skip to content

Commit

Permalink
fix: fix parmas to params
Browse files Browse the repository at this point in the history
  • Loading branch information
snowords committed Mar 30, 2022
1 parent 9f9cf0b commit 2c7211c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
16 changes: 8 additions & 8 deletions src/hooks/web/useTable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ interface TableObject<K, L> {
currentPage: number
total: number
tableList: K[]
parmasObj: L
paramsObj: L
loading: boolean
currentRow: Nullable<K>
}
Expand All @@ -42,17 +42,17 @@ export const useTable = <T, K, L extends AxiosConfig = AxiosConfig>(
// 表格数据
tableList: [],
// AxiosConfig 配置
parmasObj: {} as L,
paramsObj: {} as L,
// 加载中
loading: true,
// 当前行的数据
currentRow: null
})

const parmasObj = computed(() => {
const paramsObj = computed(() => {
return {
params: {
...tableObject.parmasObj.params,
...tableObject.paramsObj.params,
pageSize: tableObject.pageSize,
pageIndex: tableObject.currentPage
}
Expand Down Expand Up @@ -116,14 +116,14 @@ export const useTable = <T, K, L extends AxiosConfig = AxiosConfig>(
setProps: (props: Recordable) => void
getList: () => Promise<void>
setColumn: (columnProps: TableSetPropsType[]) => void
setSearchParmas: (data: Recordable) => void
setSearchParams: (data: Recordable) => void
getSelections: () => Promise<K[]>
delList: (ids: string[] | number[], multiple: boolean, message?: boolean) => Promise<void>
} = {
getList: async () => {
tableObject.loading = true
const res = await config
?.getListApi(unref(parmasObj) as unknown as L)
?.getListApi(unref(paramsObj) as unknown as L)
.catch(() => {})
.finally(() => {
tableObject.loading = false
Expand All @@ -146,9 +146,9 @@ export const useTable = <T, K, L extends AxiosConfig = AxiosConfig>(
return (table?.selections || []) as K[]
},
// 与Search组件结合
setSearchParmas: (data: Recordable) => {
setSearchParams: (data: Recordable) => {
tableObject.currentPage = 1
tableObject.parmasObj = Object.assign(tableObject.parmasObj, {
tableObject.paramsObj = Object.assign(tableObject.paramsObj, {
params: {
pageSize: tableObject.pageSize,
pageIndex: tableObject.currentPage,
Expand Down
4 changes: 2 additions & 2 deletions src/views/Example/Dialog/ExampleDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const { register, tableObject, methods } = useTable<
}
})
const { getList, setSearchParmas } = methods
const { getList, setSearchParams } = methods
getList()
Expand Down Expand Up @@ -152,7 +152,7 @@ const save = async () => {

<template>
<ContentWrap>
<Search :schema="searchData" @search="setSearchParmas" @reset="setSearchParmas" />
<Search :schema="searchData" @search="setSearchParams" @reset="setSearchParams" />

<div class="mb-10px">
<ElButton type="primary" @click="AddAction">{{ t('exampleDemo.add') }}</ElButton>
Expand Down
4 changes: 2 additions & 2 deletions src/views/Example/Page/ExamplePage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const { register, tableObject, methods } = useTable<
}
})
const { getList, setSearchParmas } = methods
const { getList, setSearchParams } = methods
getList()
Expand Down Expand Up @@ -130,7 +130,7 @@ const action = (row: TableData, type: string) => {

<template>
<ContentWrap>
<Search :schema="searchData" @search="setSearchParmas" @reset="setSearchParmas" />
<Search :schema="searchData" @search="setSearchParams" @reset="setSearchParams" />

<div class="mb-10px">
<ElButton type="primary" @click="AddAction">{{ t('exampleDemo.add') }}</ElButton>
Expand Down

0 comments on commit 2c7211c

Please sign in to comment.