mirror of https://github.com/ElemeFE/element
DatePicker: fixed range type can not focus (#9437)
parent
f0f75fb561
commit
bd47ee7d6e
|
@ -81,7 +81,6 @@ import Clickoutside from 'element-ui/src/utils/clickoutside';
|
||||||
import { formatDate, parseDate, isDateObject, getWeekNumber } from './util';
|
import { formatDate, parseDate, isDateObject, 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';
|
||||||
import Focus from 'element-ui/src/mixins/focus';
|
|
||||||
import ElInput from 'element-ui/packages/input';
|
import ElInput from 'element-ui/packages/input';
|
||||||
import merge from 'element-ui/src/utils/merge';
|
import merge from 'element-ui/src/utils/merge';
|
||||||
|
|
||||||
|
@ -294,7 +293,7 @@ const validator = function(val) {
|
||||||
};
|
};
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
mixins: [Emitter, NewPopper, Focus('reference')],
|
mixins: [Emitter, NewPopper],
|
||||||
|
|
||||||
inject: {
|
inject: {
|
||||||
elFormItem: {
|
elFormItem: {
|
||||||
|
@ -493,6 +492,14 @@ export default {
|
||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
|
focus() {
|
||||||
|
if (!this.ranged) {
|
||||||
|
this.$refs.reference.focus();
|
||||||
|
} else {
|
||||||
|
this.handleFocus();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
blur() {
|
blur() {
|
||||||
this.refInput.forEach(input => input.blur());
|
this.refInput.forEach(input => input.blur());
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue