github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

DatePicker: fix tab key

pull/391/head
qingwei.li 2016-10-13 16:11:06 +08:00
parent 2f41d86d2e
commit 8a8c28fc4f
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/date-picker/src/picker.vue
View File

@ -32,7 +32,7 @@
<script> <script>
import Vue from 'vue'; import Vue from 'vue';
import Clickoutside from 'element-ui/src/utils/clickoutside'; import Clickoutside from 'element-ui/src/utils/clickoutside';
import { merge, formatDate, parseDate, getWeekNumber } from './util'; import { formatDate, parseDate, getWeekNumber } from './util';
import Popper from 'element-ui/src/utils/vue-popper'; import Popper from 'element-ui/src/utils/vue-popper';
import emitter from 'element-ui/src/mixins/emitter'; import emitter from 'element-ui/src/mixins/emitter';
@ -312,7 +312,6 @@ export default {
}, },
handleBlur() { handleBlur() {
this.pickerVisible = false;
this.$emit('blur', this); this.$emit('blur', this);
this.dispatch('form-item', 'el.form.blur'); this.dispatch('form-item', 'el.form.blur');
}, },
@ -323,7 +322,10 @@ export default {
let selectionEnd = event.target.selectionEnd; let selectionEnd = event.target.selectionEnd;
let length = event.target.value.length; let length = event.target.value.length;
if (keyCode === 27) { // tab
if (keyCode === 9) {
this.pickerVisible = false;
} else if (keyCode === 27) {
this.pickerVisible = this.picker.visible = false; this.pickerVisible = this.picker.visible = false;
// left // left
} else if (keyCode === 37) { } else if (keyCode === 37) {
@ -414,9 +416,7 @@ export default {
showPicker() { showPicker() {
if (!this.picker) { if (!this.picker) {
this.panel.defaultValue = this.value; this.panel.defaultValue = this.value;
this.picker = new Vue(merge({ this.picker = new Vue(this.panel).$mount(document.createElement('div'));
el: document.createElement('div')
}, this.panel));
this.popperElm = this.picker.$el; this.popperElm = this.picker.$el;
this.picker.width = this.$refs.reference.getBoundingClientRect().width; this.picker.width = this.$refs.reference.getBoundingClientRect().width;
this.picker.showTime = this.type === 'datetime' || this.type === 'datetimerange'; this.picker.showTime = this.type === 'datetime' || this.type === 'datetimerange';

16
packages/date-picker/src/util/index.js
View File

@ -8,22 +8,6 @@ const newArray = function(start, end) {
return result; return result;
}; };
export const merge = function(target) {
for (var i = 1, j = arguments.length; i < j; i++) {
var source = arguments[i];
for (var prop in source) {
if (source.hasOwnProperty(prop)) {
var value = source[prop];
if (value !== undefined) {
target[prop] = value;
}
}
}
}
return target;
};
export const toDate = function(date) { export const toDate = function(date) {
date = new Date(date); date = new Date(date);
if (isNaN(date.getTime())) return null; if (isNaN(date.getTime())) return null;