naive-ui 2.21.5 → 2.23.2

package/es/date-picker/src/panel/use-calendar.js

@@ -1,16 +1,16 @@
 import { ref, computed, inject, watch } from 'vue';
-import { addMonths, addYears, isSameMonth, getTime, format, set, getYear, getMonth, getDate, isValid, startOfDay, startOfSecond, startOfMonth, startOfYear } from 'date-fns';
-import { dateArray, monthArray, strictParse, yearArray } from '../utils';
-import { usePanelCommon } from './use-panel-common';
+import { addMonths, addYears, isSameMonth, getTime, format, set, getYear, getMonth, getDate, isValid, startOfDay, startOfSecond, startOfMonth, startOfYear, startOfQuarter, setQuarter, setYear } from 'date-fns';
+import { getDefaultTime, dateArray, monthArray, strictParse, yearArray, quarterArray } from '../utils';
 import { datePickerInjectionKey } from '../interface';
-const useCalendarProps = Object.assign(Object.assign({}, usePanelCommon.props), { actions: {
+import { usePanelCommon, usePanelCommonProps } from './use-panel-common';
+const useCalendarProps = Object.assign(Object.assign({}, usePanelCommonProps), { actions: {
         type: Array,
         default: () => ['now', 'clear', 'confirm']
     } });
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 function useCalendar(props, type) {
     const panelCommon = usePanelCommon(props);
-    const { isValueInvalidRef, isDateDisabledRef, isDateInvalidRef, isTimeInvalidRef, isDateTimeInvalidRef, isHourDisabledRef, isMinuteDisabledRef, isSecondDisabledRef, localeRef, firstDayOfWeekRef, datePickerSlots, scrollYearMonth
+    const { isValueInvalidRef, isDateDisabledRef, isDateInvalidRef, isTimeInvalidRef, isDateTimeInvalidRef, isHourDisabledRef, isMinuteDisabledRef, isSecondDisabledRef, localeRef, firstDayOfWeekRef, datePickerSlots, scrollPickerColumns
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
      } = inject(datePickerInjectionKey);
     const validation = {
@@ -23,9 +23,10 @@ function useCalendar(props, type) {
         isMinuteDisabled: isMinuteDisabledRef,
         isSecondDisabled: isSecondDisabledRef
     };
+    const mergedDateFormatRef = computed(() => props.dateFormat || localeRef.value.dateFormat);
     const dateInputValueRef = ref(props.value === null || Array.isArray(props.value)
         ? ''
-        : format(props.value, props.dateFormat));
+        : format(props.value, mergedDateFormatRef.value));
     const calendarValueRef = ref(props.value === null || Array.isArray(props.value)
         ? Date.now()
         : props.value);
@@ -43,6 +44,9 @@ function useCalendar(props, type) {
     const yearArrayRef = computed(() => {
         return yearArray(calendarValueRef.value, props.value, nowRef.value);
     });
+    const querterArrayRef = computed(() => {
+        return quarterArray(calendarValueRef.value, props.value, nowRef.value);
+    });
     const weekdaysRef = computed(() => {
         return dateArrayRef.value.slice(0, 7).map((dateItem) => {
             const { ts } = dateItem;
@@ -62,7 +66,7 @@ function useCalendar(props, type) {
     });
     watch(computed(() => props.value), (value) => {
         if (value !== null && !Array.isArray(value)) {
-            dateInputValueRef.value = format(value, props.dateFormat, panelCommon.dateFnsOptions.value);
+            dateInputValueRef.value = format(value, mergedDateFormatRef.value, panelCommon.dateFnsOptions.value);
             calendarValueRef.value = value;
         }
         else {
@@ -76,6 +80,8 @@ function useCalendar(props, type) {
             return getTime(startOfMonth(value));
         if (type === 'year')
             return getTime(startOfYear(value));
+        if (type === 'quarter')
+            return getTime(startOfQuarter(value));
         return getTime(startOfDay(value));
     }
     function mergedIsDateDisabled(ts) {
@@ -85,7 +91,7 @@ function useCalendar(props, type) {
         return isDateDisabled(ts);
     }
     function handleDateInput(value) {
-        const date = strictParse(value, props.dateFormat, new Date(), panelCommon.dateFnsOptions.value);
+        const date = strictParse(value, mergedDateFormatRef.value, new Date(), panelCommon.dateFnsOptions.value);
         if (isValid(date)) {
             if (props.value === null) {
                 panelCommon.doUpdateValue(getTime(sanitizeValue(Date.now())), false);
@@ -104,7 +110,7 @@ function useCalendar(props, type) {
         }
     }
     function handleDateInputBlur() {
-        const date = strictParse(dateInputValueRef.value, props.dateFormat, new Date(), panelCommon.dateFnsOptions.value);
+        const date = strictParse(dateInputValueRef.value, mergedDateFormatRef.value, new Date(), panelCommon.dateFnsOptions.value);
         if (isValid(date)) {
             if (props.value === null) {
                 panelCommon.doUpdateValue(getTime(sanitizeValue(Date.now())), false);
@@ -143,17 +149,30 @@ function useCalendar(props, type) {
         else {
             newValue = Date.now();
         }
-        newValue = getTime(set(newValue, dateItem.dateObject));
-        panelCommon.doUpdateValue(sanitizeValue(newValue), type === 'date' || type === 'year');
-        if (type === 'date') {
-            panelCommon.doClose();
-        }
-        else if (type === 'month') {
-            panelCommon.disableTransitionOneTick();
-            scrollYearMonth(newValue);
+        if (type === 'datetime' &&
+            props.defaultTime !== null &&
+            !Array.isArray(props.defaultTime)) {
+            const time = getDefaultTime(props.defaultTime);
+            if (time) {
+                newValue = getTime(set(newValue, time)); // setDate getTime(addMilliseconds(startOfDay(newValue), time))
+            }
         }
-        else if (type === 'year') {
-            panelCommon.doClose();
+        newValue = getTime(dateItem.type === 'quarter' && dateItem.dateObject.quarter
+            ? setQuarter(setYear(newValue, dateItem.dateObject.year), dateItem.dateObject.quarter)
+            : set(newValue, dateItem.dateObject));
+        panelCommon.doUpdateValue(sanitizeValue(newValue), type === 'date' || type === 'year');
+        switch (type) {
+            case 'date':
+            case 'year':
+                panelCommon.doClose();
+                break;
+            case 'month':
+                panelCommon.disableTransitionOneTick();
+                scrollPickerColumns(newValue);
+                break;
+            case 'quarter':
+                scrollPickerColumns(newValue);
+                break;
         }
     }
     function deriveDateInputValue(time) {
@@ -166,7 +185,7 @@ function useCalendar(props, type) {
         if (time === undefined) {
             time = props.value;
         }
-        dateInputValueRef.value = format(time, props.dateFormat, panelCommon.dateFnsOptions.value);
+        dateInputValueRef.value = format(time, mergedDateFormatRef.value, panelCommon.dateFnsOptions.value);
     }
     function handleConfirmClick() {
         if (validation.isDateInvalid.value || validation.isTimeInvalid.value) {
@@ -227,7 +246,7 @@ function useCalendar(props, type) {
         panelCommon.clearPendingValue();
         handleConfirmClick();
     }
-    return Object.assign(Object.assign(Object.assign({ dateArray: dateArrayRef, monthArray: monthArrayRef, yearArray: yearArrayRef, calendarYear: calendarYearRef, calendarMonth: calendarMonthRef, weekdays: weekdaysRef, mergedIsDateDisabled,
+    return Object.assign(Object.assign(Object.assign({ dateArray: dateArrayRef, monthArray: monthArrayRef, yearArray: yearArrayRef, quarterArray: querterArrayRef, calendarYear: calendarYearRef, calendarMonth: calendarMonthRef, weekdays: weekdaysRef, mergedIsDateDisabled,
         nextYear,
         prevYear,
         nextMonth,
@@ -249,5 +268,4 @@ function useCalendar(props, type) {
         yearScrollRef,
         scrollbarInstRef });
 }
-useCalendar.props = useCalendarProps;
-export { useCalendar };
+export { useCalendar, useCalendarProps };

package/es/date-picker/src/panel/use-dual-calendar.d.ts

@@ -1,25 +1,23 @@
 import { ExtractPropTypes } from 'vue';
 import { DateItem } from '../utils';
-import { Shortcuts } from '../interface';
+import type { Shortcuts } from '../interface';
 declare const useDualCalendarProps: {
     readonly actions: {
         readonly type: ArrayConstructor;
         readonly default: () => string[];
     };
     readonly active: BooleanConstructor;
-    readonly dateFormat: {
-        readonly type: StringConstructor;
-        readonly default: "yyyy-MM-dd";
-    };
+    readonly dateFormat: StringConstructor;
     readonly timeFormat: {
         readonly type: StringConstructor;
-        readonly default: "HH:mm:ss";
+        readonly value: "HH:mm:ss";
     };
     readonly value: {
         readonly type: import("vue").PropType<import("../interface").Value | null>;
         readonly default: null;
     };
     readonly shortcuts: import("vue").PropType<Shortcuts>;
+    readonly defaultTime: import("vue").PropType<import("../interface").DefaultTime>;
     readonly onConfirm: FunctionConstructor;
     readonly onClose: import("vue").PropType<import("../interface").OnClose>;
     readonly onTabOut: FunctionConstructor;
@@ -210,12 +208,14 @@ declare function useDualCalendar(props: ExtractPropTypes<typeof useDualCalendarP
             calendarLeftPaddingDatetimerange: string;
             calendarLeftPaddingMonth: string;
             calendarLeftPaddingYear: string;
+            calendarLeftPaddingQuarter: string;
             calendarRightPaddingDate: string;
             calendarRightPaddingDatetime: string;
             calendarRightPaddingDaterange: string;
             calendarRightPaddingDatetimerange: string;
             calendarRightPaddingMonth: string;
             calendarRightPaddingYear: string;
+            calendarRightPaddingQuarter: string;
         };
         peers: {
             Input: import("../../../_mixins").Theme<"Input", {
@@ -1076,6 +1076,7 @@ declare function useDualCalendar(props: ExtractPropTypes<typeof useDualCalendarP
         monthTypeFormat: string;
         dateFormat: string;
         dateTimeFormat: string;
+        quarterFormat: string;
         clear: string;
         now: string;
         confirm: string;
@@ -1085,6 +1086,7 @@ declare function useDualCalendar(props: ExtractPropTypes<typeof useDualCalendarP
         datetimePlaceholder: string;
         monthPlaceholder: string;
         yearPlaceholder: string;
+        quarterPlaceholder: string;
         startDatePlaceholder: string;
         endDatePlaceholder: string;
         startDatetimePlaceholder: string;
@@ -1133,33 +1135,4 @@ declare function useDualCalendar(props: ExtractPropTypes<typeof useDualCalendarP
     handleRangeShortcutMouseenter: (shortcut: Shortcuts[string]) => void;
     handleRangeShortcutClick: (shortcut: Shortcuts[string]) => void;
 };
-declare namespace useDualCalendar {
-    var props: {
-        readonly actions: {
-            readonly type: ArrayConstructor;
-            readonly default: () => string[];
-        };
-        readonly active: BooleanConstructor;
-        readonly dateFormat: {
-            readonly type: StringConstructor;
-            readonly default: "yyyy-MM-dd";
-        };
-        readonly timeFormat: {
-            readonly type: StringConstructor;
-            readonly default: "HH:mm:ss";
-        };
-        readonly value: {
-            readonly type: import("vue").PropType<import("../interface").Value | null>;
-            readonly default: null;
-        };
-        readonly shortcuts: import("vue").PropType<Shortcuts>;
-        readonly onConfirm: FunctionConstructor;
-        readonly onClose: import("vue").PropType<import("../interface").OnClose>;
-        readonly onTabOut: FunctionConstructor;
-        readonly onUpdateValue: {
-            readonly type: import("vue").PropType<import("../interface").OnPanelUpdateValue>;
-            readonly required: true;
-        };
-    };
-}
-export { useDualCalendar };
+export { useDualCalendar, useDualCalendarProps };

package/es/date-picker/src/panel/use-dual-calendar.js

@@ -1,9 +1,9 @@
 import { inject, computed, watch, ref } from 'vue';
-import { addMonths, format, getTime, getYear, getMonth, startOfMonth, isValid, startOfSecond, startOfDay, set, getDate } from 'date-fns';
-import { dateArray, strictParse } from '../utils';
-import { usePanelCommon } from './use-panel-common';
+import { addMonths, format, getYear, getMonth, startOfMonth, isValid, startOfSecond, startOfDay, set, getDate, getTime } from 'date-fns';
+import { getDefaultTime, dateArray, strictParse } from '../utils';
 import { datePickerInjectionKey } from '../interface';
-const useDualCalendarProps = Object.assign(Object.assign({}, usePanelCommon.props), { actions: {
+import { usePanelCommon, usePanelCommonProps } from './use-panel-common';
+const useDualCalendarProps = Object.assign(Object.assign({}, usePanelCommonProps), { actions: {
         type: Array,
         default: () => ['clear', 'confirm']
     } });
@@ -36,12 +36,13 @@ function useDualCalendar(props, type = 'datetime') {
     const nowRef = ref(Date.now());
     const isSelectingRef = ref(false);
     const memorizedStartDateTimeRef = ref(0);
-    const { value, dateFormat } = props;
+    const mergedDateFormatRef = computed(() => props.dateFormat || localeRef.value.dateFormat);
+    const { value } = props;
     const startDateInput = ref(Array.isArray(value)
-        ? format(value[0], dateFormat, panelCommon.dateFnsOptions.value)
+        ? format(value[0], mergedDateFormatRef.value, panelCommon.dateFnsOptions.value)
         : '');
     const endDateInputRef = ref(Array.isArray(value)
-        ? format(value[1], dateFormat, panelCommon.dateFnsOptions.value)
+        ? format(value[1], mergedDateFormatRef.value, panelCommon.dateFnsOptions.value)
         : '');
     if (Array.isArray(value)) {
         syncCalendarTimeWithValue(value);
@@ -98,9 +99,8 @@ function useDualCalendar(props, type = 'datetime') {
     watch(computed(() => props.value), (value) => {
         if (value !== null && Array.isArray(value)) {
             const [startMoment, endMoment] = value;
-            const { dateFormat } = props;
-            startDateInput.value = format(startMoment, dateFormat, panelCommon.dateFnsOptions.value);
-            endDateInputRef.value = format(endMoment, dateFormat, panelCommon.dateFnsOptions.value);
+            startDateInput.value = format(startMoment, mergedDateFormatRef.value, panelCommon.dateFnsOptions.value);
+            endDateInputRef.value = format(endMoment, mergedDateFormatRef.value, panelCommon.dateFnsOptions.value);
             if (!isSelectingRef.value) {
                 syncCalendarTimeWithValue(value);
             }
@@ -287,8 +287,24 @@ function useDualCalendar(props, type = 'datetime') {
         if (typeof startTime !== 'number') {
             startTime = getTime(startTime);
         }
-        if (typeof endTime !== 'number') {
-            endTime = getTime(endTime);
+        let startDefaultTime;
+        let endDefaultTime;
+        if (type === 'datetimerange') {
+            const { defaultTime } = props;
+            if (Array.isArray(defaultTime)) {
+                startDefaultTime = getDefaultTime(defaultTime[0]);
+                endDefaultTime = getDefaultTime(defaultTime[1]);
+            }
+            else {
+                startDefaultTime = getDefaultTime(defaultTime);
+                endDefaultTime = startDefaultTime;
+            }
+        }
+        if (startDefaultTime) {
+            startTime = getTime(set(startTime, startDefaultTime));
+        }
+        if (endDefaultTime) {
+            endTime = getTime(set(endTime, endDefaultTime));
         }
         panelCommon.doUpdateValue([startTime, endTime], false);
     }
@@ -302,7 +318,7 @@ function useDualCalendar(props, type = 'datetime') {
         }
     }
     function handleStartDateInput(value) {
-        const date = strictParse(value, props.dateFormat, new Date(), panelCommon.dateFnsOptions.value);
+        const date = strictParse(value, mergedDateFormatRef.value, new Date(), panelCommon.dateFnsOptions.value);
         if (isValid(date)) {
             if (!props.value) {
                 const newValue = set(new Date(), {
@@ -327,7 +343,7 @@ function useDualCalendar(props, type = 'datetime') {
     }
     function handleEndDateInput(value) {
         /** strict check when input */
-        const date = strictParse(value, props.dateFormat, new Date(), panelCommon.dateFnsOptions.value);
+        const date = strictParse(value, mergedDateFormatRef.value, new Date(), panelCommon.dateFnsOptions.value);
         if (isValid(date)) {
             if (props.value === null) {
                 const newValue = set(new Date(), {
@@ -351,7 +367,7 @@ function useDualCalendar(props, type = 'datetime') {
         }
     }
     function handleStartDateInputBlur() {
-        const date = strictParse(startDateInput.value, props.dateFormat, new Date(), panelCommon.dateFnsOptions.value);
+        const date = strictParse(startDateInput.value, mergedDateFormatRef.value, new Date(), panelCommon.dateFnsOptions.value);
         const { value } = props;
         if (isValid(date)) {
             if (value === null) {
@@ -376,7 +392,7 @@ function useDualCalendar(props, type = 'datetime') {
         }
     }
     function handleEndDateInputBlur() {
-        const date = strictParse(endDateInputRef.value, props.dateFormat, new Date(), panelCommon.dateFnsOptions.value);
+        const date = strictParse(endDateInputRef.value, mergedDateFormatRef.value, new Date(), panelCommon.dateFnsOptions.value);
         const { value } = props;
         if (isValid(date)) {
             if (value === null) {
@@ -409,12 +425,11 @@ function useDualCalendar(props, type = 'datetime') {
             endDateInputRef.value = '';
             return;
         }
-        const { dateFormat } = props;
         if (times === undefined) {
             times = value;
         }
-        startDateInput.value = format(times[0], dateFormat, panelCommon.dateFnsOptions.value);
-        endDateInputRef.value = format(times[1], dateFormat, panelCommon.dateFnsOptions.value);
+        startDateInput.value = format(times[0], mergedDateFormatRef.value, panelCommon.dateFnsOptions.value);
+        endDateInputRef.value = format(times[1], mergedDateFormatRef.value, panelCommon.dateFnsOptions.value);
     }
     function handleStartTimePickerChange(value) {
         if (value === null)
@@ -467,5 +482,4 @@ function useDualCalendar(props, type = 'datetime') {
         handleEndDateInputBlur,
         datePickerSlots, shortcuts: shortcutsRef });
 }
-useDualCalendar.props = useDualCalendarProps;
-export { useDualCalendar };
+export { useDualCalendar, useDualCalendarProps };

package/es/date-picker/src/panel/use-panel-common.d.ts

@@ -1,20 +1,18 @@
 import { PropType, ExtractPropTypes } from 'vue';
-import { Value, OnPanelUpdateValue, OnClose, Shortcuts } from '../interface';
+import { Value, OnPanelUpdateValue, OnClose, Shortcuts, DefaultTime } from '../interface';
 declare const usePanelCommonProps: {
     readonly active: BooleanConstructor;
-    readonly dateFormat: {
-        readonly type: StringConstructor;
-        readonly default: "yyyy-MM-dd";
-    };
+    readonly dateFormat: StringConstructor;
     readonly timeFormat: {
         readonly type: StringConstructor;
-        readonly default: "HH:mm:ss";
+        readonly value: "HH:mm:ss";
     };
     readonly value: {
         readonly type: PropType<Value | null>;
         readonly default: null;
     };
     readonly shortcuts: PropType<Shortcuts>;
+    readonly defaultTime: PropType<DefaultTime>;
     readonly onConfirm: FunctionConstructor;
     readonly onClose: PropType<OnClose>;
     readonly onTabOut: FunctionConstructor;
@@ -176,12 +174,14 @@ declare function usePanelCommon(props: UsePanelCommonProps): {
             calendarLeftPaddingDatetimerange: string;
             calendarLeftPaddingMonth: string;
             calendarLeftPaddingYear: string;
+            calendarLeftPaddingQuarter: string;
             calendarRightPaddingDate: string;
             calendarRightPaddingDatetime: string;
             calendarRightPaddingDaterange: string;
             calendarRightPaddingDatetimerange: string;
             calendarRightPaddingMonth: string;
             calendarRightPaddingYear: string;
+            calendarRightPaddingQuarter: string;
         };
         peers: {
             Input: import("../../../_mixins").Theme<"Input", {
@@ -1043,6 +1043,7 @@ declare function usePanelCommon(props: UsePanelCommonProps): {
         monthTypeFormat: string;
         dateFormat: string;
         dateTimeFormat: string;
+        quarterFormat: string;
         clear: string;
         now: string;
         confirm: string;
@@ -1052,6 +1053,7 @@ declare function usePanelCommon(props: UsePanelCommonProps): {
         datetimePlaceholder: string;
         monthPlaceholder: string;
         yearPlaceholder: string;
+        quarterPlaceholder: string;
         startDatePlaceholder: string;
         endDatePlaceholder: string;
         startDatetimePlaceholder: string;
@@ -1075,29 +1077,4 @@ declare function usePanelCommon(props: UsePanelCommonProps): {
     getShortcutValue: (shortcut: Shortcuts[string]) => number | [number, number];
     handleShortcutMouseleave: () => void;
 };
-declare namespace usePanelCommon {
-    var props: {
-        readonly active: BooleanConstructor;
-        readonly dateFormat: {
-            readonly type: StringConstructor;
-            readonly default: "yyyy-MM-dd";
-        };
-        readonly timeFormat: {
-            readonly type: StringConstructor;
-            readonly default: "HH:mm:ss";
-        };
-        readonly value: {
-            readonly type: PropType<Value | null>;
-            readonly default: null;
-        };
-        readonly shortcuts: PropType<Shortcuts>;
-        readonly onConfirm: FunctionConstructor;
-        readonly onClose: PropType<OnClose>;
-        readonly onTabOut: FunctionConstructor;
-        readonly onUpdateValue: {
-            readonly type: PropType<OnPanelUpdateValue>;
-            readonly required: true;
-        };
-    };
-}
-export { usePanelCommon };
+export { usePanelCommon, usePanelCommonProps };

package/es/date-picker/src/panel/use-panel-common.js

@@ -1,23 +1,20 @@
 import { computed, inject, ref, nextTick } from 'vue';
 import { useKeyboard } from 'vooks';
 import { datePickerInjectionKey } from '../interface';
-const DATE_FORMAT = 'yyyy-MM-dd';
 const TIME_FORMAT = 'HH:mm:ss';
 const usePanelCommonProps = {
     active: Boolean,
-    dateFormat: {
-        type: String,
-        default: DATE_FORMAT
-    },
+    dateFormat: String,
     timeFormat: {
         type: String,
-        default: TIME_FORMAT
+        value: TIME_FORMAT
     },
     value: {
         type: [Array, Number],
         default: null
     },
     shortcuts: Object,
+    defaultTime: [Number, String, Array],
     onConfirm: Function,
     onClose: Function,
     onTabOut: Function,
@@ -139,5 +136,4 @@ function usePanelCommon(props) {
         handleShortcutMouseleave: restorePendingValue
     };
 }
-usePanelCommon.props = usePanelCommonProps;
-export { usePanelCommon };
+export { usePanelCommon, usePanelCommonProps };