naive-ui 2.22.0 → 2.24.0

package/es/date-picker/src/panel/daterange.d.ts

@@ -4,13 +4,10 @@ declare const _default: import("vue").DefineComponent<{
         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>;
@@ -1148,21 +1145,19 @@ declare const _default: import("vue").DefineComponent<{
 } & {
     value: import("../interface").Value | null;
     active: boolean;
-    dateFormat: string;
     onUpdateValue: import("../interface").OnPanelUpdateValue;
     actions: unknown[];
-    timeFormat: string;
 } & {
+    dateFormat?: string | undefined;
     onTabOut?: Function | undefined;
     onClose?: import("../interface").OnClose | undefined;
     onConfirm?: Function | undefined;
     defaultTime?: import("../interface").DefaultTime | undefined;
+    timeFormat?: string | undefined;
     shortcuts?: import("../interface").Shortcuts | undefined;
 }>, {
     value: import("../interface").Value | null;
     active: boolean;
-    dateFormat: string;
     actions: unknown[];
-    timeFormat: string;
 }>;
 export default _default;

package/es/date-picker/src/panel/datetime.d.ts

@@ -4,13 +4,10 @@ declare const _default: import("vue").DefineComponent<{
         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>;
@@ -1149,22 +1146,20 @@ declare const _default: import("vue").DefineComponent<{
 } & {
     value: import("../interface").Value | null;
     active: boolean;
-    dateFormat: string;
     onUpdateValue: import("../interface").OnPanelUpdateValue;
     actions: string[];
-    timeFormat: string;
 } & {
+    dateFormat?: string | undefined;
     onTabOut?: Function | undefined;
     onClose?: import("../interface").OnClose | undefined;
     onConfirm?: Function | undefined;
     defaultTime?: import("../interface").DefaultTime | undefined;
+    timeFormat?: string | undefined;
     shortcuts?: import("../interface").Shortcuts | undefined;
 }>, {
     value: import("../interface").Value | null;
     active: boolean;
-    dateFormat: string;
     actions: string[];
-    timeFormat: string;
 }>;
 /**
  * DateTime Panel

package/es/date-picker/src/panel/datetimerange.d.ts

@@ -4,13 +4,10 @@ declare const _default: import("vue").DefineComponent<{
         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>;
@@ -1148,21 +1145,19 @@ declare const _default: import("vue").DefineComponent<{
 } & {
     value: import("../interface").Value | null;
     active: boolean;
-    dateFormat: string;
     onUpdateValue: import("../interface").OnPanelUpdateValue;
     actions: unknown[];
-    timeFormat: string;
 } & {
+    dateFormat?: string | undefined;
     onTabOut?: Function | undefined;
     onClose?: import("../interface").OnClose | undefined;
     onConfirm?: Function | undefined;
     defaultTime?: import("../interface").DefaultTime | undefined;
+    timeFormat?: string | undefined;
     shortcuts?: import("../interface").Shortcuts | undefined;
 }>, {
     value: import("../interface").Value | null;
     active: boolean;
-    dateFormat: string;
     actions: unknown[];
-    timeFormat: string;
 }>;
 export default _default;

package/es/date-picker/src/panel/month.d.ts

@@ -10,13 +10,10 @@ declare const _default: import("vue").DefineComponent<{
         readonly default: () => string[];
     };
     active: BooleanConstructor;
-    dateFormat: {
-        readonly type: StringConstructor;
-        readonly default: "yyyy-MM-dd";
-    };
+    dateFormat: StringConstructor;
     timeFormat: {
         readonly type: StringConstructor;
-        readonly default: "HH:mm:ss";
+        readonly value: "HH:mm:ss";
     };
     value: {
         readonly type: PropType<import("../interface").Value | null>;
@@ -1158,22 +1155,20 @@ declare const _default: import("vue").DefineComponent<{
     type: "month" | "year" | "quarter";
     value: import("../interface").Value | null;
     active: boolean;
-    dateFormat: string;
     onUpdateValue: import("../interface").OnPanelUpdateValue;
     actions: string[];
-    timeFormat: string;
 } & {
+    dateFormat?: string | undefined;
     onTabOut?: Function | undefined;
     onClose?: import("../interface").OnClose | undefined;
     onConfirm?: Function | undefined;
     defaultTime?: import("../interface").DefaultTime | undefined;
+    timeFormat?: string | undefined;
     shortcuts?: import("../interface").Shortcuts | undefined;
 }>, {
     value: import("../interface").Value | null;
     active: boolean;
-    dateFormat: string;
     actions: string[];
-    timeFormat: string;
 }>;
 /**
  * Month Panel

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

@@ -7,13 +7,10 @@ declare const useCalendarProps: {
         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: PropType<import("../interface").Value | null>;

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

@@ -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,7 +44,7 @@ function useCalendar(props, type) {
     const yearArrayRef = computed(() => {
         return yearArray(calendarValueRef.value, props.value, nowRef.value);
     });
-    const querterArrayRef = computed(() => {
+    const quarterArrayRef = computed(() => {
         return quarterArray(calendarValueRef.value, props.value, nowRef.value);
     });
     const weekdaysRef = computed(() => {
@@ -65,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 {
@@ -90,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);
@@ -109,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);
@@ -184,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) {
@@ -245,7 +246,7 @@ function useCalendar(props, type) {
         panelCommon.clearPendingValue();
         handleConfirmClick();
     }
-    return Object.assign(Object.assign(Object.assign({ dateArray: dateArrayRef, monthArray: monthArrayRef, yearArray: yearArrayRef, quarterArray: querterArrayRef, calendarYear: calendarYearRef, calendarMonth: calendarMonthRef, weekdays: weekdaysRef, mergedIsDateDisabled,
+    return Object.assign(Object.assign(Object.assign({ dateArray: dateArrayRef, monthArray: monthArrayRef, yearArray: yearArrayRef, quarterArray: quarterArrayRef, calendarYear: calendarYearRef, calendarMonth: calendarMonthRef, weekdays: weekdaysRef, mergedIsDateDisabled,
         nextYear,
         prevYear,
         nextMonth,

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

@@ -7,13 +7,10 @@ declare const useDualCalendarProps: {
         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>;

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

@@ -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);
             }
@@ -318,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(), {
@@ -343,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(), {
@@ -367,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) {
@@ -392,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) {
@@ -425,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)

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

@@ -2,13 +2,10 @@ import { PropType, ExtractPropTypes } from 'vue';
 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>;

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

@@ -1,17 +1,13 @@
 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],