|
@@ -375,27 +375,30 @@ export default {
|
|
|
pageSize: {
|
|
|
immediate: true,
|
|
|
handler(val) {
|
|
|
- this.internalPageSize = val;
|
|
|
+ this.internalPageSize = isNaN(val) ? 10 : val;
|
|
|
}
|
|
|
},
|
|
|
|
|
|
- internalCurrentPage(newVal, oldVal) {
|
|
|
- newVal = parseInt(newVal, 10);
|
|
|
-
|
|
|
- /* istanbul ignore if */
|
|
|
- if (isNaN(newVal)) {
|
|
|
- newVal = oldVal || 1;
|
|
|
- } else {
|
|
|
- newVal = this.getValidCurrentPage(newVal);
|
|
|
- }
|
|
|
+ internalCurrentPage: {
|
|
|
+ immediate: true,
|
|
|
+ handler(newVal, oldVal) {
|
|
|
+ newVal = parseInt(newVal, 10);
|
|
|
+
|
|
|
+ /* istanbul ignore if */
|
|
|
+ if (isNaN(newVal)) {
|
|
|
+ newVal = oldVal || 1;
|
|
|
+ } else {
|
|
|
+ newVal = this.getValidCurrentPage(newVal);
|
|
|
+ }
|
|
|
|
|
|
- if (newVal !== undefined) {
|
|
|
- this.internalCurrentPage = newVal;
|
|
|
- if (oldVal !== newVal) {
|
|
|
+ if (newVal !== undefined) {
|
|
|
+ this.internalCurrentPage = newVal;
|
|
|
+ if (oldVal !== newVal) {
|
|
|
+ this.$emit('update:currentPage', newVal);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
this.$emit('update:currentPage', newVal);
|
|
|
}
|
|
|
- } else {
|
|
|
- this.$emit('update:currentPage', newVal);
|
|
|
}
|
|
|
},
|
|
|
|