Merge pull request #61 from xiterjia/develop

fix: multiple requests when pageSize change and currentPage isn't 1
This commit is contained in:
Archer 2022-05-18 09:11:24 +08:00 committed by GitHub
commit 51ea1b924b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions

View File

@ -53,7 +53,8 @@ export default defineComponent({
//
onMounted(() => {
emit('register', unref(elTableRef)?.$parent, unref(elTableRef))
const tableRef = unref(elTableRef)
emit('register', tableRef?.$parent, elTableRef)
})
const pageSizeRef = ref(props.pageSize)
@ -167,9 +168,9 @@ export default defineComponent({
}
const renderTableExpand = () => {
const { align, headerAlign } = unref(getProps)
const { align, headerAlign, expand } = unref(getProps)
//
return unref(getProps).expand ? (
return expand ? (
<ElTableColumn type="expand" align={align} headerAlign={headerAlign}>
{{
// @ts-ignore

View File

@ -69,8 +69,13 @@ export const useTable = <T, K, L extends AxiosConfig = AxiosConfig>(
watch(
() => tableObject.pageSize,
() => {
tableObject.currentPage = 1
methods.getList()
// 当前页不为1时修改页数后会导致多次调用getList方法
if (tableObject.currentPage === 1) {
methods.getList()
} else {
tableObject.currentPage = 1
methods.getList()
}
}
)