diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue index 23bf687..e93f67f 100644 --- a/src/components/Table/src/Table.vue +++ b/src/components/Table/src/Table.vue @@ -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 ? ( {{ // @ts-ignore diff --git a/src/hooks/web/useTable.ts b/src/hooks/web/useTable.ts index fc1c5c1..7270dd8 100644 --- a/src/hooks/web/useTable.ts +++ b/src/hooks/web/useTable.ts @@ -69,8 +69,13 @@ export const useTable = ( watch( () => tableObject.pageSize, () => { - tableObject.currentPage = 1 - methods.getList() + // 当前页不为1时,修改页数后会导致多次调用getList方法 + if (tableObject.currentPage === 1) { + methods.getList() + } else { + tableObject.currentPage = 1 + methods.getList() + } } )