mirror/element-plus
2
0
Fork 0
mirror of https://github.com/element-plus/element-plus.git synced 2025-02-05 11:21:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(pagination): fix current-page event error emit (#1575)

Browse Source
This commit is contained in:
Ryan2128 2021-03-09 20:45:08 +08:00 committed by GitHub
parent 543b2b08a0
commit a382e3f657
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
packages/pagination/src/index.ts
View File

@ -119,20 +119,21 @@ export default defineComponent({
const internalCurrentPage = ref(getValidCurrentPage(props.currentPage)) const internalCurrentPage = ref(getValidCurrentPage(props.currentPage))
function emitChange() { function emitChange() {
nextTick(() => { if (
if ( internalCurrentPage.value !== lastEmittedPage.value ||
internalCurrentPage.value !== lastEmittedPage.value || userChangePageSize.value
userChangePageSize.value ) {
) { lastEmittedPage.value = internalCurrentPage.value
lastEmittedPage.value = internalCurrentPage.value userChangePageSize.value = false
userChangePageSize.value = false emit('update:currentPage', internalCurrentPage.value)
} emit('current-change', internalCurrentPage.value)
}) }
} }
function handleCurrentChange(val: number) { function handleCurrentChange(val: number) {
internalCurrentPage.value = getValidCurrentPage(val) internalCurrentPage.value = getValidCurrentPage(val)
userChangePageSize.value = true userChangePageSize.value = true
emitChange()
} }
function handleSizesChange(val: number) { function handleSizesChange(val: number) {
@ -146,7 +147,7 @@ export default defineComponent({
if (props.disabled) return if (props.disabled) return
const newVal = internalCurrentPage.value - 1 const newVal = internalCurrentPage.value - 1
internalCurrentPage.value = getValidCurrentPage(newVal) internalCurrentPage.value = getValidCurrentPage(newVal)
emit('prev-click', internalCurrentPage) emit('prev-click', internalCurrentPage.value)
emitChange() emitChange()
} }
@ -184,19 +185,14 @@ export default defineComponent({
return resetValue === undefined ? value : resetValue return resetValue === undefined ? value : resetValue
} }
watch(() => getValidCurrentPage(props.currentPage), val => { watch(() => props.currentPage, val => {
internalCurrentPage.value = val internalCurrentPage.value = getValidCurrentPage(val)
}) })
watch(() => props.pageSize, val => { watch(() => props.pageSize, val => {
internalPageSize.value = getValidPageSize(val) internalPageSize.value = getValidPageSize(val)
}) })
watch(internalCurrentPage, val => {
emit('update:currentPage', val)
emit('current-change', val)
})
watch( watch(
() => internalPageCount.value, () => internalPageCount.value,
val => { val => {
@ -205,9 +201,8 @@ export default defineComponent({
internalCurrentPage.value = 1 internalCurrentPage.value = 1
} else if (oldPage > val) { } else if (oldPage > val) {
internalCurrentPage.value = val === 0 ? 1 : val internalCurrentPage.value = val === 0 ? 1 : val
userChangePageSize.value && emitChange() emitChange()
} }
userChangePageSize.value = false
}, },
) )