From 24a9e013c61a11af4e5b7722090b4311a044e43c Mon Sep 17 00:00:00 2001 From: rhyme Date: Fri, 25 Dec 2020 16:39:41 +0800 Subject: [PATCH] sync date-picker from v4.4.0 --- src/components/date-picker/base/mixin.js | 4 +++- src/components/date-picker/base/month-table.vue | 2 +- src/components/date-picker/base/year-table.vue | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/date-picker/base/mixin.js b/src/components/date-picker/base/mixin.js index d2dd60c4..329042c6 100644 --- a/src/components/date-picker/base/mixin.js +++ b/src/components/date-picker/base/mixin.js @@ -40,7 +40,9 @@ export default { }, }, methods: { - handleClick (cell) { + handleClick (cell, e) { + e.stopPropagation(); + if (cell.disabled || cell.type === 'weekLabel') return; const newDate = new Date(clearHours(cell.date)); diff --git a/src/components/date-picker/base/month-table.vue b/src/components/date-picker/base/month-table.vue index 5c5ef6e5..57001141 100644 --- a/src/components/date-picker/base/month-table.vue +++ b/src/components/date-picker/base/month-table.vue @@ -3,7 +3,7 @@ diff --git a/src/components/date-picker/base/year-table.vue b/src/components/date-picker/base/year-table.vue index abad1573..b1f9621c 100644 --- a/src/components/date-picker/base/year-table.vue +++ b/src/components/date-picker/base/year-table.vue @@ -3,7 +3,7 @@ {{ cell.date.getFullYear() }}