mirror/element-plus
2
0
Fork 0
mirror of https://github.com/element-plus/element-plus.git synced 2024-11-21 01:02:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(components): [calendar] improve range validation (#18125)

Browse Source 
* fix(components): [calendar] improve range validation

* fix: update
This commit is contained in:
btea 2024-09-03 20:31:28 +08:00 committed by GitHub
parent 29a21e86ba
commit 50e02f3ab9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/components/calendar/src/use-calendar.ts
View File

@ -1,7 +1,7 @@
import { computed, ref } from 'vue'
import dayjs from 'dayjs'
import { useLocale } from '@element-plus/hooks'
import { debugWarn } from '@element-plus/utils'
import { debugWarn, isArray, isDate } from '@element-plus/utils'
import { INPUT_EVENT, UPDATE_MODEL_EVENT } from '@element-plus/constants'
import type { ComputedRef, SetupContext } from 'vue'
@ -78,7 +78,13 @@ export const useCalendar = (
// if range is valid, we get a two-digit array
const validatedRange = computed(() => {
if (!props.range) return []
if (
!props.range ||
!isArray(props.range) ||
props.range.length !== 2 ||
props.range.some((item) => !isDate(item))
)
return []
const rangeArrDayjs = props.range.map((_) => dayjs(_).locale(lang.value))
const [startDayjs, endDayjs] = rangeArrDayjs
if (startDayjs.isAfter(endDayjs)) {