diff --git a/components/_util/use/useModel.ts b/components/_util/use/useModel.ts index a7aa80a3..a6817c38 100644 --- a/components/_util/use/useModel.ts +++ b/components/_util/use/useModel.ts @@ -8,6 +8,12 @@ type UseNormalModelOptions = { defaultValue?: any; }; +// TODO: 后续考虑如何并入 useNormalModel +export type UseNormalModelReturn< + Props extends Record, + Key extends keyof Props, +> = [WritableComputedRef, (value: Props[Key]) => void]; + export const useNormalModel = ( props: Record, emit: any, diff --git a/components/calendar/useCalendarData.ts b/components/calendar/useCalendarData.ts index 367a4e56..ecf5f8a1 100644 --- a/components/calendar/useCalendarData.ts +++ b/components/calendar/useCalendarData.ts @@ -1,10 +1,9 @@ import { computed, ref } from 'vue'; import { Day } from 'date-fns'; import { isNil } from 'lodash-es'; -import { useNormalModel } from '../_util/use/useModel'; +import { UseNormalModelReturn, useNormalModel } from '../_util/use/useModel'; import { CalendarEvent, CalendarInnerProps, CalendarShortcut } from './props'; import { - UseNormalModelReturn, convertCalendarDateToUnixTime, convertUnixTimeToCalendarDate, generateCalendarDates, diff --git a/components/calendar/utils.ts b/components/calendar/utils.ts index f6ae48e7..fb3cb7d5 100644 --- a/components/calendar/utils.ts +++ b/components/calendar/utils.ts @@ -1,17 +1,10 @@ import { Day, addMonths, getDaysInMonth, set, subDays } from 'date-fns'; import { isNil } from 'lodash-es'; -import { WritableComputedRef } from 'vue'; import { prefixCls } from './const'; import { CalendarDate, UnixTime } from './types'; export const cls = (className: string) => `${prefixCls}-${className}`; -// TODO: 后续考虑如何并入 useNormalModel -export type UseNormalModelReturn< - Props extends Record, - Key extends keyof Props, -> = [WritableComputedRef, (value: Props[Key]) => void]; - /** * 根据一个 Date,计算其所在月份日历 * diff --git a/components/collapse/collapse.vue b/components/collapse/collapse.vue index e4322d28..66a16ffa 100644 --- a/components/collapse/collapse.vue +++ b/components/collapse/collapse.vue @@ -5,37 +5,83 @@ diff --git a/docs/.vitepress/components/collapse/arrowleft.vue b/docs/.vitepress/components/collapse/arrowleft.vue index 9c55df25..1263bb92 100644 --- a/docs/.vitepress/components/collapse/arrowleft.vue +++ b/docs/.vitepress/components/collapse/arrowleft.vue @@ -1,6 +1,6 @@