mirrors/element
1
0
Fork 0
mirror of https://github.com/ElemeFE/element.git synced 2025-12-16 11:44:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into carbon

Browse Source 
# Conflicts:
#	packages/date-picker/src/panel/time.vue
This commit is contained in:
Leopoldthecoder
2017-09-14 19:33:49 +08:00
parent e8516d633a 36d4f0a6fc
commit 43ecb8818c
31 changed files with 340 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/pagination/src/pagination.js
View File

@@ -192,16 +192,25 @@ export default {
handleFocus(event) {
this.oldValue = event.target.value;
},
handleBlur({ target }) {
this.reassignMaxValue(target);
},
handleKeyUp(event) {
const key = event.key || '';
const keyCode = event.keyCode || '';
if ((key && key === 'Enter') || (keyCode && keyCode === 13)) {
this.reassignMaxValue(event.target);
this.handleChange({ target: event.target });
}
},
handleChange({ target }) {
this.$parent.internalCurrentPage = this.$parent.getValidCurrentPage(target.value);
this.oldValue = null;
},
reassignMaxValue(target) {
if (+target.value > this.$parent.internalPageCount) {
target.value = this.$parent.internalPageCount;
}
}
},
@@ -213,11 +222,12 @@ export default {
class="el-pagination__editor"
type="number"
min={ 1 }
max={ this.internalPageCount }
max={ this.$parent.internalPageCount }
value={ this.$parent.internalCurrentPage }
domProps-value={ this.$parent.internalCurrentPage }
on-change={ this.handleChange }
on-focus={ this.handleFocus }
on-blur={ this.handleBlur }
on-keyup={ this.handleKeyUp }
number/>
{ this.t('el.pagination.pageClassifier') }