Browse Source
Merge pull request #287 from jerry-f/dev
fix: 解决单击非时间日期单元格后还会跳出日期时间弹框
master
mengshukeji
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
6 additions and
1 deletions
-
src/controllers/cellDatePickerCtrl.js
|
|
|
@ -75,7 +75,7 @@ const cellDatePickerCtrl = { |
|
|
|
time_24hr = false; |
|
|
|
} |
|
|
|
|
|
|
|
flatpickr('#luckysheet-input-box', { |
|
|
|
const fp = flatpickr('#luckysheet-input-box', { |
|
|
|
allowInput: false, |
|
|
|
noCalendar, |
|
|
|
enableSeconds, |
|
|
|
@ -83,6 +83,11 @@ const cellDatePickerCtrl = { |
|
|
|
dateFormat, |
|
|
|
time_24hr, |
|
|
|
defaultDate, |
|
|
|
onClose() { |
|
|
|
setTimeout(() => { |
|
|
|
fp.destroy() |
|
|
|
}, 0); |
|
|
|
}, |
|
|
|
parseDate: (datestr, format) => { |
|
|
|
return dayjs(datestr).toDate(); |
|
|
|
}, |
|
|
|
|