naive-ui 2.22.0 → 2.24.0

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/date-picker/src/panel/use-calendar.js

@@ -27,9 +27,10 @@ function useCalendar(props, type) {
         isMinuteDisabled: isMinuteDisabledRef,
         isSecondDisabled: isSecondDisabledRef
     };
+    const mergedDateFormatRef = (0, vue_1.computed)(() => props.dateFormat || localeRef.value.dateFormat);
     const dateInputValueRef = (0, vue_1.ref)(props.value === null || Array.isArray(props.value)
         ? ''
-        : (0, date_fns_1.format)(props.value, props.dateFormat));
+        : (0, date_fns_1.format)(props.value, mergedDateFormatRef.value));
     const calendarValueRef = (0, vue_1.ref)(props.value === null || Array.isArray(props.value)
         ? Date.now()
         : props.value);
@@ -47,7 +48,7 @@ function useCalendar(props, type) {
     const yearArrayRef = (0, vue_1.computed)(() => {
         return (0, utils_1.yearArray)(calendarValueRef.value, props.value, nowRef.value);
     });
-    const querterArrayRef = (0, vue_1.computed)(() => {
+    const quarterArrayRef = (0, vue_1.computed)(() => {
         return (0, utils_1.quarterArray)(calendarValueRef.value, props.value, nowRef.value);
     });
     const weekdaysRef = (0, vue_1.computed)(() => {
@@ -69,7 +70,7 @@ function useCalendar(props, type) {
     });
     (0, vue_1.watch)((0, vue_1.computed)(() => props.value), (value) => {
         if (value !== null && !Array.isArray(value)) {
-            dateInputValueRef.value = (0, date_fns_1.format)(value, props.dateFormat, panelCommon.dateFnsOptions.value);
+            dateInputValueRef.value = (0, date_fns_1.format)(value, mergedDateFormatRef.value, panelCommon.dateFnsOptions.value);
             calendarValueRef.value = value;
         }
         else {
@@ -94,7 +95,7 @@ function useCalendar(props, type) {
         return isDateDisabled(ts);
     }
     function handleDateInput(value) {
-        const date = (0, utils_1.strictParse)(value, props.dateFormat, new Date(), panelCommon.dateFnsOptions.value);
+        const date = (0, utils_1.strictParse)(value, mergedDateFormatRef.value, new Date(), panelCommon.dateFnsOptions.value);
         if ((0, date_fns_1.isValid)(date)) {
             if (props.value === null) {
                 panelCommon.doUpdateValue((0, date_fns_1.getTime)(sanitizeValue(Date.now())), false);
@@ -113,7 +114,7 @@ function useCalendar(props, type) {
         }
     }
     function handleDateInputBlur() {
-        const date = (0, utils_1.strictParse)(dateInputValueRef.value, props.dateFormat, new Date(), panelCommon.dateFnsOptions.value);
+        const date = (0, utils_1.strictParse)(dateInputValueRef.value, mergedDateFormatRef.value, new Date(), panelCommon.dateFnsOptions.value);
         if ((0, date_fns_1.isValid)(date)) {
             if (props.value === null) {
                 panelCommon.doUpdateValue((0, date_fns_1.getTime)(sanitizeValue(Date.now())), false);
@@ -188,7 +189,7 @@ function useCalendar(props, type) {
         if (time === undefined) {
             time = props.value;
         }
-        dateInputValueRef.value = (0, date_fns_1.format)(time, props.dateFormat, panelCommon.dateFnsOptions.value);
+        dateInputValueRef.value = (0, date_fns_1.format)(time, mergedDateFormatRef.value, panelCommon.dateFnsOptions.value);
     }
     function handleConfirmClick() {
         if (validation.isDateInvalid.value || validation.isTimeInvalid.value) {
@@ -249,7 +250,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/lib/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/lib/date-picker/src/panel/use-dual-calendar.js

@@ -40,12 +40,13 @@ function useDualCalendar(props, type = 'datetime') {
     const nowRef = (0, vue_1.ref)(Date.now());
     const isSelectingRef = (0, vue_1.ref)(false);
     const memorizedStartDateTimeRef = (0, vue_1.ref)(0);
-    const { value, dateFormat } = props;
+    const mergedDateFormatRef = (0, vue_1.computed)(() => props.dateFormat || localeRef.value.dateFormat);
+    const { value } = props;
     const startDateInput = (0, vue_1.ref)(Array.isArray(value)
-        ? (0, date_fns_1.format)(value[0], dateFormat, panelCommon.dateFnsOptions.value)
+        ? (0, date_fns_1.format)(value[0], mergedDateFormatRef.value, panelCommon.dateFnsOptions.value)
         : '');
     const endDateInputRef = (0, vue_1.ref)(Array.isArray(value)
-        ? (0, date_fns_1.format)(value[1], dateFormat, panelCommon.dateFnsOptions.value)
+        ? (0, date_fns_1.format)(value[1], mergedDateFormatRef.value, panelCommon.dateFnsOptions.value)
         : '');
     if (Array.isArray(value)) {
         syncCalendarTimeWithValue(value);
@@ -102,9 +103,8 @@ function useDualCalendar(props, type = 'datetime') {
     (0, vue_1.watch)((0, vue_1.computed)(() => props.value), (value) => {
         if (value !== null && Array.isArray(value)) {
             const [startMoment, endMoment] = value;
-            const { dateFormat } = props;
-            startDateInput.value = (0, date_fns_1.format)(startMoment, dateFormat, panelCommon.dateFnsOptions.value);
-            endDateInputRef.value = (0, date_fns_1.format)(endMoment, dateFormat, panelCommon.dateFnsOptions.value);
+            startDateInput.value = (0, date_fns_1.format)(startMoment, mergedDateFormatRef.value, panelCommon.dateFnsOptions.value);
+            endDateInputRef.value = (0, date_fns_1.format)(endMoment, mergedDateFormatRef.value, panelCommon.dateFnsOptions.value);
             if (!isSelectingRef.value) {
                 syncCalendarTimeWithValue(value);
             }
@@ -322,7 +322,7 @@ function useDualCalendar(props, type = 'datetime') {
         }
     }
     function handleStartDateInput(value) {
-        const date = (0, utils_1.strictParse)(value, props.dateFormat, new Date(), panelCommon.dateFnsOptions.value);
+        const date = (0, utils_1.strictParse)(value, mergedDateFormatRef.value, new Date(), panelCommon.dateFnsOptions.value);
         if ((0, date_fns_1.isValid)(date)) {
             if (!props.value) {
                 const newValue = (0, date_fns_1.set)(new Date(), {
@@ -347,7 +347,7 @@ function useDualCalendar(props, type = 'datetime') {
     }
     function handleEndDateInput(value) {
         /** strict check when input */
-        const date = (0, utils_1.strictParse)(value, props.dateFormat, new Date(), panelCommon.dateFnsOptions.value);
+        const date = (0, utils_1.strictParse)(value, mergedDateFormatRef.value, new Date(), panelCommon.dateFnsOptions.value);
         if ((0, date_fns_1.isValid)(date)) {
             if (props.value === null) {
                 const newValue = (0, date_fns_1.set)(new Date(), {
@@ -371,7 +371,7 @@ function useDualCalendar(props, type = 'datetime') {
         }
     }
     function handleStartDateInputBlur() {
-        const date = (0, utils_1.strictParse)(startDateInput.value, props.dateFormat, new Date(), panelCommon.dateFnsOptions.value);
+        const date = (0, utils_1.strictParse)(startDateInput.value, mergedDateFormatRef.value, new Date(), panelCommon.dateFnsOptions.value);
         const { value } = props;
         if ((0, date_fns_1.isValid)(date)) {
             if (value === null) {
@@ -396,7 +396,7 @@ function useDualCalendar(props, type = 'datetime') {
         }
     }
     function handleEndDateInputBlur() {
-        const date = (0, utils_1.strictParse)(endDateInputRef.value, props.dateFormat, new Date(), panelCommon.dateFnsOptions.value);
+        const date = (0, utils_1.strictParse)(endDateInputRef.value, mergedDateFormatRef.value, new Date(), panelCommon.dateFnsOptions.value);
         const { value } = props;
         if ((0, date_fns_1.isValid)(date)) {
             if (value === null) {
@@ -429,12 +429,11 @@ function useDualCalendar(props, type = 'datetime') {
             endDateInputRef.value = '';
             return;
         }
-        const { dateFormat } = props;
         if (times === undefined) {
             times = value;
         }
-        startDateInput.value = (0, date_fns_1.format)(times[0], dateFormat, panelCommon.dateFnsOptions.value);
-        endDateInputRef.value = (0, date_fns_1.format)(times[1], dateFormat, panelCommon.dateFnsOptions.value);
+        startDateInput.value = (0, date_fns_1.format)(times[0], mergedDateFormatRef.value, panelCommon.dateFnsOptions.value);
+        endDateInputRef.value = (0, date_fns_1.format)(times[1], mergedDateFormatRef.value, panelCommon.dateFnsOptions.value);
     }
     function handleStartTimePickerChange(value) {
         if (value === null)

package/lib/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/lib/date-picker/src/panel/use-panel-common.js

@@ -4,17 +4,13 @@ exports.usePanelCommonProps = exports.usePanelCommon = void 0;
 const vue_1 = require("vue");
 const vooks_1 = require("vooks");
 const interface_1 = require("../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],