mirror of
https://github.com/tenrok/vue2-datepicker.git
synced 2026-06-19 09:20:36 +03:00
fix: the clickoutside don't work sometimes (#326)
This commit is contained in:
@@ -1,33 +0,0 @@
|
||||
let mouseDownTarget
|
||||
|
||||
const handleMouseDown = evt => (mouseDownTarget = evt.target)
|
||||
|
||||
export default {
|
||||
bind (el, binding, vnode) {
|
||||
el['@clickoutside'] = e => {
|
||||
const mouseUpTarget = e.target
|
||||
const popupElm = vnode && vnode.context && vnode.context.popupElm
|
||||
if (
|
||||
mouseDownTarget &&
|
||||
mouseUpTarget &&
|
||||
!el.contains(mouseUpTarget) &&
|
||||
!el.contains(mouseDownTarget) &&
|
||||
!(
|
||||
popupElm &&
|
||||
(popupElm.contains(mouseDownTarget) ||
|
||||
popupElm.contains(mouseUpTarget))
|
||||
) &&
|
||||
binding.expression &&
|
||||
vnode.context[binding.expression]
|
||||
) {
|
||||
binding.value()
|
||||
}
|
||||
}
|
||||
document.addEventListener('mousedown', handleMouseDown)
|
||||
document.addEventListener('mouseup', el['@clickoutside'])
|
||||
},
|
||||
unbind (el) {
|
||||
document.removeEventListener('mousedown', handleMouseDown)
|
||||
document.removeEventListener('mouseup', el['@clickoutside'])
|
||||
}
|
||||
}
|
||||
+27
-5
@@ -8,7 +8,7 @@
|
||||
:style="{
|
||||
'width': computedWidth
|
||||
}"
|
||||
v-clickoutside="closePopup">
|
||||
>
|
||||
<div class="mx-input-wrapper"
|
||||
@click.stop="showPopup">
|
||||
<input
|
||||
@@ -115,7 +115,6 @@
|
||||
|
||||
<script>
|
||||
import fecha from 'fecha'
|
||||
import clickoutside from '@/directives/clickoutside'
|
||||
import { isValidDate, isValidRangeDate, isDateObejct, isPlainObject, formatDate, parseDate, throttle } from '@/utils/index'
|
||||
import { transformDate } from '@/utils/transform'
|
||||
import CalendarPanel from './calendar.vue'
|
||||
@@ -127,9 +126,6 @@ export default {
|
||||
name: 'DatePicker',
|
||||
components: { CalendarPanel },
|
||||
mixins: [locale],
|
||||
directives: {
|
||||
clickoutside
|
||||
},
|
||||
props: {
|
||||
value: null,
|
||||
valueType: {
|
||||
@@ -345,6 +341,30 @@ export default {
|
||||
this.popupElm = this.$refs.calendar
|
||||
document.body.appendChild(this.popupElm)
|
||||
}
|
||||
// clickoutside close popup
|
||||
let mousedownTarget
|
||||
this._bindDocmentMousedown = evt => {
|
||||
mousedownTarget = evt.target
|
||||
}
|
||||
this._bindDocumentMouseup = evt => {
|
||||
const mouseupTarget = evt.target
|
||||
const el = this.$el
|
||||
const { popupElm } = this
|
||||
if (
|
||||
!mousedownTarget ||
|
||||
!mouseupTarget ||
|
||||
el.contains(mousedownTarget) ||
|
||||
el.contains(mouseupTarget) ||
|
||||
(popupElm && (popupElm.contains(mousedownTarget) || popupElm.contains(mouseupTarget)))
|
||||
) {
|
||||
return
|
||||
}
|
||||
this.closePopup()
|
||||
mousedownTarget = null
|
||||
}
|
||||
document.addEventListener('mousedown', this._bindDocmentMousedown)
|
||||
document.addEventListener('mouseup', this._bindDocumentMouseup)
|
||||
|
||||
this._displayPopup = throttle(() => {
|
||||
if (this.popupVisible) {
|
||||
this.displayPopup()
|
||||
@@ -357,6 +377,8 @@ export default {
|
||||
if (this.popupElm && this.popupElm.parentNode === document.body) {
|
||||
document.body.removeChild(this.popupElm)
|
||||
}
|
||||
document.removeEventListener('mousedown', this._bindDocmentMousedown)
|
||||
document.removeEventListener('mouseup', this._bindDocumentMouseup)
|
||||
window.removeEventListener('resize', this._displayPopup)
|
||||
window.removeEventListener('scroll', this._displayPopup)
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user